diff --git a/lazy-lock.json b/lazy-lock.json
index cad50032..bfd88918 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -17,6 +17,7 @@
   "nvim-lspconfig": { "branch": "master", "commit": "8c5efd1269160fc2fdf61e3d7176be5015860a8f" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "0422a19d9aa3aad2c7e5cca167e5407b13407a9d" },
+  "oil-git-status.nvim": { "branch": "main", "commit": "4b5cf53842c17a09420919e655a6a559da3112d7" },
   "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
diff --git a/lua/custom/plugins/claude-code.lua b/lua/custom/plugins/claude-code.lua
deleted file mode 100644
index 2d7f2a9c..00000000
--- a/lua/custom/plugins/claude-code.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-return {
-  'greggh/claude-code.nvim',
-  dependencies = {
-    'nvim-lua/plenary.nvim', -- Required for git operations
-  },
-  config = function()
-    require('claude-code').setup {
-      window = {
-        position = 'vertical',
-        split_ratio = 0.35,
-      },
-      refresh = {
-        enable = true, -- Enable file change detection
-        updatetime = 100, -- updatetime when Claude Code is active (milliseconds)
-        timer_interval = 1000, -- How often to check for file changes (milliseconds)
-        show_notifications = true, -- Show notification when files are reloaded
-      },
-    }
-  end,
-}
diff --git a/lua/custom/plugins/oil-git-status.lua b/lua/custom/plugins/oil-git-status.lua
new file mode 100644
index 00000000..9075f8bb
--- /dev/null
+++ b/lua/custom/plugins/oil-git-status.lua
@@ -0,0 +1,9 @@
+return {
+  'refractalize/oil-git-status.nvim',
+
+  dependencies = {
+    'stevearc/oil.nvim',
+  },
+
+  config = true,
+}
diff --git a/lua/custom/plugins/oil.lua b/lua/custom/plugins/oil.lua
index 9a9bd45e..c5a739c5 100644
--- a/lua/custom/plugins/oil.lua
+++ b/lua/custom/plugins/oil.lua
@@ -3,6 +3,9 @@ return {
   ---@module 'oil'
   ---@type oil.SetupOpts
   opts = {
+    win_options = {
+      signcolumn = 'yes:2',
+    },
     default_file_explorer = true,
     view_options = {
       show_hidden = true,
@@ -12,4 +15,3 @@ return {
   dependencies = { { 'echasnovski/mini.icons', opts = {} } },
   lazy = false,
 }
-