From baa2e07b0f0ad5989ad83ed23e6bcbbd7c8f29d4 Mon Sep 17 00:00:00 2001
From: rocketdebris <rocketdebris@gmail.com>
Date: Tue, 16 Sep 2025 09:48:21 -0400
Subject: [PATCH] Updated nvim configuration including harpoon and firenvim

---
 init.lua                 | 19 +++++++++++++++++--
 lua/plugins/firenvim.lua |  1 +
 lua/plugins/harpoon.lua  |  5 +++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 lua/plugins/firenvim.lua
 create mode 100644 lua/plugins/harpoon.lua

diff --git a/init.lua b/init.lua
index c5b67cb..7766b01 100644
--- a/init.lua
+++ b/init.lua
@@ -1,3 +1,5 @@
+vim.g.mapleader = " "
+
 require("config.lazy")
 
 require("mason").setup()
@@ -24,9 +26,22 @@ vim.cmd([[colorscheme everforest]])
 
 -- My custom keybinds
 -- vim.keymap.set("n", "<space><space>x", "<cmd>source %<CR>") -- Can't do this with lazy.nvim apparently
-vim.keymap.set("n", "<space>x", ":.lua<CR>")
-vim.keymap.set("v", "<space>x", ":lua<CR>")
+vim.keymap.set("n", "<Leader>x", ":.lua<CR>")
+vim.keymap.set("v", "<Leader>x", ":lua<CR>")
 vim.api.nvim_set_keymap('t', '<ESC>', [[<C-\><C-n>]], {noremap = true})
+-- vim.api.nvim_set_keymap('i', '<C-k>', [[<C-x><C-o>]], {noremap = true})
+
+-- Harpoon Setup and Settings
+local harpoon = require("harpoon")
+harpoon:setup()
+vim.keymap.set("n", "<Leader>n", function() harpoon:list():add() end)
+vim.keymap.set("n", "<Leader>h", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+vim.keymap.set("n", "<Leader>d", function() harpoon:list():remove() end)
+vim.keymap.set("n", "<Leader>j", function() harpoon:list():select(1) end)
+vim.keymap.set("n", "<Leader>k", function() harpoon:list():select(2) end)
+vim.keymap.set("n", "<Leader>l", function() harpoon:list():select(3) end)
+vim.keymap.set("n", "<Leader>;", function() harpoon:list():select(4) end)
+
 
 local lspconfig = require('lspconfig')
 lspconfig.pylsp.setup{}
diff --git a/lua/plugins/firenvim.lua b/lua/plugins/firenvim.lua
new file mode 100644
index 0000000..4dfcdb0
--- /dev/null
+++ b/lua/plugins/firenvim.lua
@@ -0,0 +1 @@
+return { 'glacambre/firenvim', build = ":call firenvim#install(0)" }
diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua
new file mode 100644
index 0000000..204f183
--- /dev/null
+++ b/lua/plugins/harpoon.lua
@@ -0,0 +1,5 @@
+return {{
+  "ThePrimeagen/harpoon",
+  branch = "harpoon2",
+  dependencies = { "nvim-lua/plenary.nvim" }
+}}