diff --git a/.bashrc b/.bashrc
index ef0249f..528d9f8 100644
--- a/.bashrc
+++ b/.bashrc
@@ -6,9 +6,6 @@ case $- in
       *) return;;
 esac
 
-# Set shell envvar
-export SHELL=$(which bash)
-
 # don't put duplicate lines or lines starting with space in the history.
 HISTCONTROL=ignoreboth
 
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index c45cbe4..a855b7a 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -37,11 +37,7 @@ require("config.lazy")
 vim.keymap.set("n", "<leader>r", ":source %<CR>", { desc = "Reload Config" })
 vim.keymap.set("n", "<leader>bs", ":vsplit<CR>", { desc = "Vertical Split" })
 vim.keymap.set("n", "<leader>vm", ":lua vim.diagnostic.open_float()<CR>", { desc = "Show Diagnostic Message" })
-
--- Map tab and shift-tab to indent in insert and visual mode
 vim.api.nvim_set_keymap("i", "<S-Tab>", "<C-d>", { noremap = true, silent = true })
-vim.api.nvim_set_keymap("v", "<Tab>" , ">gv", { noremap = true, silent = true })
-vim.api.nvim_set_keymap("v", "<S-Tab>" , "<gv", { noremap = true, silent = true })
 
 -- remap yank to system clipboard
 vim.keymap.set("n", "<leader>y", '"+y', { desc = "Yank to Clipboard" })
@@ -61,6 +57,10 @@ vim.keymap.set("n", "<leader>ft", ":Neotree filesystem toggle left<CR>")
 
 -- Configure Copilot
 --vim.keymap.set("n", "<leader>cp", ":Copilot panel<CR>", { desc = "Open Copilot Panel" })
+vim.keymap.set("n", "<leader>ce", ":Copilot enable<CR>", { desc = "Enable Copilot Completions" })
+vim.keymap.set("n", "<leader>cd", ":Copilot disable<CR>", { desc = "Disable Copilot Completions" })
+vim.keymap.set("n", "<leader>cc", ":CopilotChatToggle<CR>", { desc = "Toggle Copilot Chat" })
+vim.keymap.set("n", "<leader>cx", ":CopilotChatReset<CR>", { desc = "Reset Copilot Chat" })
 
 -- Configure Buffer Navigation
 vim.keymap.set("n", "<A-left>", ":BufferPrevious<CR>", { desc = "Previous Buffer" })
diff --git a/.config/nvim/lua/plugins/llm.lua b/.config/nvim/lua/plugins/llm.lua
index 1a080a1..93641c0 100644
--- a/.config/nvim/lua/plugins/llm.lua
+++ b/.config/nvim/lua/plugins/llm.lua
@@ -2,12 +2,10 @@ return {
 	{
 		"github/copilot.vim",
 		config = function()
-			vim.keymap.set("n", "<leader>ce", ":Copilot enable<CR>", { desc = "Enable Copilot Completions" })
-			vim.keymap.set("n", "<leader>cd", ":Copilot disable<CR>", { desc = "Disable Copilot Completions" })
-			vim.keymap.set("i", "<C-a>", "copilot#Accept()", {
+			vim.keymap.set("i", "<C-a>", 'copilot#Accept()', {
 				expr = true,
 				silent = true,
-				replace_keycodes = false,
+        replace_keycodes = false,
 			})
 			vim.g.copilot_no_tab_map = true
 		end,
@@ -21,8 +19,6 @@ return {
 		},
 		build = "make tiktoken",
 		config = function()
-			vim.keymap.set("n", "<leader>cc", ":CopilotChatToggle<CR>", { desc = "Toggle Copilot Chat" })
-			vim.keymap.set("n", "<leader>cx", ":CopilotChatReset<CR>", { desc = "Reset Copilot Chat" })
 			require("CopilotChat").setup({
 				question_header = "",
 				answer_header = "",
diff --git a/.local/bin/nvim b/.local/bin/nvim
deleted file mode 100755
index eed21cf..0000000
Binary files a/.local/bin/nvim and /dev/null differ
diff --git a/.profile b/.profile
index 16e0ab2..ce12f4d 100644
--- a/.profile
+++ b/.profile
@@ -37,3 +37,8 @@ if [ $(which nvim) ]; then
   export EDITOR=nvim
 fi
 
+# Set zsh as the default shell if available
+if [ $(which zsh) ]; then
+  export SHELL=$(which zsh)
+fi
+