updates

11 files changed, 228 insertions, 204 deletions

diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua
index c8ae8f2..7b3a948 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/core/keymaps.lua
@@ -12,18 +12,26 @@ vim.keymap.set("n", "<leader>a0", ":.!figlet -w 200 -f shadow<cr>", { desc = "As
 
 -- Buffers
 vim.keymap.set({ "n", "v", "x", "t" }, "<A-x>", "<Cmd>bd!<cr>", { desc = "Delete buffer" })
-vim.keymap.set({ "i", "n", "t" }, "<C-p>", "<Cmd>bprevious<cr>", { desc = "Previous buffer" })
-vim.keymap.set({ "i", "n", "t" }, "<C-n>", "<Cmd>bnext<cr>", { desc = "Next buffer" })
+-- vim.keymap.set({ "i", "n", "t" }, "<C-p>", "<Cmd>bprevious<cr>", { desc = "Previous buffer" })
+-- vim.keymap.set({ "i", "n", "t" }, "<C-n>", "<Cmd>bnext<cr>", { desc = "Next buffer" })
 vim.keymap.set({ "n", "t" }, "<S-h>", "<Cmd>bprevious<cr>", { desc = "Previous buffer" })
 vim.keymap.set({ "n", "t" }, "<S-l>", "<Cmd>bnext<cr>", { desc = "Next buffer" })
 vim.keymap.set("n", "<leader><leader>", "<Cmd>e #<cr>", { desc = "Switch to last buffer" })
 vim.keymap.set({ "n", "v", "x", "t" }, "<leader>bd", "<Cmd>:bd<cr>", { desc = "Close buffer" })
 vim.keymap.set({ "n", "v", "x", "t" }, "<leader>BD", "<Cmd>:bd!<cr>", { desc = "Force close buffer" })
 vim.keymap.set("n", "<leader>bn", "<Cmd>enew<cr>", { desc = "Open new buffer" })
-vim.keymap.set("n", "<leader>bc", "<Cmd>e!<cr>", { desc = "Clear edit" })
+vim.keymap.set({ "n", "i" }, "<C-z>", function()
+	if not vim.bo.modified then
+		return
+	end
+	local choice = vim.fn.confirm("Discard changes and reload file?", "&Yes\n&No", 2)
+	if choice == 1 then
+		vim.cmd("e!")
+	end
+end, { desc = "Confirm and reload file" })
 vim.keymap.set({ "i", "x", "n", "s" }, "<C-s>", "<Cmd>w<cr><esc>", { desc = "Save current buffer" })
-vim.keymap.set({ "n", "v" }, "<leader>wq", "<Cmd>wq<cr>", { desc = "Save current buffer and quit" })
-vim.keymap.set({ "n", "v" }, "<leader>WQ", "<Cmd>wqa<cr>", { desc = "Save all buffers and quit" })
+vim.keymap.set({ "n", "v" }, "<leader>ZZ", "<Cmd>wq<cr>", { desc = "Save current buffer and quit" })
+vim.keymap.set({ "n", "v" }, "<leader>ZA", "<Cmd>wqa<cr>", { desc = "Save all buffers and quit" })
 vim.keymap.set({ "n", "v" }, "<leader>qq", "<Cmd>q!<cr>", { desc = "Force quit" })
 vim.keymap.set({ "n", "v" }, "<leader>QQ", "<Cmd>qa!<cr>", { desc = "Force quit all" })
 vim.keymap.set("n", "<leader>rnf", function()
@@ -369,15 +377,6 @@ vim.keymap.set("n", "<leader>cx", "<Cmd>!chmod +x %<cr>", { silent = true, desc
 
 -- Remap Default
 vim.keymap.set("i", "jk", "<esc>", { noremap = true, silent = true, desc = "Escape to normal mode" })
-vim.keymap.set("i", "<C-c>", "<esc>", { noremap = true, silent = true, desc = "Escape to normal mode" })
-vim.keymap.set("i", "<C-a>", "<home>", { noremap = true, silent = true, desc = "Insert at beginning of line" })
-vim.keymap.set("i", "<C-e>", "<end>", { noremap = true, silent = true, desc = "Move to end of line" })
-vim.keymap.set("i", "<C-h>", "<left>", { noremap = true, silent = true, desc = "Move left" })
-vim.keymap.set("i", "<C-l>", "<right>", { noremap = true, silent = true, desc = "Move right" })
-vim.keymap.set("i", "<C-j>", "<down>", { noremap = true, silent = true, desc = "Move down" })
-vim.keymap.set("i", "<C-k>", "<up>", { noremap = true, silent = true, desc = "Move up" })
-vim.keymap.set("i", "<C-b>", "<up><end><cr>", { noremap = true, silent = true, desc = "New line above" })
-vim.keymap.set("i", "<C-f>", "<end><cr>", { noremap = true, silent = true, desc = "New line below" })
 vim.keymap.set("n", "<C-c>", ":", { noremap = true, desc = "Enter command mode" })
 vim.keymap.set("n", "J", "mzJ`z", { noremap = true, desc = "Join lines and keep cursor position" })
 vim.keymap.set("n", "n", "'Nn'[v:searchforward].'zv'", { expr = true, desc = "Next search result and center" })
@@ -403,8 +402,8 @@ vim.keymap.set("n", "<C-u>", function()
 end, { noremap = true, silent = true, desc = "Scroll up and center" })
 -- vim.keymap.set("n", "<C-d>", "<C-d>zz", { noremap = true, silent = true, desc = "Scroll down and center" })
 -- vim.keymap.set("n", "<C-u>", "<C-u>zz", { noremap = true, silent = true, desc = "Scroll up and center" })
-vim.keymap.set("n", "<C-b>", "<C-b>zz", { noremap = true, silent = true, desc = "Page up and center" })
-vim.keymap.set("n", "<C-f>", "<C-f>zz", { noremap = true, silent = true, desc = "Page down and center" })
+-- vim.keymap.set("n", "<C-b>", "<C-b>zz", { noremap = true, silent = true, desc = "Page up and center" })
+-- vim.keymap.set("n", "<C-f>", "<C-f>zz", { noremap = true, silent = true, desc = "Page down and center" })
 vim.keymap.set("n", "{", "{zz", { noremap = true, silent = true, desc = "Move to previous paragraph and center" })
 vim.keymap.set("n", "}", "}zz", { noremap = true, silent = true, desc = "Move to next paragraph and center" })
 vim.keymap.set("n", "G", "Gzz", { noremap = true, silent = true, desc = "Go to bottom of file and center" })
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ai.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ai.lua
index 45aa240..baab1f0 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ai.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/ai.lua
@@ -127,29 +127,29 @@ return {
 			require("gp").setup(conf)
 
 			-- Setup shortcuts here (see Usage > Shortcuts in the Documentation/Readme)
-			vim.keymap.set({ "n", "i" }, "<leader>Gc", "<Cmd>GpChatNew<cr>", keymapOptions("New chat"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gb", "<Cmd>GpBufferChatNew<cr>", keymapOptions("New buffer chat"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gt", "<Cmd>GpChatToggle<cr>", keymapOptions("Toggle chat"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gf", "<Cmd>GpChatFinder<cr>", keymapOptions("Chat finder"))
+			vim.keymap.set("n", "<leader>Gc", "<Cmd>GpChatNew<cr>", keymapOptions("New chat"))
+			vim.keymap.set("n", "<leader>Gb", "<Cmd>GpBufferChatNew<cr>", keymapOptions("New buffer chat"))
+			vim.keymap.set("n", "<leader>Gt", "<Cmd>GpChatToggle<cr>", keymapOptions("Toggle chat"))
+			vim.keymap.set("n", "<leader>Gf", "<Cmd>GpChatFinder<cr>", keymapOptions("Chat finder"))
 
 			vim.keymap.set("v", "<leader>Gc", ":<C-u>'<,'>GpChatNew<cr>", keymapOptions("Chat new"))
 			vim.keymap.set("v", "<leader>Gb", ":<C-u>'<,'>GpBufferChatNew<cr>", keymapOptions("Buffer chat new"))
 			vim.keymap.set("v", "<leader>Gp", ":<C-u>'<,'>GpChatPaste<cr>", keymapOptions("Chat paste"))
 			vim.keymap.set("v", "<leader>Gt", ":<C-u>'<,'>GpChatToggle<cr>", keymapOptions("Toggle chat"))
 
-			vim.keymap.set({ "n", "i" }, "<leader>Gh", "<Cmd>gpchatnew split<cr>", keymapOptions("New chat split"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gv", "<Cmd>gpchatnew vsplit<cr>", keymapOptions("New chat vsplit"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gn", "<Cmd>gpchatnew tabnew<cr>", keymapOptions("New chat tabnew"))
+			vim.keymap.set("n", "<leader>Gh", "<Cmd>gpchatnew split<cr>", keymapOptions("New chat split"))
+			vim.keymap.set("n", "<leader>Gv", "<Cmd>gpchatnew vsplit<cr>", keymapOptions("New chat vsplit"))
+			vim.keymap.set("n", "<leader>Gn", "<Cmd>gpchatnew tabnew<cr>", keymapOptions("New chat tabnew"))
 
 			vim.keymap.set("v", "<leader>Gh", ":<C-u>'<,'>GpChatNew split<cr>", keymapOptions("Chat new split"))
 			vim.keymap.set("v", "<leader>Gv", ":<C-u>'<,'>GpChatNew vsplit<cr>", keymapOptions("Chat new vsplit"))
 			vim.keymap.set("v", "<leader>Gn", ":<C-u>'<,'>GpChatNew tabnew<cr>", keymapOptions("Chat new tabnew"))
 
 			-- Prompt commands
-			vim.keymap.set({ "n", "i" }, "<leader>Gw", "<Cmd>GpRewrite<cr>", keymapOptions("Inline rewrite"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gr", "<Cmd>GpCodeReview<cr>", keymapOptions("Code review"))
-			vim.keymap.set({ "n", "i" }, "<leader>G]", "<Cmd>GpAppend<cr>", keymapOptions("Append (after)"))
-			vim.keymap.set({ "n", "i" }, "<leader>G[", "<Cmd>GpPrepend<cr>", keymapOptions("Prepend (before)"))
+			vim.keymap.set("n", "<leader>Gw", "<Cmd>GpRewrite<cr>", keymapOptions("Inline rewrite"))
+			vim.keymap.set("n", "<leader>Gr", "<Cmd>GpCodeReview<cr>", keymapOptions("Code review"))
+			vim.keymap.set("n", "<leader>G]", "<Cmd>GpAppend<cr>", keymapOptions("Append (after)"))
+			vim.keymap.set("n", "<leader>G[", "<Cmd>GpPrepend<cr>", keymapOptions("Prepend (before)"))
 
 			vim.keymap.set("v", "<leader>Gw", ":<C-u>'<,'>GpRewrite<cr>", keymapOptions("Rewrite"))
 			vim.keymap.set("v", "<leader>Gr", ":<C-u>'<,'>GpCodeReview<cr>", keymapOptions("Code review"))
@@ -157,11 +157,11 @@ return {
 			vim.keymap.set("v", "<leader>G[", ":<C-u>'<,'>GpPrepend<cr>", keymapOptions("Prepend (before)"))
 			vim.keymap.set("v", "<leader>Gi", ":<C-u>'<,'>GpImplement<cr>", keymapOptions("Implement selection"))
 
-			vim.keymap.set({ "n", "i" }, "<leader>Ggp", "<Cmd>GpPopup<cr>", keymapOptions("Popup"))
-			vim.keymap.set({ "n", "i" }, "<leader>Gge", "<Cmd>GpEnew<cr>", keymapOptions("GpEnew"))
-			vim.keymap.set({ "n", "i" }, "<leader>Ggc", "<Cmd>GpNew<cr>", keymapOptions("GpNew"))
-			vim.keymap.set({ "n", "i" }, "<leader>Ggv", "<Cmd>GpVnew<cr>", keymapOptions("GpVnew"))
-			vim.keymap.set({ "n", "i" }, "<leader>Ggn", "<Cmd>GpTabnew<cr>", keymapOptions("GpTabnew"))
+			vim.keymap.set("n", "<leader>Ggp", "<Cmd>GpPopup<cr>", keymapOptions("Popup"))
+			vim.keymap.set("n", "<leader>Gge", "<Cmd>GpEnew<cr>", keymapOptions("GpEnew"))
+			vim.keymap.set("n", "<leader>Ggc", "<Cmd>GpNew<cr>", keymapOptions("GpNew"))
+			vim.keymap.set("n", "<leader>Ggv", "<Cmd>GpVnew<cr>", keymapOptions("GpVnew"))
+			vim.keymap.set("n", "<leader>Ggn", "<Cmd>GpTabnew<cr>", keymapOptions("GpTabnew"))
 
 			vim.keymap.set("v", "<leader>Ggp", ":<C-u>'<,'>GpPopup<cr>", keymapOptions("Popup"))
 			vim.keymap.set("v", "<leader>Gge", ":<C-u>'<,'>GpEnew<cr>", keymapOptions("GpEnew"))
@@ -169,29 +169,29 @@ return {
 			vim.keymap.set("v", "<leader>Ggv", ":<C-u>'<,'>GpVnew<cr>", keymapOptions("GpVnew"))
 			vim.keymap.set("v", "<leader>Ggn", ":<C-u>'<,'>GpTabnew<cr>", keymapOptions("GpTabnew"))
 
-			vim.keymap.set({ "n", "i" }, "<leader>Gx", "<Cmd>GpContext<cr>", keymapOptions("Toggle context"))
+			vim.keymap.set("n", "<leader>Gx", "<Cmd>GpContext<cr>", keymapOptions("Toggle context"))
 			vim.keymap.set("v", "<leader>Gx", ":<C-u>'<,'>GpContext<cr>", keymapOptions("Toggle context"))
 
-			vim.keymap.set({ "n", "i", "v", "x" }, "<leader>Ggs", "<Cmd>GpStop<cr>", keymapOptions("Stop"))
-			vim.keymap.set({ "n", "i", "v", "x" }, "<leader>Gg]", "<Cmd>GpNextAgent<cr>", keymapOptions("Next agent"))
+			vim.keymap.set({ "n", "v", "x" }, "<leader>Ggs", "<Cmd>GpStop<cr>", keymapOptions("Stop"))
+			vim.keymap.set({ "n", "v", "x" }, "<leader>Gg]", "<Cmd>GpNextAgent<cr>", keymapOptions("Next agent"))
 
 			-- optional Whisper commands with prefix <C-g>w
-			vim.keymap.set({ "n", "i" }, "<leader>GWw", "<Cmd>GpWhisper<cr>", keymapOptions("Whisper"))
+			vim.keymap.set("n", "<leader>GWw", "<Cmd>GpWhisper<cr>", keymapOptions("Whisper"))
 			vim.keymap.set("v", "<leader>GWw", ":<C-u>'<,'>GpWhisper<cr>", keymapOptions("Whisper"))
 
-			vim.keymap.set({ "n", "i" }, "<leader>GWr", "<Cmd>GpWhisperRewrite<cr>", keymapOptions("Inline rewrite"))
-			vim.keymap.set({ "n", "i" }, "<leader>GW]", "<Cmd>GpWhisperAppend<cr>", keymapOptions("Append (after)"))
-			vim.keymap.set({ "n", "i" }, "<leader>GW[", "<Cmd>GpWhisperPrepend<cr>", keymapOptions("Prepend (before) "))
+			vim.keymap.set("n", "<leader>GWr", "<Cmd>GpWhisperRewrite<cr>", keymapOptions("Inline rewrite"))
+			vim.keymap.set("n", "<leader>GW]", "<Cmd>GpWhisperAppend<cr>", keymapOptions("Append (after)"))
+			vim.keymap.set("n", "<leader>GW[", "<Cmd>GpWhisperPrepend<cr>", keymapOptions("Prepend (before) "))
 
 			vim.keymap.set("v", "<leader>GWr", ":<C-u>'<,'>GpWhisperRewrite<cr>", keymapOptions("Rewrite"))
 			vim.keymap.set("v", "<leader>GW]", ":<C-u>'<,'>GpWhisperAppend<cr>", keymapOptions("Append (after)"))
 			vim.keymap.set("v", "<leader>GW[", ":<C-u>'<,'>GpWhisperPrepend<cr>", keymapOptions("Prepend (before)"))
 
-			vim.keymap.set({ "n", "i" }, "<leader>GWp", "<Cmd>GpWhisperPopup<cr>", keymapOptions("Popup"))
-			vim.keymap.set({ "n", "i" }, "<leader>GWe", "<Cmd>GpWhisperEnew<cr>", keymapOptions("Enew"))
-			vim.keymap.set({ "n", "i" }, "<leader>GWc", "<Cmd>GpWhisperNew<cr>", keymapOptions("New"))
-			vim.keymap.set({ "n", "i" }, "<leader>GWv", "<Cmd>GpWhisperVnew<cr>", keymapOptions("Vnew"))
-			vim.keymap.set({ "n", "i" }, "<leader>GWn", "<Cmd>GpWhisperTabnew<cr>", keymapOptions("Tabnew"))
+			vim.keymap.set("n", "<leader>GWp", "<Cmd>GpWhisperPopup<cr>", keymapOptions("Popup"))
+			vim.keymap.set("n", "<leader>GWe", "<Cmd>GpWhisperEnew<cr>", keymapOptions("Enew"))
+			vim.keymap.set("n", "<leader>GWc", "<Cmd>GpWhisperNew<cr>", keymapOptions("New"))
+			vim.keymap.set("n", "<leader>GWv", "<Cmd>GpWhisperVnew<cr>", keymapOptions("Vnew"))
+			vim.keymap.set("n", "<leader>GWn", "<Cmd>GpWhisperTabnew<cr>", keymapOptions("Tabnew"))
 
 			vim.keymap.set("v", "<leader>GWp", ":<C-u>'<,'>GpWhisperPopup<cr>", keymapOptions("Popup"))
 			vim.keymap.set("v", "<leader>GWe", ":<C-u>'<,'>GpWhisperEnew<cr>", keymapOptions("Enew"))
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/harpoon2.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/harpoon2.lua
index c68f385..24aa623 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/harpoon2.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/harpoon2.lua
@@ -51,29 +51,30 @@ return {
 				desc = "Add buffer to harpoon list",
 			},
 			{
-				"<leader>hi",
+				"<leader>ht",
 				function()
 					require("harpoon"):list():prepend()
 				end,
 				desc = "Prepend buffer to harpoon list",
 			},
 			{
-				"<C-q>",
+				"<C-g>",
 				function()
 					local harpoon = require("harpoon")
 					harpoon.ui:toggle_quick_menu(harpoon:list())
 				end,
+				mode = { "n", "i" },
 				desc = "Open harpoon list menu",
 			},
 			{
-				"<C-S-P>",
+				"<C-p>",
 				function()
 					require("harpoon"):list():prev({ ui_nav_wrap = false })
 				end,
 				desc = "Previous harpoon list",
 			},
 			{
-				"<C-S-N>",
+				"<C-n>",
 				function()
 					require("harpoon"):list():next({ ui_nav_wrap = false })
 				end,
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/init.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/init.lua
index 0bcf162..30fce3b 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/init.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/init.lua
@@ -66,6 +66,10 @@ return {
 				},
 			})
 
+			vim.keymap.set("i", "<C-l>", "<cmd>lua require('tmux').move_left()<cr>", { desc = "Move to left" })
+			vim.keymap.set("i", "<C-h>", "<cmd>lua require('tmux').move_right()<cr>", { desc = "Move to right" })
+			vim.keymap.set("i", "<C-j>", "<cmd>lua require('tmux').move_bottom()<cr>", { desc = "Move to bottom" })
+			vim.keymap.set("i", "<C-k>", "<cmd>lua require('tmux').move_top()<cr>", { desc = "Move to top" })
 			vim.keymap.set("n", "<C-left>", function()
 				require("tmux").resize_left()
 			end, { desc = "Decrease window width" })
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/keys.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/keys.lua
index b263414..4af0ecf 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/keys.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/keys.lua
@@ -83,6 +83,11 @@ return {
 					{ "g;", desc = "Last change" },
 					{ "<leader>Q", group = "Quit all" },
 				},
+				{
+					mode = { "i" },
+					{ "<C-o>", desc = "Execute one command" },
+					{ "<C-r>", desc = "Paste from registers" },
+				},
 			})
 		end,
 		keys = {
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/macro.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/macro.lua
index 2af1b49..b69d000 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/macro.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/macro.lua
@@ -16,157 +16,157 @@ return {
 	-- 		vim.keymap.set("n", "<leader>xQ", ":MacroDelete<CR>", { desc = "Delete macro" })
 	-- 	end,
 	-- },
-	-- {
-	-- 	"desdic/macrothis.nvim",
-	-- 	opts = {},
-	-- 	config = function()
-	-- 		require("macrothis").setup({
-	-- 			datafile = (function()
-	-- 				local path = vim.fn.expand("~/.local/share/thesiah/macros.json")
-	--
-	-- 				-- Create directory if it doesn't exist
-	-- 				local dir = vim.fn.fnamemodify(path, ":h")
-	-- 				if vim.fn.isdirectory(dir) == 0 then
-	-- 					vim.fn.mkdir(dir, "p")
-	-- 				end
-	--
-	-- 				-- Create file if it doesn't exist or is empty
-	-- 				if vim.fn.filereadable(path) == 0 or vim.fn.getfsize(path) == 0 then
-	-- 					local file = io.open(path, "w")
-	-- 					if file then
-	-- 						file:write("[]")
-	-- 						file:close()
-	-- 					end
-	-- 				end
-	--
-	-- 				return path
-	-- 			end)(),
-	-- 			run_register = "Q", -- content of register z is replaced when running/editing a macro
-	-- 			editor = { -- Edit window
-	-- 				width = 100,
-	-- 				height = 2,
-	-- 				style = "minimal",
-	-- 				border = "rounded",
-	-- 			},
-	-- 			clipboard_register = '"',
-	-- 			default_register = "q", -- Use this register when loading a macro (will never prompt for register if set)
-	-- 		})
-	-- 		require("telescope").load_extension("macrothis")
-	-- 		vim.keymap.set("n", "<leader>fQ", ":Telescope macrothis<CR>", { desc = "Find macro" })
-	-- 	end,
-	-- 	keys = {
-	-- 		{
-	-- 			"<Leader>dQ",
-	-- 			function()
-	-- 				require("macrothis").delete()
-	-- 			end,
-	-- 			desc = "Delete macro",
-	-- 		},
-	-- 		{
-	-- 			"<Leader>eQ",
-	-- 			function()
-	-- 				require("macrothis").edit()
-	-- 			end,
-	-- 			desc = "Edit macro",
-	-- 		},
-	-- 		{
-	-- 			"<Leader>lQ",
-	-- 			function()
-	-- 				require("macrothis").load()
-	-- 			end,
-	-- 			desc = "Load macro",
-	-- 		},
-	-- 		{
-	-- 			"<Leader>rnQ",
-	-- 			function()
-	-- 				require("macrothis").rename()
-	-- 			end,
-	-- 			desc = "Rename macro",
-	-- 		},
-	-- 		{
-	-- 			"<Leader>rQ",
-	-- 			function()
-	-- 				require("macrothis").quickfix()
-	-- 			end,
-	-- 			desc = "Run macro on all files in quickfix",
-	-- 		},
-	-- 		{
-	-- 			"<Leader>rq",
-	-- 			function()
-	-- 				require("macrothis").run()
-	-- 			end,
-	-- 			desc = "Run macro",
-	-- 		},
-	-- 		{
-	-- 			"<Leader>wQ",
-	-- 			function()
-	-- 				require("macrothis").save()
-	-- 			end,
-	-- 			desc = "Save macro",
-	-- 		},
-	-- 		{
-	-- 			"<Leader>eR",
-	-- 			function()
-	-- 				require("macrothis").register()
-	-- 			end,
-	-- 			desc = "Edit register",
-	-- 		},
-	-- 		{
-	-- 			"yr",
-	-- 			function()
-	-- 				require("macrothis").copy_register_printable()
-	-- 			end,
-	-- 			desc = "Copy register as printable",
-	-- 		},
-	-- 		{
-	-- 			"yq",
-	-- 			function()
-	-- 				require("macrothis").copy_macro_printable()
-	-- 			end,
-	-- 			desc = "Copy macro as printable",
-	-- 		},
-	-- 	},
-	-- },
 	{
-		"ecthelionvi/NeoComposer.nvim",
-		dependencies = { "kkharji/sqlite.lua" },
+		"desdic/macrothis.nvim",
 		opts = {},
 		config = function()
-			require("NeoComposer").setup({
-				notify = true,
-				delay_timer = 150,
-				queue_most_recent = false,
-				window = {
-					width = 80,
-					height = 10,
+			require("macrothis").setup({
+				datafile = (function()
+					local path = vim.fn.expand("~/.local/share/thesiah/macros.json")
+
+					-- Create directory if it doesn't exist
+					local dir = vim.fn.fnamemodify(path, ":h")
+					if vim.fn.isdirectory(dir) == 0 then
+						vim.fn.mkdir(dir, "p")
+					end
+
+					-- Create file if it doesn't exist or is empty
+					if vim.fn.filereadable(path) == 0 or vim.fn.getfsize(path) == 0 then
+						local file = io.open(path, "w")
+						if file then
+							file:write("[]")
+							file:close()
+						end
+					end
+
+					return path
+				end)(),
+				run_register = "Q", -- content of register z is replaced when running/editing a macro
+				editor = { -- Edit window
+					width = 100,
+					height = 2,
+					style = "minimal",
 					border = "rounded",
-					winhl = {
-						Normal = "ComposerNormal",
-					},
-				},
-				colors = {
-					bg = "NONE",
-					fg = "#ff9e64",
-					red = "#ec5f67",
-					blue = "#5fb3b3",
-					green = "#99c794",
-				},
-				keymaps = {
-					play_macro = "Q",
-					yank_macro = "yq",
-					stop_macro = "cq",
-					toggle_record = "q",
-					cycle_next = "<m-n>",
-					cycle_prev = "<m-p>",
-					toggle_macro_menu = "<m-q>",
 				},
+				clipboard_register = '"',
+				default_register = "q", -- Use this register when loading a macro (will never prompt for register if set)
 			})
-
-			require("telescope").load_extension("macros")
-
-			vim.keymap.set("n", "<leader>sm", ":Telescope macros<CR>", { desc = "Search macros" })
-			vim.keymap.set("n", "<leader>em", ":EditMacros<CR>", { desc = "Edit macros" })
-			vim.keymap.set("n", "<leader>xm", ":ClearNeoComposer<CR>", { desc = "Clear macros" })
+			require("telescope").load_extension("macrothis")
+			vim.keymap.set("n", "<leader>fq", ":Telescope macrothis<CR>", { desc = "Find macro" })
 		end,
+		keys = {
+			{
+				"<Leader>dq",
+				function()
+					require("macrothis").delete()
+				end,
+				desc = "Delete macro",
+			},
+			{
+				"<Leader>eq",
+				function()
+					require("macrothis").edit()
+				end,
+				desc = "Edit macro",
+			},
+			{
+				"<Leader>lq",
+				function()
+					require("macrothis").load()
+				end,
+				desc = "Load macro",
+			},
+			{
+				"<Leader>rnq",
+				function()
+					require("macrothis").rename()
+				end,
+				desc = "Rename macro",
+			},
+			{
+				"<Leader>rQ",
+				function()
+					require("macrothis").quickfix()
+				end,
+				desc = "Run macro on all files in quickfix",
+			},
+			{
+				"<Leader>rq",
+				function()
+					require("macrothis").run()
+				end,
+				desc = "Run macro",
+			},
+			{
+				"<Leader>wq",
+				function()
+					require("macrothis").save()
+				end,
+				desc = "Save macro",
+			},
+			{
+				'<Leader>e"',
+				function()
+					require("macrothis").register()
+				end,
+				desc = "Edit register",
+			},
+			{
+				'y"',
+				function()
+					require("macrothis").copy_register_printable()
+				end,
+				desc = "Copy register as printable",
+			},
+			{
+				"yq",
+				function()
+					require("macrothis").copy_macro_printable()
+				end,
+				desc = "Copy macro as printable",
+			},
+		},
 	},
+	-- {
+	-- 	"ecthelionvi/NeoComposer.nvim",
+	-- 	dependencies = { "kkharji/sqlite.lua" },
+	-- 	opts = {},
+	-- 	config = function()
+	-- 		require("NeoComposer").setup({
+	-- 			notify = true,
+	-- 			delay_timer = 150,
+	-- 			queue_most_recent = false,
+	-- 			window = {
+	-- 				width = 80,
+	-- 				height = 10,
+	-- 				border = "rounded",
+	-- 				winhl = {
+	-- 					Normal = "ComposerNormal",
+	-- 				},
+	-- 			},
+	-- 			colors = {
+	-- 				bg = "NONE",
+	-- 				fg = "#ff9e64",
+	-- 				red = "#ec5f67",
+	-- 				blue = "#5fb3b3",
+	-- 				green = "#99c794",
+	-- 			},
+	-- 			keymaps = {
+	-- 				play_macro = "Q",
+	-- 				yank_macro = "yq",
+	-- 				stop_macro = "cq",
+	-- 				toggle_record = "q",
+	-- 				cycle_next = "<m-n>",
+	-- 				cycle_prev = "<m-p>",
+	-- 				toggle_macro_menu = "<m-q>",
+	-- 			},
+	-- 		})
+	--
+	-- 		require("telescope").load_extension("macros")
+	--
+	-- 		vim.keymap.set("n", "<leader>sm", ":Telescope macros<CR>", { desc = "Search macros" })
+	-- 		vim.keymap.set("n", "<leader>em", ":EditMacros<CR>", { desc = "Edit macros" })
+	-- 		vim.keymap.set("n", "<leader>xm", ":ClearNeoComposer<CR>", { desc = "Clear macros" })
+	-- 	end,
+	-- },
 }
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/telescope.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/telescope.lua
index 0ec51f1..956601f 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/telescope.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/telescope.lua
@@ -641,7 +641,7 @@ return {
 			})
 
 			-- find
-			vim.keymap.set({ "i", "n" }, "<C-g>", function()
+			vim.keymap.set({ "i", "n" }, "<C-b>", function()
 				require("telescope.builtin").buffers({
 					sort_mru = true,
 					sort_lastused = true,
@@ -661,6 +661,9 @@ return {
 			vim.keymap.set("n", "<leader>fd", function()
 				require("telescope.builtin").find_files({ cwd = vim.fn.expand("~/.dotfiles") })
 			end, { desc = "Find dotfiles files" })
+			vim.keymap.set({ "n", "i" }, "<C-f>", function()
+				require("telescope.builtin").find_files()
+			end, { desc = "Find files" })
 			vim.keymap.set("n", "<leader>ff", function()
 				require("telescope.builtin").find_files()
 			end, { desc = "Find files" })
@@ -981,7 +984,7 @@ return {
 
 			require("telescope").load_extension("frecency")
 
-			vim.keymap.set("n", "<leader>fq", function()
+			vim.keymap.set("n", "<leader>fr", function()
 				require("telescope").extensions.frecency.frecency({
 					workspace = "CWD",
 				})
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/wiki.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/wiki.lua
index 86fcd52..e856256 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/wiki.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/plugins/wiki.lua
@@ -160,11 +160,11 @@ return {
 				desc = "Insert image link",
 			},
 			{
-				mode = "i",
 				"]]",
 				function()
 					require("telekasten").insert_link()
 				end,
+				mode = "i",
 				desc = "Insert link",
 			},
 		},
diff --git a/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/utils.lua b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/utils.lua
index f50d22f..8b9b85b 100644
--- a/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/utils.lua
+++ b/ar/.config/TheSiahxyz/lua/TheSiahxyz/utils/utils.lua
@@ -30,7 +30,7 @@ function M.insert_file_path()
 	local action_state = require("telescope.actions.state")
 
 	require("telescope.builtin").find_files({
-		cwd = "~/.config", -- Set the directory to search
+		cwd = vim.fn.getcwd(), -- Set the directory to search
 		attach_mappings = function(_, map)
 			map("i", "<CR>", function(prompt_bufnr)
 				local selected_file = action_state.get_selected_entry(prompt_bufnr).path
@@ -64,7 +64,13 @@ vim.api.nvim_set_keymap(
 	"i",
 	"<C-v>",
 	"<Cmd>lua require('TheSiahxyz.utils.utils').insert_file_path()<cr>",
-	{ noremap = true, silent = true }
+	{ noremap = true, silent = true, desc = "Insert file path/name" }
+)
+vim.api.nvim_set_keymap(
+	"n",
+	"<leader>vf",
+	"<Cmd>lua require('TheSiahxyz.utils.utils').insert_file_path()<cr>",
+	{ noremap = true, silent = true, desc = "Insert file path/name" }
 )
 function M.create_floating_scratch(content)
 	-- Get editor dimensions
diff --git a/ar/.config/mimeapps.list b/ar/.config/mimeapps.list
index 0acd48c..25c942f 100644
--- a/ar/.config/mimeapps.list
+++ b/ar/.config/mimeapps.list
@@ -3,18 +3,22 @@
 # xdg-open will use these settings to determine how to open filetypes.
 # These .desktop entries can also be seen and changed in ~/.local/share/applications/
 
-application/pdf=firefox.desktop;
+application/json=librewolf.desktop;firefox.desktop;
+application/pdf=pdf.desktop;
 application/postscript=pdf.desktop;
 application/rss+xml=rss.desktop;
 application/x-bittorrent=torrent.desktop;
+application/x-xpinstall=librewolf.desktop;firefox.desktop;
+application/xhtml+xml=librewolf.desktop;firefox.desktop;
 application/vnd.openxmlformats-officedocument.presentationml.presentation=office.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=csv.desktop;
 application/vnd.openxmlformats-officedocument.wordprocessingml.document=office.desktop;
 inode/directory=file.desktop;
 image/jpeg=img.desktop;
 image/gif=img.desktop;
 image/png=img.desktop;
+image/webp=nsxiv.desktop;
 text/csv=csv.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=csv.desktop;
 text/html=html.desktop;
 text/markdown=slide.desktop;
 text/plain=text.desktop;
@@ -23,7 +27,8 @@ text/x-shellscript=text.desktop;
 text/xml=html.desktop;
 video/mp4=video.desktop;
 video/x-matroska=video.desktop;
+x-scheme-handler/http=librewolf.desktop;firefox.desktop;
+x-scheme-handler/https=librewolf.desktop;firefox.desktop;
 x-scheme-handler/lbry=lbry.desktop;
 x-scheme-handler/mailto=mail.desktop;
 x-scheme-handler/magnet=torrent.desktop;
-image/webp=nsxiv.desktop;
diff --git a/ar/.config/vim/init.vim b/ar/.config/vim/init.vim
index 2ab5237..c39c130 100644
--- a/ar/.config/vim/init.vim
+++ b/ar/.config/vim/init.vim
@@ -63,9 +63,10 @@ endif
 
 " PLUGINS INIT ----------------------------------------------------------- {{{
 
-if filereadable(expand("~/.config/vim/plugins.vim"))
-    silent !mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/vim/plugged/
-    source ${XDG_CONFIG_HOME:-$HOME/.config}/vim/plugins.vim
+let config_path = empty($XDG_CONFIG_HOME) ? expand("$HOME/.config") : expand("$XDG_CONFIG_HOME")
+if filereadable(config_path . "/vim/plugins.vim")
+    silent! call mkdir(config_path . "/vim/plugged", "p")
+    execute "source " . config_path . "/vim/plugins.vim"
 endif
 
 " goyo