diff --git a/common/.gitconfig b/common/.gitconfig
deleted file mode 100644
index 4bf3cf4..0000000
--- a/common/.gitconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-[user]
-	email = mike@c2yz.com
-	name = Michael Czyż
-	signingkey = 78D4829A477DAB25
-[commit]
-	gpgsign = true
-[push]
-	default = simple
diff --git a/git/.gitconfig b/git/.gitconfig
index 30c4317..d2a737d 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,8 +1,10 @@
 [user]
-  email = mike@c2yz.com
-  name = Michael Czyż
-  signingkey = 78D4829A477DAB25
+	email = mike@c2yz.com
+	name = Michael Czyż
+	signingkey = 78D4829A477DAB25
 [commit]
-  gpgsign = true
+	gpgsign = true
 [push]
-  default = simple
+	default = simple
+[rerere]
+	enabled = true
diff --git a/nvim/.config/nvim/lua/custom/plugins.lua b/nvim/.config/nvim/lua/custom/plugins.lua
index c6a3011..1b832b3 100644
--- a/nvim/.config/nvim/lua/custom/plugins.lua
+++ b/nvim/.config/nvim/lua/custom/plugins.lua
@@ -3,17 +3,14 @@ local overrides = require("custom.configs.overrides")
 ---@type NvPluginSpec[]
 local plugins = {
 
-  -- Override plugin definition options
-
   {
     "neovim/nvim-lspconfig",
     config = function()
       require "plugins.configs.lspconfig"
       require "custom.configs.lspconfig"
-    end, -- Override to setup mason-lspconfig
+    end,
   },
 
-  -- override plugin configs
   {
     "williamboman/mason.nvim",
     opts = {
@@ -33,14 +30,6 @@ local plugins = {
     opts = overrides.nvimtree,
   },
 
-  {
-    "neovim/nvim-lspconfig",
-    config = function()
-      require "plugins.configs.lspconfig"
-      require "custom.configs.lspconfig"
-    end,
-  },
-
   {
     "rust-lang/rust.vim",
     ft = "rust",
@@ -67,7 +56,12 @@ local plugins = {
       return M
     end,
   },
-  -- Install a plugin
+
+  {
+    "nanotee/zoxide.vim",
+    lazy = false,
+  },
+
   {
     "max397574/better-escape.nvim",
     event = "InsertEnter",
@@ -78,17 +72,10 @@ local plugins = {
 
   {
     "stevearc/conform.nvim",
-    --  for users those who want auto-save conform + lazyloading!
-    -- event = "BufWritePre"
     config = function()
       require "custom.configs.conform"
     end,
   },
-  -- To make a plugin not be loaded
-  -- {
-  --   "NvChad/nvim-colorizer.lua",
-  --   enabled = false
-  -- },
 
   -- All NvChad plugins are lazy-loaded by default
   -- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false`