2 files changed, 40 insertions, 9 deletions

diff --git a/common/nixvim.nix b/common/nixvim.nix
index 367f442..72a80e2 100644
--- a/common/nixvim.nix
+++ b/common/nixvim.nix
@@ -307,6 +307,46 @@ inputs:
     ];
 
     plugins = {
+      cmp = {
+        enable = true;
+        autoEnableSources = false;
+        settings = {
+          mapping.__raw = ''
+            cmp.mapping.preset.insert({
+              ['<CR>'] = cmp.mapping.confirm({ select = false }),
+            })
+          '';
+
+          sources.__raw = ''
+            cmp.config.sources({
+              { name = 'orgmode' },
+              { name = 'git' },
+              { name = 'nvim_lsp' },
+              { name = 'async_path' },
+            }, {
+              { name = 'buffer' },
+            }, {
+              { name = 'spell' },
+            })
+          '';
+        };
+      };
+      cmp-nvim-lsp.enable = true;
+      cmp-async-path.enable = true;
+      cmp-buffer.enable = true;
+      cmp-git = {
+        enable = true;
+        settings = {
+          filetypes = [
+            "gitcommit"
+            "octo"
+            "NeogitCommitMessage"
+            "jjdescription"
+          ];
+        };
+      };
+      cmp-spell.enable = true;
+
       diffview.enable = true;
 
       dressing.enable = true;
diff --git a/usecases/desktop/development/nixvim-dev.nix b/usecases/desktop/development/nixvim-dev.nix
index c97a5b2..73bb59e 100644
--- a/usecases/desktop/development/nixvim-dev.nix
+++ b/usecases/desktop/development/nixvim-dev.nix
@@ -253,15 +253,6 @@ _inputs:
     };
 
     extraConfigLuaPost = ''
-      vim.api.nvim_create_autocmd('LspAttach', {
-        callback = function(ev)
-          local client = vim.lsp.get_client_by_id(ev.data.client_id)
-          if client:supports_method('textDocument/completion') then
-            vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = true })
-          end
-        end,
-      })
-
       -- TODO: this should be configurable
       -- TODO: this doesn't work when switching dark/light mode
       vim.api.nvim_set_hl(0, "@org.keyword.done", { link = "Comment" })