From dd81b8fda784db2a31bc31c6f0bb8d2b3b66af0f Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Mon, 8 Jul 2024 23:44:34 +0200
Subject: [PATCH] nvim: cleanup

---
 home/config/nvim/nifoc/keymap.fnl  |  3 +--
 home/config/nvim/plugins/lsp.fnl   |  3 +++
 home/config/nvim/plugins/otter.fnl | 15 ---------------
 home/programs/nvim/default.nix     | 26 ++++++++++++--------------
 home/programs/nvim/plugins.yaml    |  1 -
 5 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 home/config/nvim/plugins/otter.fnl

diff --git a/home/config/nvim/nifoc/keymap.fnl b/home/config/nvim/nifoc/keymap.fnl
index f0346e5..c463ea0 100644
--- a/home/config/nvim/nifoc/keymap.fnl
+++ b/home/config/nvim/nifoc/keymap.fnl
@@ -9,7 +9,6 @@
       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)
@@ -118,7 +117,7 @@
     (keymap.set :n :<leader>lfi
                 #(telescope-builtin.lsp_implementations telescope-dropdown)
                 {: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"}))
 
   (fn mod.terminal-open [bufnr]
diff --git a/home/config/nvim/plugins/lsp.fnl b/home/config/nvim/plugins/lsp.fnl
index eaaa319..da7aa21 100644
--- a/home/config/nvim/plugins/lsp.fnl
+++ b/home/config/nvim/plugins/lsp.fnl
@@ -62,6 +62,9 @@
     (when (= (vim.fn.executable :lexical) 1)
       (lsp.lexical.setup (->> {:cmd [:lexical :start]}
                               (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)
       (lsp.lua_ls.setup (->> {:cmd [:lua-language-server]
                               :root_dir (or (lsp.util.root_pattern :init.vim
diff --git a/home/config/nvim/plugins/otter.fnl b/home/config/nvim/plugins/otter.fnl
deleted file mode 100644
index 980bd4a..0000000
--- a/home/config/nvim/plugins/otter.fnl
+++ /dev/null
@@ -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"})))
diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix
index b7f76f6..8dcdd68 100644
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -30,15 +30,7 @@ in
       # LSP
       bash-language-server
       fennel-ls
-      #lexical
-      lua-language-server
-      marksman
       nil
-      nodePackages.dockerfile-language-server-nodejs
-      nodePackages.svelte-language-server
-      nodePackages.typescript-language-server
-      nodePackages.vscode-langservers-extracted
-      nodePackages.yaml-language-server
       #nixd
       taplo-lsp
 
@@ -52,7 +44,19 @@ in
       shellcheck
       statix
     ] ++ optionals isDarwin [
+      # LSP
       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
     ];
 
@@ -164,12 +168,6 @@ in
           type = "fennel";
         }
 
-        {
-          plugin = otter-nvim;
-          config = builtins.readFile ../../config/nvim/plugins/otter.fnl;
-          type = "fennel";
-        }
-
         # Linter
         {
           plugin = nvim-lint;
diff --git a/home/programs/nvim/plugins.yaml b/home/programs/nvim/plugins.yaml
index 0a71938..bbadb27 100644
--- a/home/programs/nvim/plugins.yaml
+++ b/home/programs/nvim/plugins.yaml
@@ -26,7 +26,6 @@
 - src: onsails/lspkind.nvim
 - src: SmiteshP/nvim-navic
 - src: RRethy/vim-illuminate
-- src: jmbuhr/otter.nvim
 # Linter
 - src: mfussenegger/nvim-lint
 # Comments