diff --git a/.config/nvim/lua/config/general/autocmd.lua b/.config/nvim/lua/config/general/autocmd.lua
index fb4d0c2..56b13b1 100644
--- a/.config/nvim/lua/config/general/autocmd.lua
+++ b/.config/nvim/lua/config/general/autocmd.lua
@@ -14,6 +14,10 @@ local aucmd_dict = {
         {
             command = [[%s/\s\+$//e]],
         },
+        {
+            pattern = "*.go",
+            command = 'GoFormat'
+        }
     },
     BufRead = {
         {
diff --git a/.config/nvim/lua/config/general/options.lua b/.config/nvim/lua/config/general/options.lua
index fea4a34..ff60060 100644
--- a/.config/nvim/lua/config/general/options.lua
+++ b/.config/nvim/lua/config/general/options.lua
@@ -28,3 +28,6 @@ vim.o.smarttab = true
 vim.o.formatoptions = 'tqj'
 
 vim.cmd[[let g:pdv_cfg_autoEndFunction = 0]]
+
+vim.o.splitbelow = true
+vim.o.splitright = true
diff --git a/.config/nvim/lua/config/general/remaps.lua b/.config/nvim/lua/config/general/remaps.lua
index d25d014..bce62c6 100644
--- a/.config/nvim/lua/config/general/remaps.lua
+++ b/.config/nvim/lua/config/general/remaps.lua
@@ -25,7 +25,7 @@ vim.api.nvim_set_keymap('n', '<C-s>', '<cmd>%s//g<Left><Left>', options)
 
 -- Navigating with guides
 vim.api.nvim_set_keymap('n', '<leader><leader>', '<Esc>/<++><Enter>"_c4l', options)
-vim.api.nvim_set_keymap('i', '<leader><leader>', '<Esc>/<++><Enter>"_c4l', options)
+-- vim.api.nvim_set_keymap('i', '<leader><leader>', '<Esc>/<++><Enter>"_c4l', options)
 vim.api.nvim_set_keymap('v', '<leader><leader>', '<Esc>/<++><Enter>"_c4l', options)
 
 -- Spell-check
@@ -45,3 +45,9 @@ vim.api.nvim_set_keymap('n', '<A-7>', '7gt', options)
 vim.api.nvim_set_keymap('n', '<A-8>', '8gt', options)
 vim.api.nvim_set_keymap('n', '<A-9>', '9gt', options)
 
+vim.api.nvim_set_keymap('n', '<leader>gp', '<cmd>Git push<CR>', options)
+vim.api.nvim_set_keymap('n', '<leader>gP', '<cmd>Git pull<CR>', options)
+vim.api.nvim_set_keymap('n', '<leader>ga', '<cmd>Git add .<CR>', options)
+vim.api.nvim_set_keymap('n', '<leader>gA', '<cmd>Git add<CR>', options)
+vim.api.nvim_set_keymap('n', '<leader>gc', '<cmd>Git commit<CR>', options)
+vim.api.nvim_set_keymap('n', '<leader>gC', '<cmd>Git commit -a<CR>', options)
diff --git a/.config/nvim/lua/packer-plugins.lua b/.config/nvim/lua/packer-plugins.lua
index 7008859..4e9e5da 100644
--- a/.config/nvim/lua/packer-plugins.lua
+++ b/.config/nvim/lua/packer-plugins.lua
@@ -58,7 +58,9 @@ return require('packer').startup(function()
         disable = false,
     }
 
-    use 'tpope/vim-fugitive'
+    use {
+        'tpope/vim-fugitive',
+    }
 
     use 'nvim-lua/popup.nvim'
 	use 'nvim-lua/plenary.nvim'
diff --git a/.zshrc b/.zshrc
index 98fef13..36337a1 100644
--- a/.zshrc
+++ b/.zshrc
@@ -5,17 +5,6 @@
 # Setup user specific overrides for this in ~/.zshrc. See zshbuiltins(1)
 # and zshoptions(1) for more details.
 
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/.local/bin" ] ; then
-    PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | tr '\n' ':')"
-fi
-
-#if [ -d "$HOME/.local/share/gem/ruby/3.0.0/bin" ]; then
-#    PATH="$PATH:$HOME/.local/share/gem/ruby/3.0.0/bin"
-#fi
-
-export PATH="$PATH:$HOME/go/bin"
-
 # Correctly display UTF-8 with combining characters.
 if [[ "$(locale LC_CTYPE)" == "UTF-8" ]]; then
     setopt COMBINING_CHARS