From 5d9b5820309cf5dd8011908fbd40cbe0f380b2f0 Mon Sep 17 00:00:00 2001 From: linarphy Date: Sat, 25 May 2024 01:40:59 +0200 Subject: [PATCH] Update neovim --- private_dot_config/nvim/lazy-lock.json | 22 +++++++++---------- private_dot_config/nvim/lua/mapping/init.lua | 2 ++ .../nvim/lua/mapping/maintenance.lua | 4 ++-- .../nvim/lua/mapping/nvim-cmp.lua | 15 +++++++++++++ .../nvim/lua/plugins/nvim-cmp.lua | 10 ++++----- 5 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 private_dot_config/nvim/lua/mapping/nvim-cmp.lua diff --git a/private_dot_config/nvim/lazy-lock.json b/private_dot_config/nvim/lazy-lock.json index 04fe114..2c713e2 100644 --- a/private_dot_config/nvim/lazy-lock.json +++ b/private_dot_config/nvim/lazy-lock.json @@ -7,23 +7,23 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "dashboard-nvim": { "branch": "master", "commit": "5182c09ac8085dc73b78ad0ea9f5479c9a866fc4" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, - "fzf-lua": { "branch": "main", "commit": "e53867b9c3a5de3d30ebe0b4a5107eb59b1a8a0c" }, - "lazy.nvim": { "branch": "main", "commit": "0de782a6b0ffba599dbd332a4019d852564bf28c" }, - "mini.nvim": { "branch": "main", "commit": "eb2dd6d187e1ab5fefec66f0d37b1a3dc8633d17" }, + "fzf-lua": { "branch": "main", "commit": "0c4458b0f0d12970e54c8cd7c5ad60676edcf764" }, + "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" }, + "mini.nvim": { "branch": "main", "commit": "aa81e45b5977c1db3680c5ef4c016276cf1c7645" }, "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, - "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, + "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-lspconfig": { "branch": "master", "commit": "9bda20fb967075355f253911bc066a8b5a03c77e" }, + "nvim-lspconfig": { "branch": "master", "commit": "b972e7154bc94ab4ecdbb38c8edbccac36f83996" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-treesitter": { "branch": "master", "commit": "7c9c5bed8340031f8a6dad47a58a26eaf15b9a56" }, - "nvim-treesitter-context": { "branch": "master", "commit": "55e29081e73d2e4b2d62fb4dc3eebe21bf66a1e2" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, - "nvim-ts-autotag": { "branch": "main", "commit": "cb57b07803476ee902c89412aeff219a9a58be13" }, + "nvim-treesitter": { "branch": "master", "commit": "6d56c5f404d3b116bab167bc03993cfb0a83f8aa" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" }, "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" }, - "plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "trouble.nvim": { "branch": "dev", "commit": "e2185bf6e63ef9bd75f1819f43846e2b0f10953b" }, "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } diff --git a/private_dot_config/nvim/lua/mapping/init.lua b/private_dot_config/nvim/lua/mapping/init.lua index 3bdcdb2..73f145b 100644 --- a/private_dot_config/nvim/lua/mapping/init.lua +++ b/private_dot_config/nvim/lua/mapping/init.lua @@ -4,6 +4,8 @@ require('mapping.movement') require('mapping.lsp') +require('mapping.nvim-cmp') + require('mapping.persistence') require('mapping.fzf-lua') diff --git a/private_dot_config/nvim/lua/mapping/maintenance.lua b/private_dot_config/nvim/lua/mapping/maintenance.lua index a9b2f7d..5556274 100644 --- a/private_dot_config/nvim/lua/mapping/maintenance.lua +++ b/private_dot_config/nvim/lua/mapping/maintenance.lua @@ -3,7 +3,7 @@ vim.keymap.set( 'ie' , ':tabedit ' .. require('variables.core').config .. '', { - desc = 'edit current configuration in a new tab' + desc = 'Edit current configuration in a new tab' } ) @@ -12,6 +12,6 @@ vim.keymap.set( 'is' , ':source ' .. require('variables.core').config .. 'init.lua', { - desc = 'try to reload current configuration' + desc = 'Try to reload current configuration' } ) diff --git a/private_dot_config/nvim/lua/mapping/nvim-cmp.lua b/private_dot_config/nvim/lua/mapping/nvim-cmp.lua new file mode 100644 index 0000000..8aa60ed --- /dev/null +++ b/private_dot_config/nvim/lua/mapping/nvim-cmp.lua @@ -0,0 +1,15 @@ +local cmp = require('cmp') +local config = cmp.get_config() + +config.mapping = { + ['fj'] = cmp.mapping.select_next_item(), + ['fk'] = cmp.mapping.select_prev_item(), + ['f'] = cmp.mapping.complete() , + ['fe'] = cmp.mapping.close() , + [''] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Insert, + select = true , + }) , +} + +cmp.setup(config) diff --git a/private_dot_config/nvim/lua/plugins/nvim-cmp.lua b/private_dot_config/nvim/lua/plugins/nvim-cmp.lua index c8a952a..38dffa0 100644 --- a/private_dot_config/nvim/lua/plugins/nvim-cmp.lua +++ b/private_dot_config/nvim/lua/plugins/nvim-cmp.lua @@ -9,8 +9,6 @@ return { 'hrsh7th/cmp-emoji' , } , opts = function() - local cmp = require('cmp') - local defaults = require('cmp.config.default')() return { snippet = { expand = function(args) @@ -18,10 +16,10 @@ return { end }, window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), + completion = require('cmp').config.window.bordered(), + documentation = require('cmp').config.window.bordered(), }, - sources = cmp.config.sources({ + sources = require('cmp').config.sources({ { name = 'nvim_lsp' }, { name = 'path' }, { name = 'emoji' }, @@ -29,6 +27,8 @@ return { }, { { name = 'buffer' }, }), + mapping = { + } } end , }