diff --git a/.config/helix/config.toml b/.config/helix/config.toml index 5cebefa..b52fb3c 100644 --- a/.config/helix/config.toml +++ b/.config/helix/config.toml @@ -1,4 +1,4 @@ -theme = "ao" +theme = "custom" # monokai_soda, kaolin-valley-dark, material_deep_ocean, carbonfox [editor] # no you don't @@ -50,12 +50,14 @@ right = [ "selections", "primary-selection-length", "position", + "position-percentage", "total-line-numbers", ] [editor.lsp] display-progress-messages = true # looks cool -display-inlay-hints = true # feels good +auto-signature-help = true +display-inlay-hints = false # meh [editor.cursor-shape] normal = "block" @@ -85,37 +87,48 @@ skip-levels = 1 [editor.gutters] layout = ["diff", "diagnostics", "line-numbers", "spacer"] # TODO: don't like -line-numbers.min-width = 0 +line-numbers.min-width = 1 [editor.soft-wrap] enable = true -max-wrap = 20 # increase to reduce forced wrapping -max-indent-retain = 0 # 40 +max-wrap = 20 # increase to reduce forced wrapping +max-indent-retain = 24 # 40 wrap-indicator = "↪" [keys.insert] +C-space = "signature_help" S-tab = "move_parent_node_start" [keys.select] +x = "extend_line" +# a = ["append_mode", "collapse_selection"] tab = "extend_parent_node_end" S-tab = "extend_parent_node_start" +";" = ["collapse_selection", "normal_mode"] +V = "extend_to_line_end" [keys.normal] -tab = "move_parent_node_end" -S-tab = "move_parent_node_start" - +x = "extend_line" "=" = ":format" "A-=" = "format_selections" -D = ["extend_to_line_end", "delete_selection"] +C-space = "signature_help" +space.'.' = ":config-reload" + +tab = "move_parent_node_end" +S-tab = "move_parent_node_start" + +V = ["goto_first_nonwhitespace", "extend_to_line_end"] +D = ["ensure_selections_forward", "extend_to_line_end"] + +L = "goto_next_buffer" +H = "goto_previous_buffer" C-k = "jump_view_up" C-h = "jump_view_left" C-j = "jump_view_down" C-l = "jump_view_right" -L = "goto_next_buffer" -H = "goto_previous_buffer" A-j = ["extend_to_line_bounds", "delete_selection", "paste_after"] A-k = [ @@ -127,5 +140,35 @@ A-k = [ A-J = ["extend_to_line_bounds", "yank", "paste_after"] A-K = ["extend_to_line_bounds", "yank", "paste_before"] -[keys.normal."+"] -c = ":config-reload" + +# Toggle +[keys.normal.space.t] +f = ":toggle auto-format" + +c = ":toggle cursorline" +w = ":toggle soft-wrap.enable" +n = ":toggle line-number absolute relative" +b = ":toggle bufferline never multiple" + +r = ":set-option rulers []" +R = ":set-option rulers [80,100]" + +g = ":toggle indent-guides.render" +i = ":toggle lsp.display-inlay-hints" +e = ":toggle end-of-line-diagnostics disable hint" +d = ":toggle inline-diagnostics.other-lines disable error" +D = ":toggle inline-diagnostics.cursor-line disable warning" + +z = [ # TODO: not work + ":set-option cursorline true", + ":set-option rulers [100]", + ":set-option soft-wrap.enable false", + ":set-option line-number relative", + ':set-option gutters.layout ["line-numbers","spacer"]', + ":set-option bufferline never", + ":set-option indent-guides.render true", + ":set-option lsp.display-inlay-hints false", + ":set-option end-of-line-diagnostics disable", + ":set-option inline-diagnostics.other-lines disable", + ":set-option inline-diagnostics.cursor-line disable", +] diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml index 1fd52fd..ddd3350 100644 --- a/.config/helix/languages.toml +++ b/.config/helix/languages.toml @@ -19,8 +19,10 @@ name = "toml" auto-format = true -[language-server.taplo] -config = {} # https://github.com/helix-editor/helix/issues/3897 +# TODO: still aligns +[language-server.taplo.config] +alignComments = false +align_comments = false [language-server.tinymist.config] @@ -30,7 +32,7 @@ exportPdf = "onSave" # "onDocumentHasTitle", # default: never semanticTokens = "enable" -# [language-server.tinymist.nil] +# [language-server.nil] # formatting.command = "alejandra" diff --git a/.config/helix/themes/custom.toml b/.config/helix/themes/custom.toml new file mode 100644 index 0000000..80eebfb --- /dev/null +++ b/.config/helix/themes/custom.toml @@ -0,0 +1,9 @@ +inherits = "carbonfox" + +warning = "magenta" +error = "red" +info = "blue" +hint = "orange" + +# ui.background = {} +# ui.gutter = {} diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 1b648e2..91c2e11 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -7,7 +7,7 @@ bold_font Hack Nerd Font Bold italic_font Hack Nerd Font Italic bold_italic_font Hack Nerd Font Bold Italic -font_size 18 +font_size 19 force_ltr yes text_composition_strategy 1 0 diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index b3bd83a..e34159a 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,7 +1,7 @@ volume=50 hwdec=auto ytdl-format=bestvideo[height<=?1080][vcodec!=?av01]+bestaudio/best -sub-pos=20 +sub-pos=10 # sub-visibility=yes diff --git a/.gitignore b/.gitignore index 3423fb9..403719c 100644 --- a/.gitignore +++ b/.gitignore @@ -32,8 +32,6 @@ !.config/git/config !.config/helix/ -.config/helix/* -!.config/helix/*.toml !.config/nvim/ .config/nvim/* diff --git a/.local/share/cargo/config.toml b/.local/share/cargo/config.toml index 69cfba2..0398bb2 100644 --- a/.local/share/cargo/config.toml +++ b/.local/share/cargo/config.toml @@ -2,6 +2,9 @@ rustc-wrapper = "sccache" rustflags = ["-Z", "threads=8"] +[profile.release] +lto = true + [unstable] codegen-backend = true