5 files changed, 7 insertions, 10 deletions

diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index 14d813b..f789ceb 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -78,9 +78,9 @@ vnoremap <leader>, :terminal<CR>
 map <leader>pp :setlocal paste!<cr>
 
 " Switch CDW to root git directory
-nnoremap <Leader>cg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR>
+nnoremap cdg :execute 'cd' fnameescape(fnamemodify(finddir('.git', escape(expand('%:p:h'), ' ') . ';'), ':h'))<CR>:pwd<CR>
 " Switch CWD to the directory of the open buffer
-map <leader>cd :cd %:p:h<cr>:pwd<cr>
+nnoremap cd :cd %:p:h<cr>:pwd<cr>
 
 " Move one line up and down
 nnoremap <C-j> ddp
diff --git a/vim/lua/configs/conform.lua b/vim/lua/configs/conform.lua
index 1b6683b..411336e 100644
--- a/vim/lua/configs/conform.lua
+++ b/vim/lua/configs/conform.lua
@@ -5,6 +5,8 @@ local options = {
     html = { "prettier" },
     markdown = { "prettier" },
     sh = {"shfmt"},
+    bash = {"shfmt"},
+    zsh = {"shfmt"},
   },
 
   -- format_on_save = {
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index fd58297..401c0f8 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -24,14 +24,6 @@ end, { desc = "format files" })
 vim.keymap.set("n", "<leader>ds", vim.diagnostic.setloclist, { desc = "lsp diagnostic loclist" })
 
 -- tabufline
-vim.keymap.set("n", "<tab>", function()
-  require("nvchad.tabufline").next()
-end, { desc = "buffer goto next" })
-
-vim.keymap.set("n", "<S-tab>", function()
-  require("nvchad.tabufline").prev()
-end, { desc = "buffer goto prev" })
-
 vim.keymap.set("n", "<leader>x", function()
   require("nvchad.tabufline").close_buffer()
 end, { desc = "buffer close" })
diff --git a/vim/lua/options.lua b/vim/lua/options.lua
index f9e6e7e..c16ae64 100644
--- a/vim/lua/options.lua
+++ b/vim/lua/options.lua
@@ -18,3 +18,5 @@ o.completeopt = 'menuone,noselect'
 
 -- NOTE: You should make sure your terminal supports this
 o.termguicolors = true
+
+o.whichwrap = "b,s"
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua
index 12f74f8..8c49369 100644
--- a/vim/lua/plugins/init.lua
+++ b/vim/lua/plugins/init.lua
@@ -30,6 +30,7 @@ return {
 
   {
     "stevearc/conform.nvim",
+    lazy = false,
     -- event = 'BufWritePre', -- uncomment for format on save
     config = function()
       require "configs.conform"