diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index ae0f3a7..8fed879 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -2,6 +2,7 @@ "FTerm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" }, "aerial.nvim": { "branch": "master", "commit": "603156d4fd58963a05f221e76b1a25bc79ed55b0" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f94f7ba948e32cd302caba1c2ca3f7c697fb4fcf" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua index 1d955ad..a188e66 100644 --- a/nvim/lua/plugins/cmp.lua +++ b/nvim/lua/plugins/cmp.lua @@ -1,9 +1,9 @@ return { "hrsh7th/nvim-cmp", - event = "InsertEnter", + event = "VimEnter", dependencies = { "hrsh7th/cmp-buffer", -- source for text in buffer - "hrsh7th/cmp-path", -- source for file system paths + "hrsh7th/cmp-path", -- source for file system paths "hrsh7th/cmp-nvim-lsp-document-symbol", "hrsh7th/cmp-nvim-lsp-signature-help", { @@ -18,6 +18,7 @@ return { }, "hrsh7th/cmp-vsnip", "onsails/lspkind.nvim", -- vs-code like pictogram + "hrsh7th/cmp-cmdline", }, config = function() local cmp = require("cmp") @@ -35,6 +36,16 @@ return { cmp.setup({ + window = { + completion = cmp.config.window.bordered({ + border = 'double', + winhighlight = "Normal:CmpNormal", + }), + documentation = cmp.config.window.bordered({ + border = 'double', + winhighlight = "Normal:CmpDocNormal", + }), + }, snippet = { expand = function(args) vim.fn["vsnip#anonymous"](args.body) @@ -78,6 +89,27 @@ return { { name = "path" }, }), }) + -- `/` cmdline setup. + cmp.setup.cmdline('/', { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = 'buffer' } + } + }) + -- `:` cmdline setup. + cmp.setup.cmdline(':', { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = 'path' } + }, { + { + name = 'cmdline', + option = { + ignore_cmds = { 'Man', '!' } + } + } + }) + }) vim.cmd([[ set completeopt=menuone,noinsert,noselect diff --git a/nvim/lua/plugins/go.lua b/nvim/lua/plugins/go.lua index 8926892..c7936ce 100644 --- a/nvim/lua/plugins/go.lua +++ b/nvim/lua/plugins/go.lua @@ -1,23 +1,23 @@ return { { 'kyoh86/vim-go-coverage', - ft = {'go'}, + ft = { 'go' }, }, { 'mattn/vim-goaddtags', - ft = {'go'}, + ft = { 'go' }, }, { 'mattn/vim-goimpl', - ft = {'go'}, + ft = { 'go' }, }, { 'mattn/vim-gomod', - ft = {'go'}, + ft = { 'go', 'gomod', 'gosum', 'gowork' }, }, { 'mattn/vim-goimports', - ft = {'go'}, + ft = { 'go' }, config = function() vim.g.goimports = 1 end, diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 953313e..95d3de1 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -9,6 +9,7 @@ return { }, config = function() require("telescope").setup({ + file_ignore_patterns = { "node_modules/", ".git", ".cache", ".venv", ".vscode", ".idea", ".DS_Store", "vendor/" }, extensions = { fzf = { fuzzy = true, -- false will only do exact matching