From 1a8ccc7e4e413aad19a70e2291513270d3c8e2aa Mon Sep 17 00:00:00 2001 From: triethyl Date: Sun, 17 Aug 2025 21:34:19 -0400 Subject: neovim: working on completion --- pkgs/custom-neovim/config/lua/keymaps.lua | 7 ++++-- .../config/lua/plugins/completion.lua | 25 ++++++++++++++++++++++ pkgs/custom-neovim/default.nix | 5 +++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/custom-neovim/config/lua/plugins/completion.lua (limited to 'pkgs') diff --git a/pkgs/custom-neovim/config/lua/keymaps.lua b/pkgs/custom-neovim/config/lua/keymaps.lua index 92dfd46..9b86e97 100644 --- a/pkgs/custom-neovim/config/lua/keymaps.lua +++ b/pkgs/custom-neovim/config/lua/keymaps.lua @@ -1,6 +1,6 @@ -- Create keymap function local mapkey = function(mode, key, desc, action, plugin) - local keymapper = plugin and require("lz.n").keymap(plugin).set or vim.keymap.set + local keymapper = plugin and require("lz.n").keymap(plugin).set or vim.keymap.set keymapper(mode, key, action, {noremap = true, silent = true, desc = desc}) end @@ -20,11 +20,14 @@ mapkey("n", "e", "Open file manager", ":lua MiniFiles.open()", "mini mapkey("n", "g", "Manage git", "") mapkey("n", "gg", "Open neogit", ":Neogit", "neogit") mapkey("n", "ga", "Git add", ":Git add %:p", "mini-git") -mapkey("n", "gr", "Git rm", ":Git rm %:p", "mini-git") +mapkey("n", "gr", "Git remove", ":Git rm %:p", "mini-git") mapkey("n", "gc", "Git commit", ":Git commit", "mini-git") mapkey("n", "gp", "Git pull", ":Git pull", "mini-git") mapkey("n", "gP", "Git push", ":Git push", "mini-git") +-- Terminal +mapkey("n", "t", "Open terminal", ":botright terminal") + -- Really delete mapkey({"n", "v"}, "d", "Really delete", [["_d]]) mapkey({"n", "v"}, "x", "Really delete character", [["_x]]) diff --git a/pkgs/custom-neovim/config/lua/plugins/completion.lua b/pkgs/custom-neovim/config/lua/plugins/completion.lua new file mode 100644 index 0000000..c238ebe --- /dev/null +++ b/pkgs/custom-neovim/config/lua/plugins/completion.lua @@ -0,0 +1,25 @@ +return { + { + -- when in doubt, this plugin is the cause of cpu issues. + "blink.cmp", + enabled = true, + lazy = true, + event = { + "InsertEnter", + "CmdlineEnter", + }, + after = function() + require("luasnip.loaders.from_vscode").lazy_load() + vim.cmd.packadd("luasnip") + vim.cmd.packadd("friendly-snippets") + + require("blink.cmp").setup { + snippets = { preset = 'luasnip' }, + sources = { + default = { 'lsp', 'path', 'snippets', 'buffer' }, + }, + } + end, + }, + test = f +} diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix index 500ebde..a005656 100644 --- a/pkgs/custom-neovim/default.nix +++ b/pkgs/custom-neovim/default.nix @@ -26,6 +26,11 @@ inputs.mnw.lib.wrap pkgs { mini-extra plenary-nvim + # Completion Plugins + blink-cmp + luasnip + friendly-snippets + # Utility Plugins mini-pairs comment-nvim -- cgit v1.2.3