Compare commits

..

No commits in common. "04fe526299b96b4a5eaba1a920994c6c0588ca0d" and "4b7947dc22bba5ad44579fb8203dc5494b810f90" have entirely different histories.

24 changed files with 290 additions and 413 deletions

View file

@ -73,8 +73,7 @@ hide-when-typing=yes
#background=1d2021 #background=1d2021
background=282828 background=282828
foreground=ebdbb2 foreground=ebdbb2
#regular0=282828 regular0=282828
regular0=665c54
regular1=cc241d regular1=cc241d
regular2=98971a regular2=98971a
regular3=d79921 regular3=d79921

View file

@ -1,41 +0,0 @@
#!/usr/bin/env bash
primary-wl-to-x () {
while read; do
if [[ "$(wl-paste --primary --no-newline | sha256sum)" != "$(xclip -selection primary -out | sha256sum)" ]]; then
echo "syncing primary wl->x"
wl-paste --primary --no-newline | xclip -selection primary -in
fi
done < <(wl-paste --primary --watch echo)
}
primary-x-to-wl () {
while clipnotify -s primary; do
if [[ "$(wl-paste --primary --no-newline | sha256sum)" != "$(xclip -selection primary -out | sha256sum)" ]]; then
echo "syncing primary x->wl"
xclip -selection primary -out | wl-copy --primary
fi
done
}
clipboard-wl-to-x () {
while read; do
if [[ "$(wl-paste --no-newline | sha256sum)" != "$(xclip -selection clipboard -out | sha256sum)" ]]; then
echo "syncing clipboard wl->x"
wl-paste --no-newline | xclip -selection clipboard -in
fi
done < <(wl-paste --watch echo)
}
clipboard-x-to-wl () {
while clipnotify -s clipboard; do
if [[ "$(wl-paste --no-newline | sha256sum)" != "$(xclip -selection clipboard -out | sha256sum)" ]]; then
echo "syncing clipboard x->wl"
xclip -selection clipboard -out | wl-copy
fi
done
}
clipboard-wl-to-x &
clipboard-x-to-wl &
primary-wl-to-x &
primary-x-to-wl &

View file

@ -26,7 +26,7 @@ environment {
} }
output "DP-2" { output "DP-2" {
mode "3440x1440@99.982" mode "3440x1440@99.98"
//variable-refresh-rate //variable-refresh-rate
scale 1 scale 1
transform "normal" transform "normal"
@ -63,11 +63,10 @@ layout {
// Note that running niri as a session supports xdg-desktop-autostart, // Note that running niri as a session supports xdg-desktop-autostart,
// which may be more convenient to use. // which may be more convenient to use.
// See the binds section below for more spawn examples. // See the binds section below for more spawn examples.
spawn-at-startup "bash" "-c" "eww -c ~/.config/eww-bar open bar_1" spawn-at-startup "bash" "-c" "eww -c ~/.config/eww-bar open bar_1 --restart"
spawn-at-startup "xwayland-satellite" spawn-at-startup "xwayland-satellite"
spawn-at-startup "bash" "-c" "1password --silent" spawn-at-startup "bash" "-c" "1password --silent"
spawn-at-startup "wl-paste" "--watch" "xclip -in -sel c" spawn-at-startup "wl-paste" "--watch" "xclip -in -sel c"
spawn-at-startup "~/.config/niri/clipboardfix.sh"
prefer-no-csd prefer-no-csd
screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
@ -161,19 +160,10 @@ window-rule {
window-rule { window-rule {
match app-id=r#"1Password"# match app-id=r#"1Password"#
match title=r#"[gG]mail"# match title=r#"[gG]mail"#
match app-id=r#".*[mM]ako.*"#
match title=r#".*[Ww]hats[aA]pp.*$"#
// opacity 0.5
block-out-from "screen-capture" block-out-from "screen-capture"
} }
window-rule {
match app-id=r#"^[gG]edit$"#;
match app-id=r#"^[eE]og$"#;
// fake-fullscreen true
}
window-rule { window-rule {
match title=r#"^.* is sharing your screen.$"#; match title=r#"^.* is sharing your screen.$"#;
} }

View file

@ -52,16 +52,9 @@
(vim.cmd (.. "silent !xdg-open zotero://select/items/@" (str.join sel))))) (vim.cmd (.. "silent !xdg-open zotero://select/items/@" (str.join sel)))))
(fn key-map [obj] (fn cmd [s desc] [(.. "<cmd>" s "<cr>") desc])
(icollect [key val (pairs obj)] (fn sel-cmd [s desc] [(.. "<cmd>'<,'>" s "<cr>") desc])
(utils.prepend key val))) (fn rebind [s desc] [s desc])
(fn m [bind desc]
{1 bind :desc desc})
(fn cmd [s desc] (utils.prepend (.. "<cmd>" s "<cr>") {:desc desc}))
(fn sel-cmd [s desc] (utils.prepend (.. "<cmd>'<,'>" s "<cr>") {:desc desc}))
(fn rebind [s desc] (m s desc))
(fn format [] (fn format []
@ -81,114 +74,115 @@
(vim.diagnostic.config {:virtual_lines {:only_current_line true}})) (vim.diagnostic.config {:virtual_lines {:only_current_line true}}))
(wk.setup {}) (wk.setup {})
(wk.register
{"c" {:name "+comment out"}
"e" {:name "+emmet"}
(wk.add "[" (cmd "HopWord" "Hop to a word")
(key-map "h" (cmd "bprevious" "previous buffer")
{"<leader>c" {:group "+comment out"} "l" (cmd "bnext" "next buffer")
"<leader>e" {:group "+emmet"} "o" (cmd "Telescope live_grep" "Grep files")
"P" (cmd "Telescope frecency frecency default_text=:CWD:" "Frecency magic")
"p" (cmd "Telescope find_files" "Open file-browser")
":" (cmd "Telescope commands" "Search command with fzf")
"s" (cmd "w" "Save file")
"g" (cmd "Neogit" "Git")
"<leader>[" (cmd "HopWord" "Hop to a word") "n" [(. (require :persistence) :load) "Load last session"]
"<leader>h" (cmd "bprevious" "previous buffer")
"<leader>l" (cmd "bnext" "next buffer")
"<leader>o" (cmd "Telescope live_grep" "Grep files")
"<leader>P" (cmd "Telescope frecency frecency default_text=:CWD:" "Frecency magic")
"<leader>p" (cmd "Telescope find_files" "Open file-browser")
"<leader>:" (cmd "Telescope commands" "Search command with fzf")
"<leader>s" (cmd "w" "Save file")
"<leader>g" (cmd "Neogit" "Git")
"<leader>n" (m (. (require :persistence) :load) "Load last session") "d" {:name "+Debugging"
"b" [dap.toggle_breakpoint "toggle breakpoint"]
"u" [dapui.toggle "toggle dapui"]
"c" [dap.step_into "continue"]
"r" [dap.repl.open "open repl"]
"s" {:name "+Step"
"o" [dap.step_over "over"]
"u" [dap.step_out "out"]
"i" [dap.step_into "into"]}}
"<leader>d" {:group "+Debugging"} "m" {:name "+Code actions"
"<leader>db" (m dap.toggle_breakpoint "toggle breakpoint") ";" [#(set vim.o.spell (not vim.o.spell)) "Toggle spell checking"]
"<leader>du" (m dapui.toggle "toggle dapui") "d" [vim.lsp.buf.hover "Show documentation"]
"<leader>dc" (m dap.step_into "continue") "o" (cmd "SymbolsOutline" "Outline")
"<leader>dr" (m dap.repl.open "open repl") "S" (cmd "Telescope lsp_document_symbols" "Symbols in document")
"s" (cmd "Telescope lsp_dynamic_workspace_symbols" "Symbols in workspace")
"<leader>ds" {:group "+Step"} "T" [vim.lsp.buf.signature_help "Show signature help"]
"<leader>dso" (m dap.step_over "over") "n" [open-rename "Rename"]
"<leader>dsu" (m dap.step_out "out") "v" (cmd "CodeActionMenu" "Apply codeaction")
"<leader>dsi" (m dap.step_into "into") "A" [#(vim.diagnostic.open_float {:scope :cursor}) "Cursor diagnostics"]
"a" [#(vim.diagnostic.open_float {}) "Line diagnostics"]
"<leader>m" {:group "+Code actions"} "h" (cmd "RustToggleInlayHints" "Toggle inlay hints")
"<leader>m;" (m #(set vim.o.spell (not vim.o.spell)) "Toggle spell checking") "r" (cmd "Trouble lsp_references" "Show references")
"<leader>md" (m vim.lsp.buf.hover "Show documentation") "E" (cmd "Trouble document_diagnostics" "List diagnostics")
"<leader>mo" (cmd "SymbolsOutline" "Outline") "e" (cmd "Trouble workspace_diagnostics" "Show diagnostics")
"<leader>mS" (cmd "Telescope lsp_document_symbols" "Symbols in document") "t" (cmd "Trouble lsp_type_definitions" "Go to type-definition")
"<leader>ms" (cmd "Telescope lsp_dynamic_workspace_symbols" "Symbols in workspace") "i" (cmd "Trouble lsp_implementations" "Show implementation")
"<leader>mT" (m vim.lsp.buf.signature_help "Show signature help") "g" (cmd "Trouble lsp_definitions" "Go to definition")
"<leader>mn" (m open-rename "Rename") "w" [toggle-lsp-lines "Toggle LSP lines"]
"<leader>mv" (cmd "CodeActionMenu" "Apply codeaction") "W" [toggle-lsp-lines-current "Toggle LSP line"]
"<leader>mA" (m #(vim.diagnostic.open_float {:scope :cursor}) "Cursor diagnostics") "f" [format "format file"]
"<leader>ma" (m #(vim.diagnostic.open_float {}) "Line diagnostics") "," (cmd "RustRunnables" "Run rust stuff")
"<leader>mh" (cmd "RustToggleInlayHints" "Toggle inlay hints") "x" {:name "+Glance"
"<leader>mr" (cmd "Trouble lsp_references" "Show references") "d" [#(glance.open "definitions") "Definitions"]
"<leader>mE" (cmd "Trouble document_diagnostics" "List diagnostics") "r" [#(glance.open "references") "References"]
"<leader>me" (cmd "Trouble workspace_diagnostics" "Show diagnostics") "t" [#(glance.open "type_definitions") "Type definitions"]
"<leader>mt" (cmd "Trouble lsp_type_definitions" "Go to type-definition") "i" [#(glance.open "implementations") "Implementations"]}
"<leader>mi" (cmd "Trouble lsp_implementations" "Show implementation") "c" {:name "+Crates"
"<leader>mg" (cmd "Trouble lsp_definitions" "Go to definition") "j" [crates.show_popup "crates popup"]
"<leader>mw" (m toggle-lsp-lines "Toggle LSP lines") "f" [crates.show_features_popup "crate features"]
"<leader>mW" (m toggle-lsp-lines-current "Toggle LSP line") "v" [crates.show_versions_popup "crate versions"]
"<leader>mf" (m format "format file") "d" [crates.show_dependencies_popup "crate dependencies"]
"<leader>m," (cmd "RustRunnables" "Run rust stuff") "h" [crates.open_documentation "crate documentation"]}}
"<leader>mx" {:group "+Glance"}
"<leader>mxd" (m #(glance.open "definitions") "Definitions")
"<leader>mxr" (m #(glance.open "references") "References")
"<leader>mxt" (m #(glance.open "type_definitions") "Type definitions")
"<leader>mxi" (m #(glance.open "implementations") "Implementations")
"<leader>c" {:group "+Crates"}
"<leader>mcj" (m crates.show_popup "crates popup")
"<leader>mcf" (m crates.show_features_popup "crate features")
"<leader>mcv" (m crates.show_versions_popup "crate versions")
"<leader>mcd" (m crates.show_dependencies_popup "crate dependencies")
"<leader>mch" (m crates.open_documentation "crate documentation")
"<leader>f" {:group "+folds"}
"<leader>fo" (cmd "foldopen" "open fold")
"<leader>fn" (cmd "foldclose" "close fold")
"<leader>fj" (rebind "zj" "jump to next fold")
"<leader>fk" (rebind "zk" "jump to previous fold")
"<leader>v" {:group "+view-and-layout"}
"<leader>vn" (cmd "set relativenumber!" "toggle relative numbers")
"<leader>vm" (cmd "set nonumber! norelativenumber" "toggle numbers")
"<leader>vg" (cmd "ZenMode" "toggle zen mode")
"<leader>vi" (cmd "IndentGuidesToggle" "toggle indent guides")
"<leader>vw" (cmd "set wrap! linebreak!" "toggle linewrapping")
"<leader>b" {:group "+buffers"}
"<leader>bb" (cmd ":Telescope buffers" "select open buffer")
"<leader>bc" (cmd ":Bdelete!" "close open buffer")
"<leader>bw" (cmd ":Bwipeout!" "wipeout open buffer")}))
(wk.add "f" {:name "+folds"
(key-map "o" (cmd "foldopen" "open fold")
{"<tab>" {:hidden true} "n" (cmd "foldclose" "close fold")
"gss" {:desc "init selection"} "j" (rebind "zj" "jump to next fold")
"z" {:group "folds"} "k" (rebind "zk" "jump to previous fold")}
"zc" (m "<cmd>foldclose<cr>" "close fold")
"zo" (m "<cmd>foldopen<cr>" "open fold")})) "v" {:name "+view-and-layout"
"n" (cmd "set relativenumber!" "toggle relative numbers")
"m" (cmd "set nonumber! norelativenumber" "toggle numbers")
"g" (cmd "ZenMode" "toggle zen mode")
"i" (cmd "IndentGuidesToggle" "toggle indent guides")
"w" (cmd "set wrap! linebreak!" "toggle linewrapping")}
(wk.add "b" {:name "+buffers"
(key-map {"<tab>" {:hidden true :mode "i"}})) "b" (cmd ":Telescope buffers" "select open buffer")
"c" (cmd ":Bdelete!" "close open buffer")
"w" (cmd ":Bwipeout!" "wipeout open buffer")}}
(wk.add {:prefix"<leader>"})
(utils.prepend
(key-map (wk.register
{"<leader>s" (sel-cmd "VSSplit" "keep selection visible in split") {"<tab>" "which_key_ignore"
"<leader>z" (m open-selection-zotero "open in zotero") "gss" "init selection"
"z" {:name "+folds"
"c" (cmd "foldclose" "close fold")
"o" (cmd "foldopen" "open fold")}})
(wk.register
{"<tab>" "which_key_ignore"}
{:mode "i"})
(wk.register
{"s" (sel-cmd "VSSplit" "keep selection visible in split")
"z" [open-selection-zotero "open in zotero"]}
{:prefix "<leader>"
:mode "v"})
(wk.register
{:name "+Selection"
"j" "increment selection"
"k" "decrement selection"
"l" "increment node"
"h" "decrement node"}
{:prefix "gs"
:mode "v"})
"gs" {:group "+Selection"}
"gsj" {:desc "increment selection"}
"gsk" {:desc "decrement selection"}
"gsl" {:desc "increment node"}
"gsh" {:desc "decrement node"}})
{:mode "v"}))
(set vim.o.timeoutlen 200) (set vim.o.timeoutlen 200)

View file

@ -71,4 +71,4 @@
:tab {:bg colors.bright_yellow :fg colors.bright_yellow}}}))) :tab {:bg colors.bright_yellow :fg colors.bright_yellow}}})))
[(utils.plugin :akinsho/nvim-bufferline.lua [(utils.plugin :akinsho/nvim-bufferline.lua
{:config setup :tag "v4.7.0"})] {:config setup :tag "v4.5.2"})]

View file

@ -48,14 +48,12 @@
(fn vim-mode [] (fn vim-mode []
(.. " " (or (. modes (vim.fn.mode) :text) vim.fn.mode) " ")) (.. " " (or (. modes (vim.fn.mode) :text) vim.fn.mode) " "))
;(fn lsp-progress-provider []
;(let [msgs (vim.lsp.util.get_progress_messages)
;s (icollect [_ msg (ipairs msgs)]
;(when msg.message
;(.. msg.title " " msg.message)))]
;(or-empty (str.join " | " s))))
(fn lsp-progress-provider [] (fn lsp-progress-provider []
(vim.lsp.status)) (let [msgs (vim.lsp.util.get_progress_messages)
s (icollect [_ msg (ipairs msgs)]
(when msg.message
(.. msg.title " " msg.message)))]
(or-empty (str.join " | " s))))

View file

@ -153,7 +153,7 @@
{:dependencies ["nvim-lua/plenary.nvim"] {:dependencies ["nvim-lua/plenary.nvim"]
;:event ["BufRead Cargo.toml"] ;:event ["BufRead Cargo.toml"]
;:lazy true ;:lazy true
:opts {;:disable_invalid_feature_diagnostic true :opts {:disable_invalid_feature_diagnostic true
:enable_update_available_warning false}}) :enable_update_available_warning false}})
; temporarily using this fork that merges a few fixes, until simrat is back ; temporarily using this fork that merges a few fixes, until simrat is back

View file

@ -7,11 +7,6 @@
(tset ?opts 1 name) (tset ?opts 1 name)
?opts))) ?opts)))
(fn prepend [a list]
(local x list)
(table.insert x 1 a)
x)
(fn all [f] (fn all [f]
(not (a.some #(not (f $1))))) (not (a.some #(not (f $1)))))
@ -91,16 +86,16 @@
(let [default { :fg "NONE" :bg "NONE" :gui "NONE"} (let [default { :fg "NONE" :bg "NONE" :gui "NONE"}
opts (a.merge default colset)] opts (a.merge default colset)]
(each [_ group (ipairs (single-to-list group-arg))] (each [_ group (ipairs (single-to-list group-arg))]
(vim.cmd (.. "hi! " group " guifg='" opts.fg "' guibg='" opts.bg "' gui='" opts.gui "'"))))) (vim.cmd (.. "hi! "group" guifg='"opts.fg"' guibg='"opts.bg"' gui='"opts.gui"'")))))
(fn highlight-add [group-arg colset] (fn highlight-add [group-arg colset]
(each [_ group (ipairs (single-to-list group-arg))] (each [_ group (ipairs (single-to-list group-arg))]
(vim.cmd (vim.cmd
(.. "hi! " (.. "hi! "
group group
(surround-if-present " guibg='" colset.bg "'") (surround-if-present " guibg='"colset.bg"'")
(surround-if-present " guifg='" colset.fg "'") (surround-if-present " guifg='"colset.fg"'")
(surround-if-present " gui='" colset.gui "'"))))) (surround-if-present " gui='"colset.gui"'")))))
@ -155,6 +150,5 @@
: highlight : highlight
: highlight-add : highlight-add
: shorten-path : shorten-path
: prepend
: comp : comp
: get-selection} : get-selection}

View file

@ -1,107 +1,107 @@
{ {
"agda-vim": { "branch": "master", "commit": "4a0f475aaef756702222bdd5b01e25f814f5691f" }, "agda-vim": { "branch": "master", "commit": "4a0f475aaef756702222bdd5b01e25f814f5691f" },
"aniseed": { "branch": "master", "commit": "d558a68329c465bced901adf3238a6f946d62483" }, "aniseed": { "branch": "master", "commit": "7bc09736f3651c10d29b82d1a465b7f540614be1" },
"antifennel-nvim": { "branch": "master", "commit": "79261d02213a5093135e5d02431682f04459f0f7" }, "antifennel-nvim": { "branch": "master", "commit": "79261d02213a5093135e5d02431682f04459f0f7" },
"ats-vim": { "branch": "master", "commit": "8e3e722b6d09ed81313573b4e7b108b265628ff1" }, "ats-vim": { "branch": "master", "commit": "8e3e722b6d09ed81313573b4e7b108b265628ff1" },
"auto-pairs": { "branch": "master", "commit": "39f06b873a8449af8ff6a3eee716d3da14d63a76" }, "auto-pairs": { "branch": "master", "commit": "39f06b873a8449af8ff6a3eee716d3da14d63a76" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" }, "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
"cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-omni": { "branch": "main", "commit": "4ef610bbd85a5ee4e97e09450c0daecbdc60de86" }, "cmp-omni": { "branch": "main", "commit": "4ef610bbd85a5ee4e97e09450c0daecbdc60de86" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
"conflict-marker.vim": { "branch": "master", "commit": "62742b2ffe7a433988759c67b5c5a22eff74a14b" }, "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
"conjure": { "branch": "master", "commit": "6d2bc7f7b24c2c43d54f263bee7b9b08aef5d1a1" }, "conjure": { "branch": "master", "commit": "dfb9f75010a181c090ab905b2a2b4180aea20f15" },
"copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
"crates.nvim": { "branch": "main", "commit": "891063a2dc8471501b9742406a514be62a20c138" }, "crates.nvim": { "branch": "main", "commit": "f00e11e8282b94f2a2e938d32712c99f0e0bdeb4" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
"dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" }, "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
"editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" }, "editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" },
"emmet-vim": { "branch": "master", "commit": "6c511a8d7d2863066f32e25543e2bb99d505172c" }, "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" },
"feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" }, "feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" },
"fennel.vim": { "branch": "master", "commit": "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89" }, "fennel.vim": { "branch": "master", "commit": "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89" },
"flutter-tools.nvim": { "branch": "main", "commit": "e6671ce76acf607678cd79b12029371ab67fb6f5" }, "flutter-tools.nvim": { "branch": "main", "commit": "f04131d6b2c82c2a7624a8843642d6269b50b437" },
"friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
"gh.nvim": { "branch": "main", "commit": "ebbaac254ef7dd6f85b439825fbce82d0dc84515" }, "gh.nvim": { "branch": "main", "commit": "3181973d0c80fe0553e30e0aeeb860bedef9a33b" },
"gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, "gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" },
"glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" },
"haskell-vim": { "branch": "master", "commit": "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e" }, "haskell-vim": { "branch": "master", "commit": "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e" },
"hop.nvim": { "branch": "master", "commit": "1a1eceafe54b5081eae4cb91c723abd1d450f34b" }, "hop.nvim": { "branch": "master", "commit": "1a1eceafe54b5081eae4cb91c723abd1d450f34b" },
"idris2-vim": { "branch": "master", "commit": "964cebee493c85f75796e4f4e6bbb4ac54e2da9e" }, "idris2-vim": { "branch": "master", "commit": "964cebee493c85f75796e4f4e6bbb4ac54e2da9e" },
"inc-rename.nvim": { "branch": "main", "commit": "8ba77017ca468f3029bf88ef409c2d20476ea66b" }, "inc-rename.nvim": { "branch": "main", "commit": "5e03e986625961d1fac296d1bf332a6510c3add6" },
"kdl.vim": { "branch": "main", "commit": "b84d7d3a15d8d30da016cf9e98e2cfbe35cddee5" }, "kdl.vim": { "branch": "main", "commit": "b84d7d3a15d8d30da016cf9e98e2cfbe35cddee5" },
"kmonad-vim": { "branch": "master", "commit": "37978445197ab00edeb5b731e9ca90c2b141723f" }, "kmonad-vim": { "branch": "master", "commit": "37978445197ab00edeb5b731e9ca90c2b141723f" },
"lalrpop.vim": { "branch": "master", "commit": "7073eec8efdeff37cacd4bca378c28dad02c3c14" }, "lalrpop.vim": { "branch": "master", "commit": "7073eec8efdeff37cacd4bca378c28dad02c3c14" },
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" },
"litee.nvim": { "branch": "main", "commit": "4efaf373322d9e71eaff31164abb393417cc6f6a" }, "litee.nvim": { "branch": "main", "commit": "3c51764a615566e4c0223362f4be00acc23c430e" },
"lsp_lines.nvim": { "branch": "main", "commit": "7d9e2748b61bff6ebba6e30adbc7173ccf21c055" }, "lsp_lines.nvim": { "branch": "main", "commit": "6f3defec73f7c87939e800e9afa5d0571b19b401" },
"lsp_signature.nvim": { "branch": "master", "commit": "a38da0a61c172bb59e34befc12efe48359884793" }, "lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
"neoformat": { "branch": "master", "commit": "b3b38589b39038dc12c2f5a59a828ed43439363a" }, "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" },
"neogit": { "branch": "master", "commit": "6af8fc6b03210d0ac99398f8eff27c5be7b2ba8a" }, "neogit": { "branch": "master", "commit": "0cae7abc30cb91d661f28257c331fcb5b5198e31" },
"nerdcommenter": { "branch": "master", "commit": "3f860f2d981547c18f2c9599e3c358ea488c3be4" }, "nerdcommenter": { "branch": "master", "commit": "e361a44230860d616f799a337bc58f5218ab6e9c" },
"nfnl": { "branch": "main", "commit": "e43ca4e93d28a43f7b3cb19121afff8abcedbc3f" }, "nfnl": { "branch": "main", "commit": "d6b33ae7376dda6f26cca8365d9beaf66f43c410" },
"nvim-bufferline.lua": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" }, "nvim-bufferline.lua": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" },
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
"nvim-code-action-menu": { "branch": "main", "commit": "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b" }, "nvim-code-action-menu": { "branch": "main", "commit": "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
"nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" },
"nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
"nvim-jenkinsfile-linter": { "branch": "main", "commit": "b6b48b0a7aed92ed46bb9e1ab208dce92941f50b" }, "nvim-jenkinsfile-linter": { "branch": "main", "commit": "b6b48b0a7aed92ed46bb9e1ab208dce92941f50b" },
"nvim-lspconfig": { "branch": "master", "commit": "911167921d49cd5c1c9b2436031d0da3945e787f" }, "nvim-lspconfig": { "branch": "master", "commit": "7133e85c3df14a387da8942c094c7edddcdef309" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" },
"nvim-scrollbar": { "branch": "main", "commit": "d09f14aa16c9f2748e77008f9da7b1f76e4e7b85" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
"nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" },
"nvim.lua": { "branch": "master", "commit": "5d57be0b6eea6c06977b1c5fe0752da909cf4154" }, "nvim.lua": { "branch": "master", "commit": "5d57be0b6eea6c06977b1c5fe0752da909cf4154" },
"nvlime": { "branch": "master", "commit": "228e4fa8c7d10b1ed07b1649a63743613b77a828" }, "nvlime": { "branch": "master", "commit": "024b007766734d4be0e325eab2b33a3111720fbc" },
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, "obsidian.nvim": { "branch": "main", "commit": "b1bfc2ad9172f0405bf6c21e1f63cfb73f79b480" },
"octo.nvim": { "branch": "master", "commit": "0134169886958f3874f16eed7fe73d906a3e7e17" }, "octo.nvim": { "branch": "master", "commit": "5646539320cd62af6ff28f48ec92aeb724c68e18" },
"parinfer-rust": { "branch": "master", "commit": "d84828b453e158d06406f6b5e9056f6b54ff76c9" }, "parinfer-rust": { "branch": "master", "commit": "0e4d52e712641ad351a1bfe6cee3d34d63ed087b" },
"parsley": { "branch": "main", "commit": "c4100aa449bfa971dcfc56ffe4206ba034db08cc" }, "parsley": { "branch": "main", "commit": "c4100aa449bfa971dcfc56ffe4206ba034db08cc" },
"persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" },
"plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
"purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" }, "purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
"rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
"rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, "rustaceanvim": { "branch": "master", "commit": "cd35b0f7fb0c9fe6879b084096230a74fefa4da8" },
"sad.vim": { "branch": "master", "commit": "2f5b33b239a566ffedaa81cee3051bb613482d1e" }, "sad.vim": { "branch": "master", "commit": "2f5b33b239a566ffedaa81cee3051bb613482d1e" },
"stabilize.nvim": { "branch": "master", "commit": "eeb1873daffaba67246188a5668b366e45ed1de1" }, "stabilize.nvim": { "branch": "master", "commit": "eeb1873daffaba67246188a5668b366e45ed1de1" },
"startuptime.vim": { "branch": "master", "commit": "dfa57f522d6f61793fe5fea65bca7484751b8ca2" }, "startuptime.vim": { "branch": "master", "commit": "dfa57f522d6f61793fe5fea65bca7484751b8ca2" },
"tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
"targets.vim": { "branch": "master", "commit": "6325416da8f89992b005db3e4517aaef0242602e" }, "targets.vim": { "branch": "master", "commit": "642d3a4ce306264b05ea3219920b13ea80931767" },
"telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" }, "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
"telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, "telescope.nvim": { "branch": "master", "commit": "35f94f0ef32d70e3664a703cefbe71bd1456d899" },
"todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
"trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
"typescript-vim": { "branch": "master", "commit": "8d169e16b5487771f6568125d4c63e6086e524d9" }, "typescript-vim": { "branch": "master", "commit": "e83ccab88c7a045ce795583adb66956afd464a31" },
"vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" }, "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },
"vim-exchange": { "branch": "master", "commit": "d6c1e9790bcb8df27c483a37167459bbebe0112e" }, "vim-exchange": { "branch": "master", "commit": "d6c1e9790bcb8df27c483a37167459bbebe0112e" },
"vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" },
"vim-gh-line": { "branch": "master", "commit": "731751fdfa4f64a061dbc7088cb7b2f12e0828ad" }, "vim-gh-line": { "branch": "master", "commit": "731751fdfa4f64a061dbc7088cb7b2f12e0828ad" },
"vim-gruvbox8": { "branch": "master", "commit": "008b7773e5f2cba625a5fcc5acc543b28b19cd26" }, "vim-gruvbox8": { "branch": "master", "commit": "d1cf31e5215ad6f5544d9e631383aef4b6c35cb7" },
"vim-indent-guides": { "branch": "master", "commit": "a1e1390c0136e63e813d051de2003bf0ee18ae30" }, "vim-indent-guides": { "branch": "master", "commit": "a1e1390c0136e63e813d051de2003bf0ee18ae30" },
"vim-javascript": { "branch": "master", "commit": "c470ce1399a544fe587eab950f571c83cccfbbdc" }, "vim-javascript": { "branch": "master", "commit": "c470ce1399a544fe587eab950f571c83cccfbbdc" },
"vim-jsonc": { "branch": "master", "commit": "0b7ca17da85b5faa813be8ead3ad497e348b2763" }, "vim-jsonc": { "branch": "master", "commit": "0b7ca17da85b5faa813be8ead3ad497e348b2763" },
"vim-jsx": { "branch": "master", "commit": "8879e0d9c5ba0e04ecbede1c89f63b7a0efa24af" }, "vim-jsx": { "branch": "master", "commit": "8879e0d9c5ba0e04ecbede1c89f63b7a0efa24af" },
"vim-nix": { "branch": "master", "commit": "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0" }, "vim-nix": { "branch": "master", "commit": "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0" },
"vim-raku": { "branch": "master", "commit": "f4496123353cce789fc6645ceb686f5cf51acca3" }, "vim-raku": { "branch": "master", "commit": "f4496123353cce789fc6645ceb686f5cf51acca3" },
"vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
"vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" }, "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
"vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" }, "vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" },
"vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" }, "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" },
"vim-tsx": { "branch": "master", "commit": "77c89c42e189fefd3c9a632b37b7e3b3b9edf918" }, "vim-tsx": { "branch": "master", "commit": "77c89c42e189fefd3c9a632b37b7e3b3b9edf918" },
"vim-visual-multi": { "branch": "master", "commit": "38b0e8d94a5499ccc17d6159763d32c79f53417b" }, "vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" },
"vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }, "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
"vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" }, "vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" },
"vimtex": { "branch": "master", "commit": "76ef99f73a5ff10be59836a4af4f928eaa8ad284" }, "vimtex": { "branch": "master", "commit": "6c01660a99c0cc0906b39094f4a2d086b28fa995" },
"webapi-vim": { "branch": "master", "commit": "70c49ada7827d3545a65cbdab04c5c89a3a8464e" }, "webapi-vim": { "branch": "master", "commit": "70c49ada7827d3545a65cbdab04c5c89a3a8464e" },
"which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
"yats.vim": { "branch": "master", "commit": "b325c449a2db4d9ee38aa441afa850a815982e8b" }, "yats.vim": { "branch": "master", "commit": "6927af6e3e45d0ce585684be5681bada0ffcc3a7" },
"yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" } "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }
} }

View file

@ -29,36 +29,20 @@ local function open_selection_zotero()
local _, _0, sel = utils["get-selection"]() local _, _0, sel = utils["get-selection"]()
return vim.cmd(("silent !xdg-open zotero://select/items/@" .. str.join(sel))) return vim.cmd(("silent !xdg-open zotero://select/items/@" .. str.join(sel)))
end end
local function key_map(obj)
local tbl_21_auto = {}
local i_22_auto = 0
for key, val in pairs(obj) do
local val_23_auto = utils.prepend(key, val)
if (nil ~= val_23_auto) then
i_22_auto = (i_22_auto + 1)
tbl_21_auto[i_22_auto] = val_23_auto
else
end
end
return tbl_21_auto
end
local function m(bind, desc)
return {bind, desc = desc}
end
local function cmd(s, desc) local function cmd(s, desc)
return utils.prepend(("<cmd>" .. s .. "<cr>"), {desc = desc}) return {("<cmd>" .. s .. "<cr>"), desc}
end end
local function sel_cmd(s, desc) local function sel_cmd(s, desc)
return utils.prepend(("<cmd>'<,'>" .. s .. "<cr>"), {desc = desc}) return {("<cmd>'<,'>" .. s .. "<cr>"), desc}
end end
local function rebind(s, desc) local function rebind(s, desc)
return m(s, desc) return {s, desc}
end end
local function format() local function format()
local function _3_(_241) local function _2_(_241)
return _241.server_capabilities.documentFormattingProvider return _241.server_capabilities.documentFormattingProvider
end end
if a.some(_3_, vim.lsp.get_active_clients()) then if a.some(_2_, vim.lsp.get_active_clients()) then
return vim.lsp.buf.format({async = true}) return vim.lsp.buf.format({async = true})
else else
return vim.cmd("Neoformat") return vim.cmd("Neoformat")
@ -75,31 +59,32 @@ local function toggle_lsp_lines_current()
return vim.diagnostic.config({virtual_lines = {only_current_line = true}}) return vim.diagnostic.config({virtual_lines = {only_current_line = true}})
end end
wk.setup({}) wk.setup({})
local function _5_() local function _4_()
vim.o.spell = not vim.o.spell vim.o.spell = not vim.o.spell
return nil return nil
end end
local function _6_() local function _5_()
return vim.diagnostic.open_float({scope = "cursor"}) return vim.diagnostic.open_float({scope = "cursor"})
end end
local function _7_() local function _6_()
return vim.diagnostic.open_float({}) return vim.diagnostic.open_float({})
end end
local function _8_() local function _7_()
return glance.open("definitions") return glance.open("definitions")
end end
local function _9_() local function _8_()
return glance.open("references") return glance.open("references")
end end
local function _10_() local function _9_()
return glance.open("type_definitions") return glance.open("type_definitions")
end end
local function _11_() local function _10_()
return glance.open("implementations") return glance.open("implementations")
end end
wk.add(key_map({["<leader>c"] = {group = "+Crates"}, ["<leader>e"] = {group = "+emmet"}, ["<leader>["] = cmd("HopWord", "Hop to a word"), ["<leader>h"] = cmd("bprevious", "previous buffer"), ["<leader>l"] = cmd("bnext", "next buffer"), ["<leader>o"] = cmd("Telescope live_grep", "Grep files"), ["<leader>P"] = cmd("Telescope frecency frecency default_text=:CWD:", "Frecency magic"), ["<leader>p"] = cmd("Telescope find_files", "Open file-browser"), ["<leader>:"] = cmd("Telescope commands", "Search command with fzf"), ["<leader>s"] = cmd("w", "Save file"), ["<leader>g"] = cmd("Neogit", "Git"), ["<leader>n"] = m(require("persistence").load, "Load last session"), ["<leader>d"] = {group = "+Debugging"}, ["<leader>db"] = m(dap.toggle_breakpoint, "toggle breakpoint"), ["<leader>du"] = m(dapui.toggle, "toggle dapui"), ["<leader>dc"] = m(dap.step_into, "continue"), ["<leader>dr"] = m(dap.repl.open, "open repl"), ["<leader>ds"] = {group = "+Step"}, ["<leader>dso"] = m(dap.step_over, "over"), ["<leader>dsu"] = m(dap.step_out, "out"), ["<leader>dsi"] = m(dap.step_into, "into"), ["<leader>m"] = {group = "+Code actions"}, ["<leader>m;"] = m(_5_, "Toggle spell checking"), ["<leader>md"] = m(vim.lsp.buf.hover, "Show documentation"), ["<leader>mo"] = cmd("SymbolsOutline", "Outline"), ["<leader>mS"] = cmd("Telescope lsp_document_symbols", "Symbols in document"), ["<leader>ms"] = cmd("Telescope lsp_dynamic_workspace_symbols", "Symbols in workspace"), ["<leader>mT"] = m(vim.lsp.buf.signature_help, "Show signature help"), ["<leader>mn"] = m(open_rename, "Rename"), ["<leader>mv"] = cmd("CodeActionMenu", "Apply codeaction"), ["<leader>mA"] = m(_6_, "Cursor diagnostics"), ["<leader>ma"] = m(_7_, "Line diagnostics"), ["<leader>mh"] = cmd("RustToggleInlayHints", "Toggle inlay hints"), ["<leader>mr"] = cmd("Trouble lsp_references", "Show references"), ["<leader>mE"] = cmd("Trouble document_diagnostics", "List diagnostics"), ["<leader>me"] = cmd("Trouble workspace_diagnostics", "Show diagnostics"), ["<leader>mt"] = cmd("Trouble lsp_type_definitions", "Go to type-definition"), ["<leader>mi"] = cmd("Trouble lsp_implementations", "Show implementation"), ["<leader>mg"] = cmd("Trouble lsp_definitions", "Go to definition"), ["<leader>mw"] = m(toggle_lsp_lines, "Toggle LSP lines"), ["<leader>mW"] = m(toggle_lsp_lines_current, "Toggle LSP line"), ["<leader>mf"] = m(format, "format file"), ["<leader>m,"] = cmd("RustRunnables", "Run rust stuff"), ["<leader>mx"] = {group = "+Glance"}, ["<leader>mxd"] = m(_8_, "Definitions"), ["<leader>mxr"] = m(_9_, "References"), ["<leader>mxt"] = m(_10_, "Type definitions"), ["<leader>mxi"] = m(_11_, "Implementations"), ["<leader>mcj"] = m(crates.show_popup, "crates popup"), ["<leader>mcf"] = m(crates.show_features_popup, "crate features"), ["<leader>mcv"] = m(crates.show_versions_popup, "crate versions"), ["<leader>mcd"] = m(crates.show_dependencies_popup, "crate dependencies"), ["<leader>mch"] = m(crates.open_documentation, "crate documentation"), ["<leader>f"] = {group = "+folds"}, ["<leader>fo"] = cmd("foldopen", "open fold"), ["<leader>fn"] = cmd("foldclose", "close fold"), ["<leader>fj"] = rebind("zj", "jump to next fold"), ["<leader>fk"] = rebind("zk", "jump to previous fold"), ["<leader>v"] = {group = "+view-and-layout"}, ["<leader>vn"] = cmd("set relativenumber!", "toggle relative numbers"), ["<leader>vm"] = cmd("set nonumber! norelativenumber", "toggle numbers"), ["<leader>vg"] = cmd("ZenMode", "toggle zen mode"), ["<leader>vi"] = cmd("IndentGuidesToggle", "toggle indent guides"), ["<leader>vw"] = cmd("set wrap! linebreak!", "toggle linewrapping"), ["<leader>b"] = {group = "+buffers"}, ["<leader>bb"] = cmd(":Telescope buffers", "select open buffer"), ["<leader>bc"] = cmd(":Bdelete!", "close open buffer"), ["<leader>bw"] = cmd(":Bwipeout!", "wipeout open buffer")})) wk.register({c = {name = "+comment out"}, e = {name = "+emmet"}, ["["] = cmd("HopWord", "Hop to a word"), h = cmd("bprevious", "previous buffer"), l = cmd("bnext", "next buffer"), o = cmd("Telescope live_grep", "Grep files"), P = cmd("Telescope frecency frecency default_text=:CWD:", "Frecency magic"), p = cmd("Telescope find_files", "Open file-browser"), [":"] = cmd("Telescope commands", "Search command with fzf"), s = cmd("w", "Save file"), g = cmd("Neogit", "Git"), n = {(require("persistence")).load, "Load last session"}, d = {name = "+Debugging", b = {dap.toggle_breakpoint, "toggle breakpoint"}, u = {dapui.toggle, "toggle dapui"}, c = {dap.step_into, "continue"}, r = {dap.repl.open, "open repl"}, s = {name = "+Step", o = {dap.step_over, "over"}, u = {dap.step_out, "out"}, i = {dap.step_into, "into"}}}, m = {name = "+Code actions", [";"] = {_4_, "Toggle spell checking"}, d = {vim.lsp.buf.hover, "Show documentation"}, o = cmd("SymbolsOutline", "Outline"), S = cmd("Telescope lsp_document_symbols", "Symbols in document"), s = cmd("Telescope lsp_dynamic_workspace_symbols", "Symbols in workspace"), T = {vim.lsp.buf.signature_help, "Show signature help"}, n = {open_rename, "Rename"}, v = cmd("CodeActionMenu", "Apply codeaction"), A = {_5_, "Cursor diagnostics"}, a = {_6_, "Line diagnostics"}, h = cmd("RustToggleInlayHints", "Toggle inlay hints"), r = cmd("Trouble lsp_references", "Show references"), E = cmd("Trouble document_diagnostics", "List diagnostics"), e = cmd("Trouble workspace_diagnostics", "Show diagnostics"), t = cmd("Trouble lsp_type_definitions", "Go to type-definition"), i = cmd("Trouble lsp_implementations", "Show implementation"), g = cmd("Trouble lsp_definitions", "Go to definition"), w = {toggle_lsp_lines, "Toggle LSP lines"}, W = {toggle_lsp_lines_current, "Toggle LSP line"}, f = {format, "format file"}, [","] = cmd("RustRunnables", "Run rust stuff"), x = {name = "+Glance", d = {_7_, "Definitions"}, r = {_8_, "References"}, t = {_9_, "Type definitions"}, i = {_10_, "Implementations"}}, c = {name = "+Crates", j = {crates.show_popup, "crates popup"}, f = {crates.show_features_popup, "crate features"}, v = {crates.show_versions_popup, "crate versions"}, d = {crates.show_dependencies_popup, "crate dependencies"}, h = {crates.open_documentation, "crate documentation"}}}, f = {name = "+folds", o = cmd("foldopen", "open fold"), n = cmd("foldclose", "close fold"), j = rebind("zj", "jump to next fold"), k = rebind("zk", "jump to previous fold")}, v = {name = "+view-and-layout", n = cmd("set relativenumber!", "toggle relative numbers"), m = cmd("set nonumber! norelativenumber", "toggle numbers"), g = cmd("ZenMode", "toggle zen mode"), i = cmd("IndentGuidesToggle", "toggle indent guides"), w = cmd("set wrap! linebreak!", "toggle linewrapping")}, b = {name = "+buffers", b = cmd(":Telescope buffers", "select open buffer"), c = cmd(":Bdelete!", "close open buffer"), w = cmd(":Bwipeout!", "wipeout open buffer")}}, {prefix = "<leader>"})
wk.add(key_map({["<tab>"] = {hidden = true}, gss = {desc = "init selection"}, z = {group = "folds"}, zc = m("<cmd>foldclose<cr>", "close fold"), zo = m("<cmd>foldopen<cr>", "open fold")})) wk.register({["<tab>"] = "which_key_ignore", gss = "init selection", z = {name = "+folds", c = cmd("foldclose", "close fold"), o = cmd("foldopen", "open fold")}})
wk.add(key_map({["<tab>"] = {hidden = true, mode = "i"}})) wk.register({["<tab>"] = "which_key_ignore"}, {mode = "i"})
wk.add(utils.prepend(key_map({["<leader>s"] = sel_cmd("VSSplit", "keep selection visible in split"), ["<leader>z"] = m(open_selection_zotero, "open in zotero"), gs = {group = "+Selection"}, gsj = {desc = "increment selection"}, gsk = {desc = "decrement selection"}, gsl = {desc = "increment node"}, gsh = {desc = "decrement node"}}), {mode = "v"})) wk.register({s = sel_cmd("VSSplit", "keep selection visible in split"), z = {open_selection_zotero, "open in zotero"}}, {prefix = "<leader>", mode = "v"})
wk.register({name = "+Selection", j = "increment selection", k = "decrement selection", l = "increment node", h = "decrement node"}, {prefix = "gs", mode = "v"})
vim.o.timeoutlen = 200 vim.o.timeoutlen = 200
return nil return nil

View file

@ -8,10 +8,10 @@ local bufferline = autoload("bufferline")
vim.cmd("hi link BufferLineTabSeparatorSelected BufferLineSeparatorSelected") vim.cmd("hi link BufferLineTabSeparatorSelected BufferLineSeparatorSelected")
vim.cmd("hi link BufferLineTabSeparator BufferLineSeparator") vim.cmd("hi link BufferLineTabSeparator BufferLineSeparator")
local function mk_active(fg) local function mk_active(fg)
return {bg = colors.neutral_aqua, fg = fg, bold = false, italic = false} return {bg = colors.neutral_aqua, fg = fg, italic = false, bold = false}
end end
local function mk_visible(fg) local function mk_visible(fg)
return {bg = colors.dark1, fg = fg, bold = false, italic = false} return {bg = colors.dark1, fg = fg, italic = false, bold = false}
end end
local function setup() local function setup()
local selected = {bg = colors.neutral_aqua, fg = colors.bg_main, gui = "NONE"} local selected = {bg = colors.neutral_aqua, fg = colors.bg_main, gui = "NONE"}
@ -19,6 +19,6 @@ local function setup()
local function _2_(cnt, _lvl, _diagnostics_dict) local function _2_(cnt, _lvl, _diagnostics_dict)
return (" (" .. cnt .. ")") return (" (" .. cnt .. ")")
end end
return bufferline.setup({options = {diagnostics = "nvim_lsp", diagnostics_indicator = _2_, tab_size = 10, enforce_regular_tabs = false, show_buffer_close_icons = false, show_buffer_icons = false, show_close_icon = false, show_tab_indicators = false}, highlights = {fill = {bg = colors.bg_main, fg = colors.light0}, background = visible, buffer_visible = visible, buffer_selected = a.assoc(selected, "bold", false, "italic", false), modified = visible, modified_visible = visible, modified_selected = selected, hint = visible, hint_visible = visible, hint_selected = selected, info = visible, info_visible = visible, info_selected = selected, warning = visible, warning_visible = visible, warning_selected = selected, error = visible, error_visible = visible, error_selected = selected, duplicate = visible, duplicate_visible = visible, duplicate_selected = selected, diagnostic = mk_visible(colors.neutral_red), diagnostic_visible = mk_visible(colors.neutral_red), diagnostic_selected = mk_active(colors.faded_red), info_diagnostic = mk_visible(colors.neutral_blue), info_diagnostic_visible = mk_visible(colors.neutral_blue), info_diagnostic_selected = mk_active(colors.faded_blue), hint_diagnostic = mk_visible(colors.neutral_yellow), hint_diagnostic_visible = mk_visible(colors.neutral_yellow), hint_diagnostic_selected = mk_active(colors.faded_orange), warning_diagnostic = mk_visible(colors.neutral_orange), warning_diagnostic_visible = mk_visible(colors.neutral_orange), warning_diagnostic_selected = mk_active(colors.faded_orange), error_diagnostic = mk_visible(colors.neutral_red), error_diagnostic_visible = mk_visible(colors.neutral_red), error_diagnostic_selected = mk_active(colors.red), separator = visible, separator_visible = {bg = colors.red}, separator_selected = {bg = colors.red}, indicator_selected = {bg = colors.neutral_aqua, fg = colors.neutral_aqua, bold = false, italic = false}, tab_separator = {bg = colors.red}, tab_separator_selected = {bg = colors.neutral_aqua, fg = colors.neutral_aqua}, pick_selected = {bg = colors.bright_red, fg = colors.bright_red}, tab_selected = {bg = colors.bright_green, fg = colors.bright_green}, tab = {bg = colors.bright_yellow, fg = colors.bright_yellow}}}) return bufferline.setup({options = {diagnostics = "nvim_lsp", diagnostics_indicator = _2_, tab_size = 10, enforce_regular_tabs = false, show_buffer_close_icons = false, show_tab_indicators = false, show_close_icon = false, show_buffer_icons = false}, highlights = {fill = {bg = colors.bg_main, fg = colors.light0}, background = visible, buffer_visible = visible, buffer_selected = a.assoc(selected, "bold", false, "italic", false), modified = visible, modified_visible = visible, modified_selected = selected, hint = visible, hint_visible = visible, hint_selected = selected, info = visible, info_visible = visible, info_selected = selected, warning = visible, warning_visible = visible, warning_selected = selected, error = visible, error_visible = visible, error_selected = selected, duplicate = visible, duplicate_visible = visible, duplicate_selected = selected, diagnostic = mk_visible(colors.neutral_red), diagnostic_visible = mk_visible(colors.neutral_red), diagnostic_selected = mk_active(colors.faded_red), info_diagnostic = mk_visible(colors.neutral_blue), info_diagnostic_visible = mk_visible(colors.neutral_blue), info_diagnostic_selected = mk_active(colors.faded_blue), hint_diagnostic = mk_visible(colors.neutral_yellow), hint_diagnostic_visible = mk_visible(colors.neutral_yellow), hint_diagnostic_selected = mk_active(colors.faded_orange), warning_diagnostic = mk_visible(colors.neutral_orange), warning_diagnostic_visible = mk_visible(colors.neutral_orange), warning_diagnostic_selected = mk_active(colors.faded_orange), error_diagnostic = mk_visible(colors.neutral_red), error_diagnostic_visible = mk_visible(colors.neutral_red), error_diagnostic_selected = mk_active(colors.red), separator = visible, separator_visible = {bg = colors.red}, separator_selected = {bg = colors.red}, indicator_selected = {bg = colors.neutral_aqua, fg = colors.neutral_aqua, italic = false, bold = false}, tab_separator = {bg = colors.red}, tab_separator_selected = {bg = colors.neutral_aqua, fg = colors.neutral_aqua}, pick_selected = {bg = colors.bright_red, fg = colors.bright_red}, tab_selected = {bg = colors.bright_green, fg = colors.bright_green}, tab = {bg = colors.bright_yellow, fg = colors.bright_yellow}}})
end end
return {utils.plugin("akinsho/nvim-bufferline.lua", {config = setup, tag = "v4.7.0"})} return {utils.plugin("akinsho/nvim-bufferline.lua", {config = setup, tag = "v4.5.2"})}

View file

@ -10,11 +10,11 @@ local function item_formatter(item, vim_item)
do do
local t_2_ = item local t_2_ = item
if (nil ~= t_2_) then if (nil ~= t_2_) then
t_2_ = t_2_.completion_item t_2_ = (t_2_).completion_item
else else
end end
if (nil ~= t_2_) then if (nil ~= t_2_) then
t_2_ = t_2_.detail t_2_ = (t_2_).detail
else else
end end
details = t_2_ details = t_2_

View file

@ -48,11 +48,11 @@ local function setup()
local function _7_() local function _7_()
local t_6_ = vim.b local t_6_ = vim.b
if (nil ~= t_6_) then if (nil ~= t_6_) then
t_6_ = t_6_.gitsigns_status_dict t_6_ = (t_6_).gitsigns_status_dict
else else
end end
if (nil ~= t_6_) then if (nil ~= t_6_) then
t_6_ = t_6_.head t_6_ = (t_6_).head
else else
end end
return t_6_ return t_6_
@ -63,21 +63,41 @@ local function setup()
return (" " .. (modes[vim.fn.mode()].text or vim.fn.mode) .. " ") return (" " .. (modes[vim.fn.mode()].text or vim.fn.mode) .. " ")
end end
local function lsp_progress_provider() local function lsp_progress_provider()
return vim.lsp.status() local msgs = vim.lsp.util.get_progress_messages()
local s
do
local tbl_17_auto = {}
local i_18_auto = #tbl_17_auto
for _, msg in ipairs(msgs) do
local val_19_auto
if msg.message then
val_19_auto = (msg.title .. " " .. msg.message)
else
val_19_auto = nil
end
if (nil ~= val_19_auto) then
i_18_auto = (i_18_auto + 1)
do end (tbl_17_auto)[i_18_auto] = val_19_auto
else
end
end
s = tbl_17_auto
end
return or_empty(str.join(" | ", s))
end end
local function lsp_diagnostic_component(kind, color) local function lsp_diagnostic_component(kind, color)
local function _10_() local function _12_()
return (0 ~= #vim.diagnostic.get(0, {severity = kind})) return (0 ~= #vim.diagnostic.get(0, {severity = kind}))
end end
local function _11_() local function _13_()
return spaces(#vim.diagnostic.get(0, {severity = kind})) return spaces(#vim.diagnostic.get(0, {severity = kind}))
end end
return {enabled = _10_, provider = _11_, left_sep = "", right_sep = "", hl = {fg = bar_bg, bg = color}} return {enabled = _12_, provider = _13_, left_sep = "", right_sep = "", hl = {fg = bar_bg, bg = color}}
end end
local function coordinates() local function coordinates()
local _let_12_ = vim.api.nvim_win_get_cursor(0) local _let_14_ = vim.api.nvim_win_get_cursor(0)
local line = _let_12_[1] local line = _let_14_[1]
local col = _let_12_[2] local col = _let_14_[2]
return (" " .. line .. ":" .. col .. " ") return (" " .. line .. ":" .. col .. " ")
end end
local function inactive_separator_provider() local function inactive_separator_provider()
@ -88,24 +108,24 @@ local function setup()
end end
end end
local components = {active = {}, inactive = {}} local components = {active = {}, inactive = {}}
local function _14_() local function _16_()
return vim_mode_hl(false) return vim_mode_hl(false)
end end
local function _15_()
return vim_mode_hl(true)
end
components.active[1] = {{provider = vim_mode, hl = _14_}, {provider = get_current_filepath, left_sep = " ", hl = {fg = colors.light4}}, {provider = git_status_provider, left_sep = " ", hl = _15_}}
local function _16_()
return (0 < #vim.lsp.buf_get_clients())
end
components.active[2] = {{provider = lsp_progress_provider, left_sep = " ", right_sep = " ", enabled = _16_}}
local function _17_() local function _17_()
return vim_mode_hl(true) return vim_mode_hl(true)
end end
components.active[1] = {{provider = vim_mode, hl = _16_}, {provider = get_current_filepath, left_sep = " ", hl = {fg = colors.light4}}, {provider = git_status_provider, left_sep = " ", hl = _17_}}
local function _18_() local function _18_()
return (0 < #vim.lsp.buf_get_clients())
end
components.active[2] = {{provider = lsp_progress_provider, left_sep = " ", right_sep = " ", enabled = _18_}}
local function _19_()
return vim_mode_hl(true)
end
local function _20_()
return vim_mode_hl(false) return vim_mode_hl(false)
end end
components.active[3] = {{provider = vim.bo.filetype, right_sep = " ", hl = _17_}, lsp_diagnostic_component(vim.diagnostic.severity.INFO, colors.neutral_green), lsp_diagnostic_component(vim.diagnostic.severity.HINT, colors.neutral_aqua), lsp_diagnostic_component(vim.diagnostic.severity.WARN, colors.neutral_yellow), lsp_diagnostic_component(vim.diagnostic.severity.ERROR, colors.neutral_red), {provider = coordinates, hl = _18_}} components.active[3] = {{provider = vim.bo.filetype, right_sep = " ", hl = _19_}, lsp_diagnostic_component(vim.diagnostic.severity.INFO, colors.neutral_green), lsp_diagnostic_component(vim.diagnostic.severity.HINT, colors.neutral_aqua), lsp_diagnostic_component(vim.diagnostic.severity.WARN, colors.neutral_yellow), lsp_diagnostic_component(vim.diagnostic.severity.ERROR, colors.neutral_red), {provider = coordinates, hl = _20_}}
components.inactive[1] = {{provider = inactive_separator_provider, hl = {bg = "NONE", fg = horiz_separator_color}}} components.inactive[1] = {{provider = inactive_separator_provider, hl = {bg = "NONE", fg = horiz_separator_color}}}
utils["highlight-add"]("StatusLineNC", {bg = "NONE", fg = colors.light1}) utils["highlight-add"]("StatusLineNC", {bg = "NONE", fg = colors.light1})
return feline.setup({theme = {fg = colors.light1, bg = colors.bg_main}, components = components}) return feline.setup({theme = {fg = colors.light1, bg = colors.bg_main}, components = components})

View file

@ -153,7 +153,7 @@ local function setup()
return previous_handler(a0, result, b, c) return previous_handler(a0, result, b, c)
else else
local new_contents = cleanup_markdown(result.contents) local new_contents = cleanup_markdown(result.contents)
result["contents"] = new_contents do end (result)["contents"] = new_contents
return previous_handler(a0, result, b, c) return previous_handler(a0, result, b, c)
end end
end end
@ -161,6 +161,6 @@ local function setup()
return nil return nil
end end
local function _18_() local function _18_()
return require("mason").setup() return (require("mason")).setup()
end end
return {utils.plugin("williamboman/mason.nvim", {config = _18_}), utils.plugin("williamboman/mason-lspconfig.nvim", {config = {ensure_installed = {"rust_analyzer"}}}), utils.plugin("neovim/nvim-lspconfig", {event = "VeryLazy", lazy = true, config = setup})} return {utils.plugin("williamboman/mason.nvim", {config = _18_}), utils.plugin("williamboman/mason-lspconfig.nvim", {config = {ensure_installed = {"rust_analyzer"}}}), utils.plugin("neovim/nvim-lspconfig", {event = "VeryLazy", lazy = true, config = setup})}

View file

@ -6,17 +6,17 @@ local lsp = autoload("lspconfig")
local configs = autoload("lspconfig/configs") local configs = autoload("lspconfig/configs")
local lsputil = autoload("lspconfig/util") local lsputil = autoload("lspconfig/util")
local function cmds(xs) local function cmds(xs)
local tbl_21_auto = {} local tbl_17_auto = {}
local i_22_auto = 0 local i_18_auto = #tbl_17_auto
for _, x in ipairs(xs) do for _, x in ipairs(xs) do
local val_23_auto = ("\\" .. x .. "{}") local val_19_auto = ("\\" .. x .. "{}")
if (nil ~= val_23_auto) then if (nil ~= val_19_auto) then
i_22_auto = (i_22_auto + 1) i_18_auto = (i_18_auto + 1)
tbl_21_auto[i_22_auto] = val_23_auto do end (tbl_17_auto)[i_18_auto] = val_19_auto
else else
end end
end end
return tbl_21_auto return tbl_17_auto
end end
local latex_command_settings = {dummy = cmds({"texttt", "scripture", "lstref", "figref", "tblref", "secref", "personaltextcite", "personalparencite", "textcite", "parencite", "parencite[]", "game", "acsu", "enquote", "name", "item", "reqref", "gamebtn", "fs", "cs", "appref", "sorty"}), ignore = cmds({"urlfootnote", "caption", "todo"})} local latex_command_settings = {dummy = cmds({"texttt", "scripture", "lstref", "figref", "tblref", "secref", "personaltextcite", "personalparencite", "textcite", "parencite", "parencite[]", "game", "acsu", "enquote", "name", "item", "reqref", "gamebtn", "fs", "cs", "appref", "sorty"}), ignore = cmds({"urlfootnote", "caption", "todo"})}
local Dictionary_file = {["de-DE"] = {(vim.fn.getenv("HOME") .. "/.config/ltex-ls/dictionary.txt")}} local Dictionary_file = {["de-DE"] = {(vim.fn.getenv("HOME") .. "/.config/ltex-ls/dictionary.txt")}}
@ -146,7 +146,7 @@ local function init()
local orig_execute_command = vim.lsp.buf.execute_command local orig_execute_command = vim.lsp.buf.execute_command
local function _16_(command) local function _16_(command)
if (command.command == "_ltex.addToDictionary") then if (command.command == "_ltex.addToDictionary") then
local arg = command.arguments[1].words local arg = (command.arguments[1]).words
for lang, words in pairs(arg) do for lang, words in pairs(arg) do
for _, word in ipairs(words) do for _, word in ipairs(words) do
local filetype = "dictionary" local filetype = "dictionary"
@ -155,7 +155,7 @@ local function init()
end end
return nil return nil
elseif (command.command == "_ltex.disableRules") then elseif (command.command == "_ltex.disableRules") then
local arg = command.arguments[1].ruleIds local arg = (command.arguments[1]).ruleIds
for lang, rules in pairs(arg) do for lang, rules in pairs(arg) do
for _, rule in ipairs(rules) do for _, rule in ipairs(rules) do
local filetype = "disable" local filetype = "disable"
@ -164,7 +164,7 @@ local function init()
end end
return nil return nil
elseif (command.command == "_ltex.hideFalsePositives") then elseif (command.command == "_ltex.hideFalsePositives") then
local arg = command.arguments[1].falsePositives local arg = (command.arguments[1]).falsePositives
for lang, rules in pairs(arg) do for lang, rules in pairs(arg) do
for _, rule in ipairs(rules) do for _, rule in ipairs(rules) do
local filetype = "falsePositive" local filetype = "falsePositive"

View file

@ -1,11 +1,11 @@
-- [nfnl] Compiled from fnl/dots/plugins/plugins.fnl by https://github.com/Olical/nfnl, do not edit. -- [nfnl] Compiled from fnl/dots/plugins/plugins.fnl by https://github.com/Olical/nfnl, do not edit.
local function _1_() local function _1_()
require("lsp_lines").setup() do end (require("lsp_lines")).setup()
return vim.diagnostic.config({virtual_lines = false}) return vim.diagnostic.config({virtual_lines = false})
end end
local function _2_() local function _2_()
require("litee.lib").setup() do end (require("litee.lib")).setup()
return require("litee.gh").setup() return (require("litee.gh")).setup()
end end
local function _3_() local function _3_()
vim.g.code_action_menu_show_details = false vim.g.code_action_menu_show_details = false
@ -23,4 +23,4 @@ local function _6_()
vim.g.rustfmt_fail_silently = 1 vim.g.rustfmt_fail_silently = 1
return nil return nil
end end
return {"Olical/aniseed", "Olical/nfnl", "nvim-lua/plenary.nvim", "norcalli/nvim.lua", "kyazdani42/nvim-web-devicons", "folke/which-key.nvim", {"ckipp01/nvim-jenkinsfile-linter", dependencies = {"nvim-lua/plenary.nvim"}}, "psliwka/vim-smoothie", {"nathanaelkane/vim-indent-guides", cmd = {"IndentGuidesToggle"}}, {"luukvbaal/stabilize.nvim", config = true}, {"stevearc/dressing.nvim", config = true}, {"tweekmonster/startuptime.vim", cmd = {"StartupTime"}}, {"moll/vim-bbye", lazy = true, cmd = {"Bdelete", "Bwipeout"}}, {"petertriho/nvim-scrollbar", event = "VeryLazy", lazy = true, config = true}, {"TimUntersberger/neogit", opts = {integrations = {diffview = true}}, cmd = {"Neogit"}}, {"folke/persistence.nvim", opts = {dir = vim.fn.expand((vim.fn.stdpath("cache") .. "/sessions/"))}}, {"https://git.sr.ht/~whynothugo/lsp_lines.nvim", config = _1_}, "jiangmiao/auto-pairs", "tpope/vim-repeat", {"preservim/nerdcommenter", event = "VeryLazy", lazy = true, priority = 1000}, {"godlygeek/tabular", cmd = {"Tabularize"}}, "tpope/vim-surround", "hauleth/sad.vim", "wellle/targets.vim", {"mg979/vim-visual-multi", lazy = true, event = "VeryLazy"}, "tommcdo/vim-exchange", {"phaazon/hop.nvim", lazy = true, event = "VeryLazy", opts = {keys = "jfkdls;amvieurow"}}, {"rcarriga/nvim-dap-ui", lazy = true, config = true, dependencies = {"mfussenegger/nvim-dap", "nvim-neotest/nvim-nio"}}, {"mfussenegger/nvim-dap", lazy = true}, {"nvim-telescope/telescope-dap.nvim", lazy = true, dependencies = {"nvim-telescope/telescope.nvim", "mfussenegger/nvim-dap"}}, {"ldelossa/gh.nvim", lazy = true, config = _2_, dependencies = {"ldelossa/litee.nvim"}}, {"pwntester/octo.nvim", lazy = true, dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "kyazdani42/nvim-web-devicons"}, config = true}, "ruanyl/vim-gh-line", "rhysd/conflict-marker.vim", {"tpope/vim-fugitive", lazy = true, event = "VeryLazy"}, {"ray-x/lsp_signature.nvim", event = "BufEnter"}, {"weilbith/nvim-code-action-menu", cmd = "CodeActionMenu", config = _3_}, {"dnlhc/glance.nvim", lazy = true, config = true}, {"smjonas/inc-rename.nvim", opts = {input_buffer_type = "dressing"}}, {"monkoose/nvlime", ft = {"lisp"}, dependencies = {"monkoose/parsley"}}, "imsnif/kdl.vim", "tpope/vim-sleuth", "editorconfig/editorconfig-vim", "sbdchd/neoformat", {"elkowar/antifennel-nvim", config = _4_}, {"Olical/conjure", ft = {"fennel"}}, {"eraserhd/parinfer-rust", build = "cargo build --release"}, "kmonad/kmonad-vim", {"elkowar/yuck.vim", ft = {"yuck"}}, {"cespare/vim-toml", ft = {"toml"}}, {"bduggan/vim-raku", ft = {"raku"}}, {"LnL7/vim-nix", ft = {"nix"}}, {"kevinoid/vim-jsonc"}, {"pangloss/vim-javascript", ft = {"javascript"}}, {"ianks/vim-tsx", ft = {"typescript-react"}}, {"leafgarland/typescript-vim", ft = {"typescript", "typescript-react", "javascript"}}, {"HerringtonDarkholme/yats.vim"}, {"mxw/vim-jsx"}, {"purescript-contrib/purescript-vim", ft = {"purescript"}}, {"derekelkins/agda-vim", ft = {"agda"}}, {"neovimhaskell/haskell-vim", ft = {"haskell"}}, {"monkoose/nvlime", ft = {"lisp"}, dependencies = {"monkoose/parsley"}, config = _5_}, {"rust-lang/rust.vim", ft = {"rust"}, dependencies = {"mattn/webapi-vim"}, config = _6_}, {"Saecki/crates.nvim", dependencies = {"nvim-lua/plenary.nvim"}, opts = {enable_update_available_warning = false}}, {"mrcjkb/rustaceanvim", version = "^4", ft = {"rust", "toml"}}, {"qnighy/lalrpop.vim"}, {"edwinb/idris2-vim", ft = {"idris2"}}, {"vmchale/ats-vim", ft = {"ats", "dats", "sats"}}, {"bakpakin/fennel.vim", ft = {"fennel"}}, {"evanleck/vim-svelte"}} return {"Olical/aniseed", "Olical/nfnl", "nvim-lua/plenary.nvim", "norcalli/nvim.lua", "kyazdani42/nvim-web-devicons", "folke/which-key.nvim", {"ckipp01/nvim-jenkinsfile-linter", dependencies = {"nvim-lua/plenary.nvim"}}, "psliwka/vim-smoothie", {"nathanaelkane/vim-indent-guides", cmd = {"IndentGuidesToggle"}}, {"luukvbaal/stabilize.nvim", config = true}, {"stevearc/dressing.nvim", config = true}, {"tweekmonster/startuptime.vim", cmd = {"StartupTime"}}, {"moll/vim-bbye", lazy = true, cmd = {"Bdelete", "Bwipeout"}}, {"petertriho/nvim-scrollbar", event = "VeryLazy", lazy = true, config = true}, {"TimUntersberger/neogit", opts = {integrations = {diffview = true}}, cmd = {"Neogit"}}, {"folke/persistence.nvim", opts = {dir = vim.fn.expand((vim.fn.stdpath("cache") .. "/sessions/"))}}, {"https://git.sr.ht/~whynothugo/lsp_lines.nvim", config = _1_}, "jiangmiao/auto-pairs", "tpope/vim-repeat", {"preservim/nerdcommenter", event = "VeryLazy", lazy = true, priority = 1000}, {"godlygeek/tabular", cmd = {"Tabularize"}}, "tpope/vim-surround", "hauleth/sad.vim", "wellle/targets.vim", {"mg979/vim-visual-multi", lazy = true, event = "VeryLazy"}, "tommcdo/vim-exchange", {"phaazon/hop.nvim", lazy = true, event = "VeryLazy", opts = {keys = "jfkdls;amvieurow"}}, {"rcarriga/nvim-dap-ui", lazy = true, config = true, dependencies = {"mfussenegger/nvim-dap", "nvim-neotest/nvim-nio"}}, {"mfussenegger/nvim-dap", lazy = true}, {"nvim-telescope/telescope-dap.nvim", lazy = true, dependencies = {"nvim-telescope/telescope.nvim", "mfussenegger/nvim-dap"}}, {"ldelossa/gh.nvim", lazy = true, config = _2_, dependencies = {"ldelossa/litee.nvim"}}, {"pwntester/octo.nvim", lazy = true, dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "kyazdani42/nvim-web-devicons"}, config = true}, "ruanyl/vim-gh-line", "rhysd/conflict-marker.vim", {"tpope/vim-fugitive", lazy = true, event = "VeryLazy"}, {"ray-x/lsp_signature.nvim", event = "BufEnter"}, {"weilbith/nvim-code-action-menu", cmd = "CodeActionMenu", config = _3_}, {"dnlhc/glance.nvim", lazy = true, config = true}, {"smjonas/inc-rename.nvim", opts = {input_buffer_type = "dressing"}}, {"monkoose/nvlime", ft = {"lisp"}, dependencies = {"monkoose/parsley"}}, "imsnif/kdl.vim", "tpope/vim-sleuth", "editorconfig/editorconfig-vim", "sbdchd/neoformat", {"elkowar/antifennel-nvim", config = _4_}, {"Olical/conjure", ft = {"fennel"}}, {"eraserhd/parinfer-rust", build = "cargo build --release"}, "kmonad/kmonad-vim", {"elkowar/yuck.vim", ft = {"yuck"}}, {"cespare/vim-toml", ft = {"toml"}}, {"bduggan/vim-raku", ft = {"raku"}}, {"LnL7/vim-nix", ft = {"nix"}}, {"kevinoid/vim-jsonc"}, {"pangloss/vim-javascript", ft = {"javascript"}}, {"ianks/vim-tsx", ft = {"typescript-react"}}, {"leafgarland/typescript-vim", ft = {"typescript", "typescript-react", "javascript"}}, {"HerringtonDarkholme/yats.vim"}, {"mxw/vim-jsx"}, {"purescript-contrib/purescript-vim", ft = {"purescript"}}, {"derekelkins/agda-vim", ft = {"agda"}}, {"neovimhaskell/haskell-vim", ft = {"haskell"}}, {"monkoose/nvlime", ft = {"lisp"}, dependencies = {"monkoose/parsley"}, config = _5_}, {"rust-lang/rust.vim", ft = {"rust"}, dependencies = {"mattn/webapi-vim"}, config = _6_}, {"Saecki/crates.nvim", dependencies = {"nvim-lua/plenary.nvim"}, opts = {disable_invalid_feature_diagnostic = true, enable_update_available_warning = false}}, {"mrcjkb/rustaceanvim", version = "^4", ft = {"rust", "toml"}}, {"qnighy/lalrpop.vim"}, {"edwinb/idris2-vim", ft = {"idris2"}}, {"vmchale/ats-vim", ft = {"ats", "dats", "sats"}}, {"bakpakin/fennel.vim", ft = {"fennel"}}, {"evanleck/vim-svelte"}}

View file

@ -5,7 +5,7 @@ local utils = _local_1_["utils"]
local telescope = autoload("telescope") local telescope = autoload("telescope")
local actions = autoload("telescope.actions") local actions = autoload("telescope.actions")
local function setup() local function setup()
telescope.setup({defaults = {mappings = {i = {["<esc>"] = actions.close}}, file_ignore_patterns = {"Cargo.lock", ".*.snap", "docs/theme/.*", "node%_modules/.*", "target/.*"}}, extensions = {["ui-select"] = {require("telescope.themes").get_dropdown()}}}) telescope.setup({defaults = {mappings = {i = {["<esc>"] = actions.close}}, file_ignore_patterns = {"Cargo.lock", ".*.snap", "docs/theme/.*", "node%_modules/.*", "target/.*"}}, extensions = {["ui-select"] = {(require("telescope.themes")).get_dropdown()}}})
telescope.load_extension("dap") telescope.load_extension("dap")
return utils.keymap("n", "<C-p>", ":Telescope find_files<CR>") return utils.keymap("n", "<C-p>", ":Telescope find_files<CR>")
end end

View file

@ -2,7 +2,6 @@
local utils = require("dots.utils") local utils = require("dots.utils")
local function setup() local function setup()
local configs = require("nvim-treesitter.configs") local configs = require("nvim-treesitter.configs")
vim.g.skip_ts_context_commentstring_module = true
return configs.setup({ensure_installed = {"rust", "fennel", "commonlisp", "vim", "regex", "lua", "bash", "markdown", "markdown_inline"}, highlight = {disable = {"fennel", "rust", "haskell"}, enable = false}, incremental_selection = {keymaps = {init_selection = "gss", node_incremental = "gsl", node_decremental = "gsh", scope_incremental = "gsj", scope_decremental = "gsk"}, enable = false}, textsubjects = {enable = true, disable = {"noice"}, prev_selection = ",", keymaps = {["."] = "textsubjects-smart"}}, playground = {disable = {"fennel"}, updatetime = 25, keybindings = {toggle_query_editor = "o", toggle_hl_groups = "i", toggle_injected_languages = "t", toggle_anonymous_nodes = "a", toggle_language_display = "I", focus_language = "f", unfocus_language = "F", update = "R", goto_node = "<cr>", show_help = "?"}, enable = false, persist_queries = false}}) return configs.setup({ensure_installed = {"rust", "fennel", "commonlisp", "vim", "regex", "lua", "bash", "markdown", "markdown_inline"}, highlight = {disable = {"fennel", "rust", "haskell"}, enable = false}, incremental_selection = {keymaps = {init_selection = "gss", node_incremental = "gsl", node_decremental = "gsh", scope_incremental = "gsj", scope_decremental = "gsk"}, enable = false}, textsubjects = {enable = true, disable = {"noice"}, prev_selection = ",", keymaps = {["."] = "textsubjects-smart"}}, playground = {disable = {"fennel"}, updatetime = 25, keybindings = {toggle_query_editor = "o", toggle_hl_groups = "i", toggle_injected_languages = "t", toggle_anonymous_nodes = "a", toggle_language_display = "I", focus_language = "f", unfocus_language = "F", update = "R", goto_node = "<cr>", show_help = "?"}, enable = false, persist_queries = false}})
end end
return {} return {}

View file

@ -5,7 +5,7 @@ local utils = _local_1_["utils"]
local colors = _local_1_["colors"] local colors = _local_1_["colors"]
local trouble = autoload("trouble") local trouble = autoload("trouble")
local function setup() local function setup()
trouble.setup({auto_close = true, auto_jump = {"lsp_definitions", "lsp_workspace_diagnostics", "lsp_type_definitions"}, action_keys = {jump = "<CR>", jump_close = "o", close = {"<esc>", "q"}, cancel = "q", preview = "p", toggle_preview = "P", toggle_mode = "m", hover = {"a", "K"}}, auto_open = false, auto_preview = false, icons = false, indent_lines = false, multiline = false}) trouble.setup({auto_close = true, auto_jump = {"lsp_definitions", "lsp_workspace_diagnostics", "lsp_type_definitions"}, action_keys = {jump = "<CR>", jump_close = "o", close = {"<esc>", "q"}, cancel = "q", preview = "p", toggle_preview = "P", toggle_mode = "m", hover = {"a", "K"}}, icons = false, auto_open = false, multiline = false, auto_preview = false, indent_lines = false})
utils.highlight("TroubleFoldIcon", {bg = "NONE", fg = colors.bright_orange}) utils.highlight("TroubleFoldIcon", {bg = "NONE", fg = colors.bright_orange})
utils.highlight("TroubleCount", {bg = "NONE", fg = colors.bright_green}) utils.highlight("TroubleCount", {bg = "NONE", fg = colors.bright_green})
utils.highlight("TroubleText", {bg = "NONE", fg = colors.light0}) utils.highlight("TroubleText", {bg = "NONE", fg = colors.light0})

View file

@ -11,11 +11,6 @@ local function plugin(name, _3fopts)
return _3fopts return _3fopts
end end
end end
local function prepend(a0, list)
local x = list
table.insert(x, 1, a0)
return x
end
local function all(f) local function all(f)
local function _3_(_241) local function _3_(_241)
return not f(_241) return not f(_241)
@ -37,20 +32,20 @@ local function contains_3f(list, elem)
return false return false
end end
local function filter_table(f, t) local function filter_table(f, t)
local tbl_16_auto = {} local tbl_14_auto = {}
for k, v in pairs(t) do for k, v in pairs(t) do
local k_17_auto, v_18_auto = nil, nil local k_15_auto, v_16_auto = nil, nil
if f(k, v) then if f(k, v) then
k_17_auto, v_18_auto = k, v k_15_auto, v_16_auto = k, v
else else
k_17_auto, v_18_auto = nil k_15_auto, v_16_auto = nil
end end
if ((k_17_auto ~= nil) and (v_18_auto ~= nil)) then if ((k_15_auto ~= nil) and (v_16_auto ~= nil)) then
tbl_16_auto[k_17_auto] = v_18_auto tbl_14_auto[k_15_auto] = v_16_auto
else else
end end
end end
return tbl_16_auto return tbl_14_auto
end end
local function split_last(s, sep) local function split_last(s, sep)
for i = #s, 1, -1 do for i = #s, 1, -1 do
@ -107,13 +102,16 @@ local function keymap(modes, from, to, _3fopts)
local full_opts = without_keys({"buffer"}, a.merge({noremap = true, silent = true}, (_3fopts or {}))) local full_opts = without_keys({"buffer"}, a.merge({noremap = true, silent = true}, (_3fopts or {})))
for _, mode in ipairs(single_to_list(modes)) do for _, mode in ipairs(single_to_list(modes)) do
local keymap_opts local keymap_opts
local _13_ local _14_
if (nil ~= _3fopts) then do
_13_ = _3fopts.buffer local _13_ = _3fopts
else if (nil ~= _13_) then
_13_ = nil _14_ = (_13_).buffer
else
_14_ = _13_
end
end end
if _13_ then if _14_ then
keymap_opts = a.assoc(full_opts, "buffer", 0) keymap_opts = a.assoc(full_opts, "buffer", 0)
else else
keymap_opts = full_opts keymap_opts = full_opts
@ -123,14 +121,14 @@ local function keymap(modes, from, to, _3fopts)
return nil return nil
end end
local function del_keymap(mode, from, _3fbuf_local) local function del_keymap(mode, from, _3fbuf_local)
local function _16_() local function _17_()
if _3fbuf_local then if _3fbuf_local then
return {buffer = 0} return {buffer = 0}
else else
return {} return {}
end end
end end
return vim.keymap.del(mode, from, _16_()) return vim.keymap.del(mode, from, _17_())
end end
local function buffer_content(bufnr) local function buffer_content(bufnr)
return vim.api.nvim_buf_get_lines(bufnr, 0, -1, false) return vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
@ -164,28 +162,28 @@ local function shorten_path(path, seg_length, shorten_after)
local init = a.butlast(segments) local init = a.butlast(segments)
local filename = a.last(segments) local filename = a.last(segments)
local shortened_segs local shortened_segs
local function _18_(_241) local function _19_(_241)
return string.sub(_241, 1, seg_length) return string.sub(_241, 1, seg_length)
end end
shortened_segs = a.map(_18_, init) shortened_segs = a.map(_19_, init)
return (str.join("/", shortened_segs) .. "/" .. filename) return (str.join("/", shortened_segs) .. "/" .. filename)
end end
end end
local function comp(f, g) local function comp(f, g)
local function _20_(...) local function _21_(...)
return f(g(...)) return f(g(...))
end end
return _20_ return _21_
end end
local function get_selection() local function get_selection()
local _let_21_ = vim.fn.getpos("'<") local _let_22_ = vim.fn.getpos("'<")
local _ = _let_21_[1] local _ = _let_22_[1]
local s_start_line = _let_21_[2] local s_start_line = _let_22_[2]
local s_start_col = _let_21_[3] local s_start_col = _let_22_[3]
local _let_22_ = vim.fn.getpos("'>") local _let_23_ = vim.fn.getpos("'>")
local _0 = _let_22_[1] local _0 = _let_23_[1]
local s_end_line = _let_22_[2] local s_end_line = _let_23_[2]
local s_end_col = _let_22_[3] local s_end_col = _let_23_[3]
local n_lines = (1 + math.abs((s_end_line - s_start_line))) local n_lines = (1 + math.abs((s_end_line - s_start_line)))
local lines = vim.api.nvim_buf_get_lines(0, (s_start_line - 1), s_end_line, false) local lines = vim.api.nvim_buf_get_lines(0, (s_start_line - 1), s_end_line, false)
if (nil == lines[1]) then if (nil == lines[1]) then
@ -200,4 +198,4 @@ local function get_selection()
return s_start_line, s_end_line, lines return s_start_line, s_end_line, lines
end end
end end
return {plugin = plugin, all = all, ["single-to-list"] = single_to_list, ["contains?"] = contains_3f, ["filter-table"] = filter_table, ["split-last"] = split_last, ["find-where"] = find_where, ["find-map"] = find_map, ["keep-if"] = keep_if, ["map-values"] = map_values, ["without-keys"] = without_keys, keymap = keymap, ["del-keymap"] = del_keymap, ["buffer-content"] = buffer_content, ["surround-if-present"] = surround_if_present, highlight = highlight, ["highlight-add"] = highlight_add, ["shorten-path"] = shorten_path, prepend = prepend, comp = comp, ["get-selection"] = get_selection} return {plugin = plugin, all = all, ["single-to-list"] = single_to_list, ["contains?"] = contains_3f, ["filter-table"] = filter_table, ["split-last"] = split_last, ["find-where"] = find_where, ["find-map"] = find_map, ["keep-if"] = keep_if, ["map-values"] = map_values, ["without-keys"] = without_keys, keymap = keymap, ["del-keymap"] = del_keymap, ["buffer-content"] = buffer_content, ["surround-if-present"] = surround_if_present, highlight = highlight, ["highlight-add"] = highlight_add, ["shorten-path"] = shorten_path, comp = comp, ["get-selection"] = get_selection}

View file

@ -68,7 +68,7 @@ local function _4_()
end end
vim.api.nvim_create_autocmd("FileType", {pattern = "vim", callback = _4_}) vim.api.nvim_create_autocmd("FileType", {pattern = "vim", callback = _4_})
local function _5_() local function _5_()
vim.opt_local.formatoptions = vim.o.formatoptions:gsub("[cor]", "") vim.opt_local.formatoptions = (vim.o.formatoptions):gsub("[cor]", "")
return nil return nil
end end
vim.api.nvim_create_autocmd("FileType", {pattern = "*", callback = _5_}) vim.api.nvim_create_autocmd("FileType", {pattern = "*", callback = _5_})

View file

@ -1,17 +1,4 @@
[ [
{
"context": "Pane",
"bindings": {
// unbind closing the tab with this
"ctrl-w": null,
"ctrl-w ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
"ctrl-w ctrl-j": ["workspace::ActivatePaneInDirection", "Down"],
"ctrl-w ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
"ctrl-w ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
"ctrl-shift-t": "pane::ReopenClosedItem"
// "shift-escape": null
}
},
{ {
"context": "os == macos && EmptyPane", "context": "os == macos && EmptyPane",
"bindings": { "bindings": {
@ -25,12 +12,6 @@
"cmd-d": "editor::SelectNext" "cmd-d": "editor::SelectNext"
} }
}, },
{
"bindings": {
"ctrl-alt-shift-p": "projects::OpenRecent",
"ctrl-alt-shift-o": "workspace::Open"
}
},
{ {
"context": "os == linux && Editor && VimControl && !VimWaiting && !menu", "context": "os == linux && Editor && VimControl && !VimWaiting && !menu",
"bindings": { "bindings": {
@ -43,17 +24,11 @@
"space b c": "pane::CloseActiveItem", "space b c": "pane::CloseActiveItem",
":": "command_palette::Toggle", ":": "command_palette::Toggle",
"space p": "file_finder::Toggle", "space p": "file_finder::Toggle",
"space o": "pane::DeploySearch",
"space h": "pane::ActivatePrevItem", "space h": "pane::ActivatePrevItem",
"space l": "pane::ActivateNextItem", "space l": "pane::ActivateNextItem",
"space c space": "editor::ToggleComments", "space c space": "editor::ToggleComments",
// go to search result
"g space": "editor::OpenExcerpts",
"space e j": "editor::ExpandExcerptsDown",
"space e k": "editor::ExpandExcerptsUp",
// multi-cursor // multi-cursor
"cmd-shift-d": "editor::SelectPrevious", "cmd-shift-d": "editor::SelectPrevious",
"cmd-shift-l": "editor::SelectAllMatches", "cmd-shift-l": "editor::SelectAllMatches",
@ -75,6 +50,7 @@
"space e e": "diagnostics::Deploy", "space e e": "diagnostics::Deploy",
"space e w": "diagnostics::ToggleWarnings", "space e w": "diagnostics::ToggleWarnings",
// view // view
"space v f": "project_panel::ToggleFocus",
"space v n": "editor::ToggleLineNumbers", "space v n": "editor::ToggleLineNumbers",
"space v i": "editor::ToggleInlayHints", "space v i": "editor::ToggleInlayHints",
// Git // Git
@ -85,12 +61,6 @@
"context": "Editor && vim_mode == normal && !VimWaiting && !menu", "context": "Editor && vim_mode == normal && !VimWaiting && !menu",
"bindings": {} "bindings": {}
}, },
{
"context": "Editor && vim_mode == insert",
"bindings": {
"ctrl-w": "editor::DeleteToPreviousWordStart"
}
},
{ {
"context": "os == linux && ((Editor && vim_mode == normal) || Terminal) && !VimWaiting && !menu", "context": "os == linux && ((Editor && vim_mode == normal) || Terminal) && !VimWaiting && !menu",
"bindings": { "bindings": {
@ -100,7 +70,6 @@
"ctrl-t ctrl-h": "pane::ActivatePrevItem", "ctrl-t ctrl-h": "pane::ActivatePrevItem",
"ctrl-t ctrl-l": "pane::ActivateNextItem", "ctrl-t ctrl-l": "pane::ActivateNextItem",
"ctrl-x ctrl-c": "pane::CloseActiveItem", "ctrl-x ctrl-c": "pane::CloseActiveItem",
"alt-j": "workspace::ToggleBottomDock" "alt-j": "workspace::ToggleBottomDock"
} }
}, },
@ -137,43 +106,17 @@
",": "editor::SplitSelectionIntoLines" ",": "editor::SplitSelectionIntoLines"
} }
}, },
{ {
"context": "ProjectSearchBar", "context": "Editor && vim_mode == insert",
"bindings": { "bindings": {
"space b c": "pane::CloseActiveItem", "ctrl-w": "editor::DeleteToPreviousWordStart"
"escape escape": "pane::CloseActiveItem"
}
},
// Panel stuff
{
"context": "Editor && VimControl && !VimWaiting && !menu || OutlinePanel || ProjectPanel || Assistant",
"bindings": {
"space v h": "workspace::ToggleLeftDock",
"space v l": "workspace::ToggleRightDock",
"space v o": "outline_panel::ToggleFocus",
"space v p": "project_panel::ToggleFocus",
"space v a": "assistant::ToggleFocus"
} }
}, },
{ {
"context": "OutlinePanel", "context": "Pane",
"bindings": { "bindings": {
"space l": "outline_panel::ToggleFocus" "ctrl-w": null,
} "shift-escape": null
},
{
"context": "ProjectPanel",
"bindings": {
"space l": "project_panel::ToggleFocus"
}
},
{
"context": "Assistant",
"bindings": {
"space h": "assistant::ToggleFocus"
} }
} }
] ]

View file

@ -2,5 +2,3 @@ ZDOTDIR=$HOME/.config/zsh
[ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env" [ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env"
if [ -e /home/leon/.nix-profile/etc/profile.d/nix.sh ]; then . /home/leon/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer if [ -e /home/leon/.nix-profile/etc/profile.d/nix.sh ]; then . /home/leon/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
if [ -e /home/elk/.nix-profile/etc/profile.d/nix.sh ]; then . /home/elk/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer