diff options
Diffstat (limited to '')
| -rw-r--r-- | dot_config/nvim/fnl/plugins/flash.fnl | 9 | ||||
| -rw-r--r-- | dot_config/nvim/fnl/plugins/init.fnl | 8 | ||||
| -rw-r--r-- | dot_config/nvim/fnl/plugins/lsp.fnl | 54 | ||||
| -rw-r--r-- | dot_config/nvim/fnl/plugins/mini.fnl | 1 |
4 files changed, 12 insertions, 60 deletions
diff --git a/dot_config/nvim/fnl/plugins/flash.fnl b/dot_config/nvim/fnl/plugins/flash.fnl index 25ff6c7..92de38b 100644 --- a/dot_config/nvim/fnl/plugins/flash.fnl +++ b/dot_config/nvim/fnl/plugins/flash.fnl @@ -2,9 +2,12 @@ [(· :folke/flash.nvim & :opts {:modes {:search {:enabled false}}} :event :VeryLazy - :keys [(· :s #(recc :flash :jump) & - :mode [:n :x :o] - :desc :Flash) + :keys [(· :<cr> #(recc :flash :jump) & + :mode [:n :x :o] + :desc :Flash) + (· :s #(recc :flash :jump) & + :mode [:n :x :o] + :desc :Flash) (· :S #(recc :flash :treesitter) & :mode [:n :x :o] :desc "Flash Treesitter") diff --git a/dot_config/nvim/fnl/plugins/init.fnl b/dot_config/nvim/fnl/plugins/init.fnl index f0bae51..876d473 100644 --- a/dot_config/nvim/fnl/plugins/init.fnl +++ b/dot_config/nvim/fnl/plugins/init.fnl @@ -11,9 +11,13 @@ ; simple stuff that doesn't need any handling ; and doesn't fit in elsewhere [(· :folke/lazy.nvim & :version false) + (· :folke/snacks.nvim & + :priority 1000 :lazy false + :opts {:indent {:enabled true + :scope {:enabled false}} + :input {:enabled true} + :quickfile {:enabled true}}) (· :Olical/nfnl & :ft :fennel) - (· :stevearc/dressing.nvim & - :opts {}) (· :Olical/conjure & :branch :main :config (fn [_ opts] diff --git a/dot_config/nvim/fnl/plugins/lsp.fnl b/dot_config/nvim/fnl/plugins/lsp.fnl deleted file mode 100644 index acfce7e..0000000 --- a/dot_config/nvim/fnl/plugins/lsp.fnl +++ /dev/null @@ -1,54 +0,0 @@ -(import-macros {:mixed-table · : recc} :toast.macros) -(local {: assoc : map} (require :toast.core)) -(local {: insert} (require :toast.table)) -(local {: executable?} (require :toast.nvim)) - -(fn gopts [plist] - {:basedpyright {} - :clangd {} - :clojure_lsp {:root_dir (plist :project.clj :deps.edn :bb.edn :build.boot :shadow-cljs.edn :.git)} - :denols {:autostart false - :root_dir (plist :deno.json :deno.jsonc)} - :gopls {} - :ltex {} - :lua_ls {} - :ruff {:cmd [:ruff :server :--preview]} - :texlab {:filetypes [:tex :plaintex :bib :latex]} - :ts_ls {:autostart false - :root_dir (plist :tsconfig.json :jsconfig.json :package.json)} - :zls {}}) - -; default on-attach -(fn attach [c b] - (let [lsp vim.lsp - lbf lsp.buf - ll [;groups - (· "" & :group :+lsp) - (· :w & :group :+workspace) - ; actions - (· :D lbf.declaration & :desc "goto declaration") - (· :d lbf.definition & :desc "goto definition") - (· :k lbf.hover & :desc "hover") - (· :K lbf.signature_help & :desc "signature help") - (· :i lbf.implementation & :desc "goto implementation") - (· :t lbf.type_definition & :desc "goto type definition") - (· :r lbf.rename & :desc "rename") - (· :c lbf.code_action & :desc "code action") - (· :R lbf.reference & :desc "list references")] - ll (map #(assoc $ 1 (.. :<localleader><localleader> (. $ 1))) ll)] - (vim.api.nvim_buf_set_option b :omnifunc :v:lua.vim.lsp.omnifunc) - (recc :which-key :add - (· (insert ll - (· :<leader>F #(vim.lsp.buf.format {:async true}) & - :desc "run format")) & - :buffer b)))) - -[(· :neovim/nvim-lspconfig & - :config (fn [_ opts] - (each [k v (pairs opts)] - (let [s (. (require :lspconfig) k) - c (or v.cmd s.document_config.default_config.cmd) - att (or v.on_attach attach)] - (when (executable? (. c 1)) - (s.setup (assoc v :on_attach att)))))) - :opts #(gopts (partial recc :lspconfig.util :root_pattern)))] diff --git a/dot_config/nvim/fnl/plugins/mini.fnl b/dot_config/nvim/fnl/plugins/mini.fnl index e339ce7..c66eedf 100644 --- a/dot_config/nvim/fnl/plugins/mini.fnl +++ b/dot_config/nvim/fnl/plugins/mini.fnl @@ -11,7 +11,6 @@ :comment {} :completion {} :cursorword {} - :indentscope {} :move {} :splitjoin {} :statusline {} |