From dd5f89f39b32639edf4b546d3740eedc9db17a5a Mon Sep 17 00:00:00 2001
From: roxwize <rae@roxwize.xyz>
Date: Fri, 20 Dec 2024 14:52:09 -0500
Subject: [PATCH] ~

---
 configs/neovim/lsp.lua | 36 ------------------------------------
 nixos/home/base.nix    |  4 ----
 nixos/home/neovim.nix  |  1 +
 3 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 configs/neovim/lsp.lua

diff --git a/configs/neovim/lsp.lua b/configs/neovim/lsp.lua
deleted file mode 100644
index cecf444..0000000
--- a/configs/neovim/lsp.lua
+++ /dev/null
@@ -1,36 +0,0 @@
--- cmp
-local cmp = require("cmp")
-cmp.setup {
-    snippet = {
-        expand = function(args)
-            require("luasnip").lsp_expand(args.body)
-        end
-    },
-    mapping = {
-        ['<C-p>'] = cmp.mapping.select_prev_item(),
-        ['<C-n>'] = cmp.mapping.select_next_item(),
-        ['<C-space>'] = cmp.mapping.complete(),
-        ['<C-e>'] = cmp.mapping.close(),
-        ['<tab>'] = cmp.mapping.confirm { select = true }
-    },
-    sources = cmp.config.sources({
-        { name = "nvim_lsp" },
-        { name = "luasnip" }
-    })
-}
-
-local caps = vim.tbl_deep_extend(
-    "force",
-    vim.lsp.protocol.make_client_capabilities(),
-    require("cmp_nvim_lsp").default_capabilities(),
-    { workspace = { didChangeWatchedFiles = { dynamicRegistration = true } } }
-)
-
--- lspconfig
-local lc = require("lspconfig")
-
-lc.nix_nil.setup {
-    autostart = true,
-    capabilities = caps,
-    cmd = { "nil" }
-}
diff --git a/nixos/home/base.nix b/nixos/home/base.nix
index b9a461a..92a4fbd 100644
--- a/nixos/home/base.nix
+++ b/nixos/home/base.nix
@@ -22,10 +22,6 @@
         };
     };
     xdg.configFile = {
-        "nvim" = {
-            source = ../../configs/neovim;
-            recursive = true;
-        };
         "openbox".source = ../../configs/openbox;
     };
 
diff --git a/nixos/home/neovim.nix b/nixos/home/neovim.nix
index c77d88e..42993ef 100644
--- a/nixos/home/neovim.nix
+++ b/nixos/home/neovim.nix
@@ -5,6 +5,7 @@
         vimAlias = true;
         plugins = with pkgs.vimPlugins; [
             cmp_luasnip
+            cmp-nvim-lsp
             luasnip
             nvim-cmp
             nvim-lspconfig