nvim 0.11 update

Author: fedemengo

fnl/mapping.fnl

@@ -164,8 +164,3 @@
 
 (map [:n] :<S-Tab> :za {:desc "Toggle fold under cursor"})
 
-;; https://github.com/folke/which-key.nvim#%EF%B8%8F-configuration
-;; this is discouraged, but hey https://xkcd.com/1172
-
-(map [:n] :f (bindcmd "WhichKey f"))
-(map [:n] :t (bindcmd "WhichKey t"))

fnl/mods/dev/avante.fnl

@@ -4,8 +4,7 @@
 
 (avante_lib.load)
 
-(local config {:provider "ollama"
-               :vendors {:ollama {:__inherited_from "openai"
+(local config {:providers {:ollama {:__inherited_from "openai"
                                 :api_key_name ""
                                 :endpoint "http://harlie:11434/v1"
                                 :model "marco-o1:7b-fp16"}}})

fnl/mods/lsp/lsp.fnl

@@ -55,7 +55,16 @@
                                     :rust_analyzer]
                  :automatic_installation true})
 
-(masonnullls.setup {:automatic_setup true})
+(let [fmt nullls.builtins.formatting]
+  (nullls.setup {:sources [fmt.black
+                           fmt.stylua
+                           fmt.fnlfmt
+                           fmt.shfmt
+                           fmt.goimports
+                           fmt.gofumpt
+                           fmt.prettier]}))
+
+(masonnullls.setup {:handlers {}})
 
 (local on_attach
        (fn [client buf]
@@ -152,21 +161,8 @@
 
 (let [get_servers (. masonlsp :get_installed_servers)]
   (each [_ server (ipairs (get_servers))]
-    (let [server_config (. lspconfig server)
-          opts (or (. lsp_opt server) {})]
+    (let [opts (or (. lsp_opt server) {})]
       (tset opts :on_attach on_attach)
       (tset opts :capabilites (cmp_nvim_lsp.default_capabilities))
-      (server_config.setup opts))))
-
-;; https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTIN_CONFIG.md#configuration
+      (vim.lsp.config server opts))))
 
-(nullls.setup {:sources [;(nullls.builtins.formatting.autopep8.with {:extra_args ["--indent-size=4"
-                         ;                                                        "--ignore=E302,E121,E701"
-                         ;                                                        "--max-line-length=150"]})
-                         nullls.builtins.formatting.black
-                         nullls.builtins.formatting.stylua
-                         nullls.builtins.formatting.fnlfmt
-                         nullls.builtins.formatting.shfmt
-                         nullls.builtins.formatting.goimports
-                         nullls.builtins.formatting.gofumpt
-                         nullls.builtins.formatting.prettier]})

fnl/mods/lsp/symbols.fnl

@@ -1,6 +1,6 @@
-(module :mods.lsp.symbols {autoload {symbols-outline :symbols-outline}})
+(module :mods.lsp.symbols {autoload {outline :outline}})
 
-(symbols-outline.setup {:relative_width true :width 40})
+(outline.setup {:relative_width true :width 40})
 
-(map [:n] :<space>s symbols-outline.toggle_outline
+(map [:n] :<space>s outline.toggle_outline
      {:desc "Toggle symbols outline"})

fnl/mods/misc/strudel.fnl

@@ -0,0 +1,3 @@
+(module mods.misc.strudel {autoload {strudel :strudel}})
+
+(strudel.setup {})

fnl/mods/tools/which-key.fnl

@@ -1,3 +1,7 @@
-(module mods.tools.which-key {autoload {which-key :which-key}})
+(module mods.tools.which-key {autoload {wk :which-key}})
+
+(wk.setup
+  {:triggers
+    [ {:mode ["n"] 1 "f"}
+      {:mode ["n"] 1 "t"} ]})
 
-(which-key.setup)

fnl/plugins.fnl

@@ -98,7 +98,7 @@
      :ray-x/go.nvim {:mod :dev.go_nvim}
      :lewis6991/gitsigns.nvim {:mod :tools.gitsigns}
      :ray-x/lsp_signature.nvim {}
-     :simrat39/symbols-outline.nvim {:mod :lsp.symbols}
+     :hedyhli/outline.nvim {:mod :lsp.symbols}
      :wakatime/vim-wakatime {}
      :Vonr/align.nvim {:mod :tools.align}
      :VonHeikemen/lsp-zero.nvim {:requires [[:neovim/nvim-lspconfig]
@@ -112,8 +112,12 @@
                                            [:hrsh7th/cmp-nvim-lsp]
                                            [:hrsh7th/cmp-nvim-lua]
                                            [:onsails/lspkind.nvim]
-                                           [:jose-elias-alvarez/null-ls.nvim]]
-                                :mod :lsp.lsp})
+                                           [:nvimtools/none-ls.nvim]]
+                                :mod :lsp.lsp}
+
+     ;; misc
+     :gruvw/strudel.nvim {:run "npm install" :mod :misc.strudel})
+
 
 (map [:n] :<space>pi packer.install {:desc "Install plugins"})
 (map [:n] :<space>pu packer.update {:desc "Update plugins"})