3 files changed, 35 insertions, 2 deletions
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", "<leader>e", "Open file manager", ":lua MiniFiles.open()<cr>", "mini
 mapkey("n", "<leader>g", "Manage git", "")
 mapkey("n", "<leader>gg", "Open neogit", ":Neogit<cr>", "neogit")
 mapkey("n", "<leader>ga", "Git add", ":Git add %:p<cr>", "mini-git")
-mapkey("n", "<leader>gr", "Git rm", ":Git rm %:p<cr>", "mini-git")
+mapkey("n", "<leader>gr", "Git remove", ":Git rm %:p<cr>", "mini-git")
 mapkey("n", "<leader>gc", "Git commit", ":Git commit<cr>", "mini-git")
 mapkey("n", "<leader>gp", "Git pull", ":Git pull<cr>", "mini-git")
 mapkey("n", "<leader>gP", "Git push", ":Git push<cr>", "mini-git")
 
+-- Terminal
+mapkey("n", "<leader>t", "Open terminal", ":botright terminal<cr>")
+
 -- Really delete
 mapkey({"n", "v"}, "<leader>d", "Really delete", [["_d]])
 mapkey({"n", "v"}, "<leader>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