From fc514537cab5c1405de8e0b9b8c70f48b731112a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Sat, 2 Mar 2024 21:48:19 +0100
Subject: [PATCH] fix(nvim): Translate lspconfig to nixvim

---
 nvim/plugins.nix           | 160 +++++++++++++++++++++++++++++++++++++
 nvim/plugins/default.nix   |  18 ++++-
 nvim/plugins/lspconfig.nix |  19 -----
 3 files changed, 177 insertions(+), 20 deletions(-)
 create mode 100644 nvim/plugins.nix
 delete mode 100644 nvim/plugins/lspconfig.nix

diff --git a/nvim/plugins.nix b/nvim/plugins.nix
new file mode 100644
index 0000000..d35e8d7
--- /dev/null
+++ b/nvim/plugins.nix
@@ -0,0 +1,160 @@
+{ lib }: {
+  cmp-buffer.enable = true;
+  cmp-clippy.enable = true;
+  cmp-cmdline.enable = true;
+  cmp-nvim-lsp.enable = true;
+  cmp-nvim-lsp-document-symbol.enable = true;
+  cmp-nvim-lsp-signature-help.enable = true;
+  cmp-path.enable = true;
+  cmp-rg.enable = true;
+  cmp-spell.enable = true;
+  cmp-treesitter.enable = true;
+  cmp-zsh.enable = true;
+  conform-nvim = {
+    enable = true;
+    formattersByFt = {
+      "_" = [ "trim_whitespace" ];
+      c = [ "clang_format" ];
+      cpp = [ "clang_format" ];
+      lua = [ "stylua" ];
+      nix = [ "nixpkgs_fmt" ];
+      rust = [ "rustfmt" ];
+      sh = [ "shfmt" ];
+      toml = [ "taplo" ];
+      yaml = [ "yamlfmt" ];
+      zig = [ "zigfmt" ];
+    };
+  };
+  gitsigns.enable = true;
+  lsp = {
+    enable = true;
+    servers = {
+      bashls.enable = true;
+      clangd.enable = true;
+      html.enable = true;
+      jsonls.enable = true;
+      nil_ls.enable = true;
+      pyright.enable = true;
+      rnix-lsp.enable = true;
+      ruff-lsp.enable = true;
+      taplo.enable = true;
+      texlab.enable = true;
+      typos-lsp.enable = true;
+      typst-lsp.enable = true;
+    };
+  };
+  lspkind = {
+    enable = true;
+    mode = "symbol";
+    extraOptions.maxwidth = 50;
+  };
+  lualine = {
+    enable = true;
+    theme = lib.mkForce "gruvbox";
+    sections = {
+      lualine_a = [{ name = "mode"; }];
+      lualine_b = [{ name = "filename"; } { name = "branch"; }];
+      lualine_y = [{ name = "encoding"; } { name = "fileformat"; } { name = "filetype"; }];
+      lualine_z = [{ name = "location"; }];
+    };
+  };
+  luasnip = {
+    enable = true;
+    extraConfig = { update_events = "TextChanged,TextChangedI"; };
+  };
+  nvim-cmp = {
+    enable = true;
+    # Snippets
+    snippet.expand = "luasnip";
+    # Completion Sources
+    sources = [
+      { name = "buffer"; groupIndex = 3; }
+      { name = "calc"; groupIndex = 2; }
+      { name = "conventionalcommits"; groupIndex = 1; }
+      { name = "crates"; groupIndex = 1; }
+      { name = "luasnip"; groupIndex = 1; }
+      { name = "nvim_lsp"; groupIndex = 1; }
+      { name = "nvim_lsp_document_symbol"; groupIndex = 1; }
+      { name = "nvim_lsp_signature_help"; groupIndex = 1; }
+      { name = "path"; groupIndex = 2; }
+      { name = "spell"; groupIndex = 2; }
+      { name = "treesitter"; groupIndex = 2; }
+      { name = "zsh"; groupIndex = 1; }
+    ];
+    # Menu Icons
+    mappingPresets = [ "insert" ];
+    mapping = {
+      "<C-n>" = {
+        modes = [ "i" "s" ];
+        action = ''
+          function(fallback)
+            if cmp.visible() then
+              cmp.select_next_item()
+            elseif require("luasnip").expand_or_jumpable() then
+              require("luasnip").expand_or_jump()
+            elseif has_words_before() then
+              cmp.complete()
+            else
+              fallback()
+            end
+          end
+        '';
+      };
+      "<C-p>" = {
+        modes = [ "i" "s" ];
+        action = ''
+          function(fallback)
+            if cmp.visible() then
+              cmp.select_prev_item()
+            elseif require("luasnip").jumpable(-1) then
+              require("luasnip").jump(-1)
+            else
+              fallback()
+            end
+          end
+        '';
+      };
+      "<C-u>" = ''
+        cmp.mapping(function(fallback)
+          if require("luasnip").choice_active() then
+            require("luasnip").next_choice()
+          else
+            fallback()
+          end
+        end)
+      '';
+      "<C-b>" = "cmp.mapping.scroll_docs(-4)";
+      "<C-f>" = "cmp.mapping.scroll_docs(4)";
+      "<C-Space>" = "cmp.mapping.complete {}";
+      "<C-e>" = "cmp.mapping.close()";
+      "<CR>" = "cmp.mapping.confirm { select = true }";
+    };
+  };
+  nvim-colorizer = {
+    enable = true;
+    userDefaultOptions = {
+      names = false; # disable named colors (i.e. red)
+      mode = "virtualtext";
+    };
+  };
+  rustaceanvim.enable = true;
+  telescope.enable = true;
+  treesitter = {
+    enable = true;
+    indent = true;
+    incrementalSelection.enable = true;
+  };
+  treesitter-context.enable = true;
+  trouble = {
+    enable = true;
+    autoClose = true;
+  };
+  lint = {
+    enable = true;
+    lintersByFt = {
+      rust = [ "typos" ];
+      latex = [ "chktex" "typos" ];
+      markdown = [ "typos" ];
+    };
+  };
+}
diff --git a/nvim/plugins/default.nix b/nvim/plugins/default.nix
index 36eb176..8628930 100644
--- a/nvim/plugins/default.nix
+++ b/nvim/plugins/default.nix
@@ -1,6 +1,22 @@
 {
   gitsigns.enable = true;
-  lspconfig = import ./lspconfig.nix;
+  lsp = {
+    enable = true;
+    servers = {
+      bashls.enable = true;
+      clangd.enable = true;
+      html.enable = true;
+      jsonls.enable = true;
+      nil.enable = true;
+      pyright.enable = true;
+      rnix-lsp.enable = true;
+      ruff-lsp.enable = true;
+      taplo.enable = true;
+      texlab.enable = true;
+      typos-lsp.enable = true;
+      typst-lsp.enable = true;
+    };
+  };
   lspkind.enable = true;
   lualine = import ./lualine.nix;
   luasnip = {
diff --git a/nvim/plugins/lspconfig.nix b/nvim/plugins/lspconfig.nix
deleted file mode 100644
index 6813b78..0000000
--- a/nvim/plugins/lspconfig.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  enable = true;
-  servers.bashls.enable = true;
-  servers.clangd.enable = true;
-  servers.html.enable = true;
-  # servers.lua-language-server.enable = true;
-  servers.jsonls.enable = true;
-  servers.nil.enable = true;
-  servers.ocamllsp.enable = true;
-  servers.pyright.enable = true;
-  servers.rnix-lsp.enable = true;
-  servers.ruff-lsp.enable = true;
-  # servers.rust-analyzer.enable = true;
-  # servers.serve_d.enable = true;
-  servers.taplo.enable = true;
-  servers.texlab.enable = true;
-  servers.typst-lsp.enable = true;
-  # servers.vimls.enable = true;
-}