diff --git a/config/default.nix b/config/default.nix index 9b9f713..3ebffdd 100644 --- a/config/default.nix +++ b/config/default.nix @@ -11,7 +11,6 @@ _: { # Completion ./plugins/cmp/cmp.nix - ./plugins/cmp/lspkind.nix ./plugins/cmp/autopairs.nix ./plugins/cmp/schemastore.nix diff --git a/config/plugins/cmp/cmp.nix b/config/plugins/cmp/cmp.nix index d4da4df..dd519b1 100644 --- a/config/plugins/cmp/cmp.nix +++ b/config/plugins/cmp/cmp.nix @@ -1,141 +1,7 @@ { plugins = { - cmp-emoji = { + blink-cmp = { enable = true; }; - cmp = { - enable = true; - settings = { - autoEnableSources = true; - experimental = { - ghost_text = false; - }; - performance = { - debounce = 60; - fetchingTimeout = 200; - maxViewEntries = 30; - }; - snippet = { - expand = "luasnip"; - }; - formatting = { - fields = [ - "kind" - "abbr" - "menu" - ]; - }; - sources = [ - { name = "git"; } - { name = "nvim_lsp"; } - { name = "emoji"; } - { - name = "buffer"; # text within current buffer - option.get_bufnrs.__raw = "vim.api.nvim_list_bufs"; - keywordLength = 3; - } - { - name = "path"; # file system paths - keywordLength = 3; - } - { - name = "luasnip"; # snippets - keywordLength = 3; - } - ]; - - window = { - completion = { - border = "solid"; - }; - documentation = { - border = "solid"; - }; - }; - - mapping = { - "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; - "" = "cmp.mapping.select_next_item()"; - "" = "cmp.mapping.select_prev_item()"; - "" = "cmp.mapping.abort()"; - "" = "cmp.mapping.scroll_docs(-4)"; - "" = "cmp.mapping.scroll_docs(4)"; - "" = "cmp.mapping.complete()"; - "" = "cmp.mapping.confirm({ select = true })"; - "" = "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true })"; - }; - }; - }; - cmp-nvim-lsp = { - enable = true; - }; # lsp - cmp-buffer = { - enable = true; - }; - cmp-path = { - enable = true; - }; # file system paths - cmp_luasnip = { - enable = true; - }; # snippets - cmp-cmdline = { - enable = false; - }; # autocomplete for cmdline }; - extraConfigLua = '' - luasnip = require("luasnip") - kind_icons = { - Text = "󰊄", - Method = " ", - Function = "󰡱 ", - Constructor = " ", - Field = " ", - Variable = "󱀍 ", - Class = " ", - Interface = " ", - Module = "󰕳 ", - Property = " ", - Unit = " ", - Value = " ", - Enum = " ", - Keyword = " ", - Snippet = " ", - Color = " ", - File = "", - Reference = " ", - Folder = " ", - EnumMember = " ", - Constant = " ", - Struct = " ", - Event = " ", - Operator = " ", - TypeParameter = " ", - } - - local cmp = require'cmp' - - -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore). - cmp.setup.cmdline({'/', "?" }, { - sources = { - { name = 'buffer' } - } - }) - - -- Set configuration for specific filetype. - cmp.setup.filetype('gitcommit', { - sources = cmp.config.sources({ - { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it. - }, { - { name = 'buffer' }, - }) - }) - - -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). - cmp.setup.cmdline(':', { - sources = cmp.config.sources({ - { name = 'path' } - }, { - { name = 'cmdline' } - }), - }) ''; } diff --git a/config/plugins/cmp/lspkind.nix b/config/plugins/cmp/lspkind.nix deleted file mode 100644 index 1fb9e42..0000000 --- a/config/plugins/cmp/lspkind.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - plugins.lspkind = { - enable = true; - settings = { - maxwidth = 50; - ellipsis_char = "..."; - }; - }; -}