diff --git a/dot_config/nvim/lua/configs/packages/blink.lua b/dot_config/nvim/lua/configs/packages/blink.lua new file mode 100644 index 0000000..41a0292 --- /dev/null +++ b/dot_config/nvim/lua/configs/packages/blink.lua @@ -0,0 +1,39 @@ +return { + 'saghen/blink.cmp', + -- optional: provides snippets for the snippet source + dependencies = 'rafamadriz/friendly-snippets', + + -- use a release tag to download pre-built binaries + version = '*', + -- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust + -- build = 'cargo build --release', + -- If you use nix, you can build from source using latest nightly rust with: + -- build = 'nix run .#build-plugin', + + ---@module 'blink.cmp' + ---@type blink.cmp.Config + opts = { + -- 'default' for mappings similar to built-in completion + -- 'super-tab' for mappings similar to vscode (tab to accept, arrow keys to navigate) + -- 'enter' for mappings similar to 'super-tab' but with 'enter' to accept + -- See the full "keymap" documentation for information on defining your own keymap. + keymap = { preset = 'default' }, + + appearance = { + -- Sets the fallback highlight groups to nvim-cmp's highlight groups + -- Useful for when your theme doesn't support blink.cmp + -- Will be removed in a future release + use_nvim_cmp_as_default = true, + -- Set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- Adjusts spacing to ensure icons are aligned + nerd_font_variant = 'mono' + }, + + -- Default list of enabled providers defined so that you can extend it + -- elsewhere in your config, without redefining it, due to `opts_extend` + sources = { + default = { 'lsp', 'path', 'snippets', 'buffer' }, + }, + }, + opts_extend = { "sources.default" } +} diff --git a/dot_config/nvim/lua/configs/packages/lsp.lua b/dot_config/nvim/lua/configs/packages/lsp.lua index 9ba14e0..0edd182 100644 --- a/dot_config/nvim/lua/configs/packages/lsp.lua +++ b/dot_config/nvim/lua/configs/packages/lsp.lua @@ -106,6 +106,7 @@ local server_configs = function() }, -- }}} jsonnet_ls = {}, regal = {}, + jedi_language_server = {} } end @@ -308,9 +309,9 @@ local function on_attach(args) -- {{{ end -- }}} local function make_client_capabilities() - local caps = require('cmp_nvim_lsp').default_capabilities() + -- local caps = require('cmp_nvim_lsp').default_capabilities() local def = vim.lsp.protocol.make_client_capabilities() - caps = vim.tbl_deep_extend('keep', caps, def) + local caps = require('blink.cmp').get_lsp_capabilities(def) -- caps.workspace.didChangeWatchedFiles.dynamicRegistration = false return caps end diff --git a/dot_config/nvim/lua/configs/packages/luasnip.lua b/dot_config/nvim/lua/configs/packages/luasnip.lua index 0cf37b6..84f859c 100644 --- a/dot_config/nvim/lua/configs/packages/luasnip.lua +++ b/dot_config/nvim/lua/configs/packages/luasnip.lua @@ -45,4 +45,5 @@ function M.config() }) end -return M +--return M +return {} diff --git a/dot_config/nvim/lua/configs/packages/nvim-cmp.lua b/dot_config/nvim/lua/configs/packages/nvim-cmp.lua index fe8f514..f44442c 100644 --- a/dot_config/nvim/lua/configs/packages/nvim-cmp.lua +++ b/dot_config/nvim/lua/configs/packages/nvim-cmp.lua @@ -83,4 +83,5 @@ function M.config() -- }) end -return M +--return M +return {}