2 files changed, 9 insertions, 17 deletions

diff --git a/common/nixvim.nix b/common/nixvim.nix
index 659896d..8d63f37 100644
--- a/common/nixvim.nix
+++ b/common/nixvim.nix
@@ -307,14 +307,6 @@ inputs:
     ];
 
     plugins = {
-      blink-cmp = {
-        enable = true;
-        settings = {
-          keymap.preset = "enter";
-          completion.documentation.auto_show = true;
-        };
-      };
-
       diffview.enable = true;
 
       dressing.enable = true;
diff --git a/usecases/desktop/development/nixvim-dev.nix b/usecases/desktop/development/nixvim-dev.nix
index 9bd3b04..9996279 100644
--- a/usecases/desktop/development/nixvim-dev.nix
+++ b/usecases/desktop/development/nixvim-dev.nix
@@ -19,15 +19,6 @@ _inputs:
       # TODO:
       #conform-nvim.enable = true;
 
-      blink-cmp.settings.sources = {
-        per_filetype.org = [ "orgmode" ];
-        providers.orgmode = {
-          name = "Orgmode";
-          module = "orgmode.org.autocompletion.blink";
-          fallbacks = [ "buffer" ];
-        };
-      };
-
       clangd-extensions.enable = true;
 
       crates = {
@@ -266,6 +257,15 @@ _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" })