swap nvim_cmp for blink (fixes completion when hitting backspace)

4 files changed, 23 insertions, 28 deletions

diff --git a/fnl/plugins/blink.fnl b/fnl/plugins/blink.fnl
new file mode 100644
index 0000000..fd35d7c
--- /dev/null
+++ b/fnl/plugins/blink.fnl
@@ -0,0 +1,18 @@
+(local blink (_G.util.require! :blink.cmp))
+(blink.setup {
+  :keymap {
+    :<Tab> [ :select_next ]
+  }
+
+  :completion {
+    :list {
+      :selection {
+        :preselect false
+      }
+    }
+  }
+
+  :fuzzy {
+    :implementation :lua
+  }
+})
diff --git a/fnl/plugins/cmp.fnl b/fnl/plugins/cmp.fnl
deleted file mode 100644
index 09067eb..0000000
--- a/fnl/plugins/cmp.fnl
+++ /dev/null
@@ -1,23 +0,0 @@
-(local cmp (_G.util.require! :cmp))
-
-(cmp.setup {
-  :snippet {
-    :expand (fn [args] 
-      (vim.snippet.expand args.body)
-      ;((. vim.fn "vsnip#anonymous") args.body) ;for older neovim version (< 0.10)
-    )}
-  :mapping (cmp.mapping.preset.insert {
-    :<C-b> (cmp.mapping.scroll_docs -4)
-    :<C-f> (cmp.mapping.scroll_docs 4)
-    :<C-Space> (cmp.mapping.complete)
-    :<C-e> (cmp.mapping.abort)
-    :<CR> (cmp.mapping.confirm {select true})
-    :<Tab> (cmp.mapping (cmp.mapping.select_next_item) [:i :s])
-  })
-  :sources (cmp.config.sources [
-    {:name :nvim_lsp}
-    {:name :calc} ;to anyone new to this codebase, calc is short for calculator (no clue what this adds, but its funny)
-    ] [{:name :buffer}])
-  })
-
-
diff --git a/fnl/plugins/lspconfig.fnl b/fnl/plugins/lspconfig.fnl
index 5a257ad..fc39846 100644
--- a/fnl/plugins/lspconfig.fnl
+++ b/fnl/plugins/lspconfig.fnl
@@ -1,9 +1,10 @@
-(var capabilities (require :cmp_nvim_lsp))
-(set capabilities (capabilities.default_capabilities))
+(var capabilities (require :blink.cmp))
+(set capabilities (capabilities.get_lsp_capabilities))
+
 (local lsp _G.settings.lsp)
 (local config_table {
   :lua_ls {:settings {:Lua {:diagnostics {:disable
-    ["lowercase-global" "trailing-space" "unused-local"]}}}}
+    ["lowercase-global" "trailing-space"]}}}}
   })
 (local lspconfig (_G.util.require! :lspconfig))
 
diff --git a/init.fnl b/init.fnl
index 59ba6a2..aab9ee2 100644
--- a/init.fnl
+++ b/init.fnl
@@ -82,8 +82,7 @@
   ;lsp
   (use! :nvim-treesitter/nvim-treesitter :require :plugins.treesitter)
   (use! :ray-x/lsp_signature.nvim :config (util.setup! :lsp_signature))
-  (use! :hrsh7th/cmp-nvim-lsp)
-  (use! :hrsh7th/nvim-cmp :require :plugins.cmp)
+  (use! :saghen/blink.cmp :require :plugins.blink)
   (use! :neovim/nvim-lspconfig :require :plugins.lspconfig)
   (use! :williamboman/mason.nvim :config (util.setup! :mason))