diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 8ed62ea..910cccc 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -134,7 +134,6 @@ bind = , I, exec, hyprctl dispatch submap reset; ctl idle
 bind = , K, exec, hyprctl dispatch submap reset; ctl keyboard next
 bind = , M, exec, hyprctl dispatch submap reset; ctl media
 bind = , P, exec, hyprctl dispatch submap reset; ctl power
-bind = , S, exec, hyprctl dispatch submap reset; ctl screenshot
 bind = , T, exec, hyprctl dispatch submap reset; theme
 
 bind = , catchall, submap, reset
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index a516ec8..7897717 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,26 +1,26 @@
 {
   "blink-cmp-env": { "branch": "main", "commit": "99af62c1f9aa46005e8f50ad4ccee581946546ca" },
-  "blink-cmp-git": { "branch": "master", "commit": "e3ad0ffaaa3b3b7e2158cc72cd6dad2d19842c46" },
+  "blink-cmp-git": { "branch": "master", "commit": "10783593af764424018a95e75df6ad5a8b66fe07" },
   "blink-cmp-sshconfig": { "branch": "main", "commit": "91bf9bd80d53d2b6521cffb01da138ef6403d625" },
   "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
   "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" },
-  "fzf-lua": { "branch": "main", "commit": "b2c0603216adb92c6bba81053bc996d7ae95b77a" },
+  "fzf-lua": { "branch": "main", "commit": "9004cbb4c065a32b690e909c49903967b45301eb" },
   "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
   "guard.nvim": { "branch": "main", "commit": "addb8d2f40662b8b62d60dd7d18f503beb2332e7" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
   "live-rename.nvim": { "branch": "main", "commit": "3a3cddf23b89a17992f9ca67afc5858077769462" },
-  "mini.ai": { "branch": "main", "commit": "b0247752cf629ce7c6bd0a1efd82fb58ff60f9d6" },
-  "mini.bufremove": { "branch": "main", "commit": "10857aa39160c127694151828914df3131ba83b6" },
-  "mini.misc": { "branch": "main", "commit": "8d4796cc703173b26ce122a999d28036b16b3190" },
-  "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" },
+  "mini.ai": { "branch": "main", "commit": "4b0a6207341d895b6cfe9bcb1e4d3e8607bfe4f4" },
+  "mini.bufremove": { "branch": "main", "commit": "ee69f823f84508c556127a5882760d9783692023" },
+  "mini.misc": { "branch": "main", "commit": "de8947231c29012271722651aa07f6749c41d1ed" },
+  "mini.pairs": { "branch": "main", "commit": "b7fde3719340946feb75017ef9d75edebdeb0566" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "338409dd8a6ed74767bad3eb5269f1b903ffb3cf" },
-  "nvim-lspconfig": { "branch": "master", "commit": "44acfe887d4056f704ccc4f17513ed41c9e2b2e6" },
+  "nvim-lspconfig": { "branch": "master", "commit": "5a855bcfec7973767a1a472335684bbd71d2fa2b" },
   "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" },
-  "nvim-treesitter": { "branch": "main", "commit": "ecdae44baefeffceade8b0c752d80ececad28e76" },
+  "nvim-treesitter": { "branch": "main", "commit": "dc42c209f3820bdfaae0956f15de29689aa6b451" },
   "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" },
   "nvim-vtsls": { "branch": "main", "commit": "0b5f73c9e50ce95842ea07bb3f05c7d66d87d14a" },
-  "oil.nvim": { "branch": "master", "commit": "f55b25e493a7df76371cfadd0ded5004cb9cd48a" },
+  "oil-git.nvim": { "branch": "main", "commit": "c99db7b1dd8dd500c3ec530dc07000dfbeb6e080" },
   "overseer.nvim": { "branch": "master", "commit": "392093e610333c0aea89bf43de7362e25783eada" },
   "treesj": { "branch": "main", "commit": "186084dee5e9c8eec40f6e39481c723dd567cb05" },
   "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
diff --git a/config/nvim/lua/plugins/fzf.lua b/config/nvim/lua/plugins/fzf.lua
index 44fdd1d..b462a32 100644
--- a/config/nvim/lua/plugins/fzf.lua
+++ b/config/nvim/lua/plugins/fzf.lua
@@ -1,13 +1,16 @@
 return {
     'ibhagwan/fzf-lua',
     config = function(_, opts)
+        local fzf = require('fzf-lua')
+
         local has_devicons = pcall(require, 'nvim-web-devicons')
         opts.files = opts.files or {}
         opts.files.file_icons = has_devicons
         opts.grep = opts.grep or {}
         opts.grep.file_icons = has_devicons
+        opts.grep.rg_opts = fzf.defaults.grep.rg_opts:gsub("%-e$", "--glob='!.git/' -e")
 
-        require('fzf-lua').setup(opts)
+        fzf.setup(opts)
 
         vim.api.nvim_create_autocmd('FileType', {
             pattern = 'fzf',
diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua
index b3f8b80..46e87c4 100644
--- a/config/nvim/lua/plugins/git.lua
+++ b/config/nvim/lua/plugins/git.lua
@@ -225,6 +225,47 @@ return {
             },
         },
     },
+    {
+        'malewicz1337/oil-git.nvim',
+        ft = 'oil',
+        opts = {
+            symbol_position = 'signcolumn',
+            show_file_highlights = false,
+            show_directory_highlights = false,
+            symbols = {
+                file = {
+                    added = '│',
+                    modified = '│',
+                    renamed = '│',
+                    deleted = '＿',
+                    copied = '│',
+                    conflict = '│',
+                    untracked = '│',
+                    ignored = ' ',
+                },
+                directory = {
+                    added = '│',
+                    modified = '│',
+                    renamed = '│',
+                    deleted = '＿',
+                    copied = '│',
+                    conflict = '│',
+                    untracked = '│',
+                    ignored = ' ',
+                },
+            },
+            highlights = {
+                OilGitAdded = { link = 'GitSignsAdd' },
+                OilGitModified = { link = 'GitSignsChange' },
+                OilGitRenamed = { link = 'GitSignsChange' },
+                OilGitDeleted = { link = 'GitSignsDelete' },
+                OilGitCopied = { link = 'GitSignsChange' },
+                OilGitConflict = { link = 'GitSignsDelete' },
+                OilGitUntracked = { link = 'GitSignsAdd' },
+                OilGitIgnored = { link = 'Comment' },
+            },
+        },
+    },
     {
         "lewis6991/gitsigns.nvim",
         event = "VeryLazy",
diff --git a/config/nvim/lua/plugins/nvim.lua b/config/nvim/lua/plugins/nvim.lua
index d0d0e93..02b0427 100644
--- a/config/nvim/lua/plugins/nvim.lua
+++ b/config/nvim/lua/plugins/nvim.lua
@@ -263,6 +263,7 @@ return {
     },
     {
         'stevearc/oil.nvim',
+        dir = '~/dev/oil.nvim',
         config = function(_, opts)
             require('oil').setup(opts)
             local refresh = require("oil.actions").refresh
diff --git a/flake.lock b/flake.lock
index 5fd1b81..ad2f1f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1771452337,
-        "narHash": "sha256-+rhNFXNvS2eRBdnDY5yaX4dUcXTyhU889tFIIQo3/3M=",
+        "lastModified": 1771632278,
+        "narHash": "sha256-yu2llU2/ZT53ZLQUgCUp1XxbmKpHY9BAnee1EjqxCxo=",
         "owner": "ryoppippi",
         "repo": "claude-code-overlay",
-        "rev": "6f2d936ed22d0170220fc570a3350b23b02b40a5",
+        "rev": "3791a1a1729333cafcc03e9e12acac8e142e3d09",
         "type": "github"
       },
       "original": {
@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771471179,
-        "narHash": "sha256-XuP8HPzvt4+m9aKVeL9GdGNlTeyeDn3zEeUuorvrw88=",
+        "lastModified": 1771683283,
+        "narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2dedeb55b2c140d9a123ae931588e8903fe202ef",
+        "rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a",
         "type": "github"
       },
       "original": {
@@ -137,11 +137,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1771437627,
-        "narHash": "sha256-mGav6dRJOzHXQzrVAanJXQeGIG7LZr9fB2s024BBggU=",
+        "lastModified": 1771719171,
+        "narHash": "sha256-ZDE3//9Hg+9X5xXcDJ4k/d6qcOVQ4MrTmvf1zv/omZY=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "b04b9a92e4ca216bf39de96ad1cdc6af343ce472",
+        "rev": "2a71f2e720db962f2522b38704e23e11163e91ae",
         "type": "github"
       },
       "original": {