1
0
Fork 0

nvim: cleanup

This commit is contained in:
Daniel Kempkens 2024-07-08 23:44:34 +02:00
parent 1dcf8c3ccf
commit dd81b8fda7
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
5 changed files with 16 additions and 32 deletions

View file

@ -9,7 +9,6 @@
npairs (require :nvim-autopairs) npairs (require :nvim-autopairs)
gitsigns (require :gitsigns) gitsigns (require :gitsigns)
neogit (require :neogit) neogit (require :neogit)
otter (require :otter)
wk (require :which-key) wk (require :which-key)
repl (require :nifoc.repl) repl (require :nifoc.repl)
repo (require :nifoc.repo) repo (require :nifoc.repo)
@ -118,7 +117,7 @@
(keymap.set :n :<leader>lfi (keymap.set :n :<leader>lfi
#(telescope-builtin.lsp_implementations telescope-dropdown) #(telescope-builtin.lsp_implementations telescope-dropdown)
{:buffer bufnr :desc "Find Implementations"}) {:buffer bufnr :desc "Find Implementations"})
(keymap.set :n :K otter.ask_hover (keymap.set :n :K vim.lsp.buf.hover
{:buffer bufnr :desc "Show Documentation"})) {:buffer bufnr :desc "Show Documentation"}))
(fn mod.terminal-open [bufnr] (fn mod.terminal-open [bufnr]

View file

@ -62,6 +62,9 @@
(when (= (vim.fn.executable :lexical) 1) (when (= (vim.fn.executable :lexical) 1)
(lsp.lexical.setup (->> {:cmd [:lexical :start]} (lsp.lexical.setup (->> {:cmd [:lexical :start]}
(vim.tbl_extend :force default-config)))) (vim.tbl_extend :force default-config))))
(when (= (vim.fn.executable :nextls) 1)
(lsp.nextls.setup (->> {:cmd [:nextls]}
(vim.tbl_extend :force default-config))))
(when (= (vim.fn.executable :lua-language-server) 1) (when (= (vim.fn.executable :lua-language-server) 1)
(lsp.lua_ls.setup (->> {:cmd [:lua-language-server] (lsp.lua_ls.setup (->> {:cmd [:lua-language-server]
:root_dir (or (lsp.util.root_pattern :init.vim :root_dir (or (lsp.util.root_pattern :init.vim

View file

@ -1,15 +0,0 @@
(let [otter (require :otter)
languages [:bash :markdown :lua]
completion true
diagnostics true
tsquery nil
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
diagnostics tsquery)
:group augroup
:desc "Setup Otter"})))

View file

@ -30,15 +30,7 @@ in
# LSP # LSP
bash-language-server bash-language-server
fennel-ls fennel-ls
#lexical
lua-language-server
marksman
nil nil
nodePackages.dockerfile-language-server-nodejs
nodePackages.svelte-language-server
nodePackages.typescript-language-server
nodePackages.vscode-langservers-extracted
nodePackages.yaml-language-server
#nixd #nixd
taplo-lsp taplo-lsp
@ -52,7 +44,19 @@ in
shellcheck shellcheck
statix statix
] ++ optionals isDarwin [ ] ++ optionals isDarwin [
# LSP
elixir-ls elixir-ls
#lexical
lua-language-server
marksman
#next-ls
nodePackages.dockerfile-language-server-nodejs
nodePackages.svelte-language-server
nodePackages.typescript-language-server
nodePackages.vscode-langservers-extracted
nodePackages.yaml-language-server
# Other
xcbuild xcbuild
]; ];
@ -164,12 +168,6 @@ in
type = "fennel"; type = "fennel";
} }
{
plugin = otter-nvim;
config = builtins.readFile ../../config/nvim/plugins/otter.fnl;
type = "fennel";
}
# Linter # Linter
{ {
plugin = nvim-lint; plugin = nvim-lint;

View file

@ -26,7 +26,6 @@
- src: onsails/lspkind.nvim - src: onsails/lspkind.nvim
- src: SmiteshP/nvim-navic - src: SmiteshP/nvim-navic
- src: RRethy/vim-illuminate - src: RRethy/vim-illuminate
- src: jmbuhr/otter.nvim
# Linter # Linter
- src: mfussenegger/nvim-lint - src: mfussenegger/nvim-lint
# Comments # Comments