diff --git a/home/config/nvim/nifoc/keymap.fnl b/home/config/nvim/nifoc/keymap.fnl index c463ea0..f0346e5 100644 --- a/home/config/nvim/nifoc/keymap.fnl +++ b/home/config/nvim/nifoc/keymap.fnl @@ -9,6 +9,7 @@ npairs (require :nvim-autopairs) gitsigns (require :gitsigns) neogit (require :neogit) + otter (require :otter) wk (require :which-key) repl (require :nifoc.repl) repo (require :nifoc.repo) @@ -117,7 +118,7 @@ (keymap.set :n :lfi #(telescope-builtin.lsp_implementations telescope-dropdown) {:buffer bufnr :desc "Find Implementations"}) - (keymap.set :n :K vim.lsp.buf.hover + (keymap.set :n :K otter.ask_hover {:buffer bufnr :desc "Show Documentation"})) (fn mod.terminal-open [bufnr] diff --git a/home/config/nvim/plugins/cmp.fnl b/home/config/nvim/plugins/cmp.fnl index dcdefa5..3c225a7 100644 --- a/home/config/nvim/plugins/cmp.fnl +++ b/home/config/nvim/plugins/cmp.fnl @@ -82,6 +82,7 @@ kind (kind-fn entry vim-item) strings (vim.split kind.kind "%s" {:trimempty true})] + (set kind.dup 0) (if (= entry.source.name :cmp_tabnine) (do (set kind.kind " 󱜚 ") @@ -102,7 +103,8 @@ (set kind.menu (.. " (" (or (. strings 2) "") ")")))) - kind))}}) + kind))} + :experimental {:ghost_text true}}) (cmp.setup.cmdline "/" {:sources (cmp.config.sources [{:name :nvim_lsp_document_symbol}] [{:name :buffer}]) diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl index c2cdfbb..eaaa319 100644 --- a/home/config/nvim/plugins/lsp.fnl +++ b/home/config/nvim/plugins/lsp.fnl @@ -46,6 +46,7 @@ :fennel_ls :html :jsonls + :marksman :svelte :taplo]] ;; Default diff --git a/home/config/nvim/plugins/otter.fnl b/home/config/nvim/plugins/otter.fnl index 4d95ec3..980bd4a 100644 --- a/home/config/nvim/plugins/otter.fnl +++ b/home/config/nvim/plugins/otter.fnl @@ -1,11 +1,12 @@ (let [otter (require :otter) - languages [:bash :lua] + languages [:bash :markdown :lua] completion true diagnostics true tsquery nil - enabled-filetypes [:elixir :nix] + enabled-filetypes [:elixir :markdown :nix] augroup (vim.api.nvim_create_augroup :NifocOtter {:clear true}) aucmd vim.api.nvim_create_autocmd] + (otter.setup {:buffers {:set_filetype true} :handle_leading_whitespace true}) (each [_ ft (pairs enabled-filetypes)] (aucmd :FileType {:pattern ft :callback #(otter.activate languages completion diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index 0783e92..aea2d5a 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -33,6 +33,7 @@ in fennel-ls #lexical lua-language-server + marksman nil nodePackages.dockerfile-language-server-nodejs nodePackages.svelte-language-server