diff --git a/private_dot_config/nvim/lua/config/20_keymaps.lua b/private_dot_config/nvim/lua/config/20_keymaps.lua
index 283eea7..71d3cc4 100644
--- a/private_dot_config/nvim/lua/config/20_keymaps.lua
+++ b/private_dot_config/nvim/lua/config/20_keymaps.lua
@@ -1,21 +1,19 @@
 -- 20_keymaps.lua
+---@diagnostic disable: unused-local, unused-function
+-- stylua: ignore start
 
--- Helpers ====================================================
 local nmap = function(lhs, rhs, desc)
   vim.keymap.set("n", lhs, rhs, { desc = desc })
 end
+
 local nmap_leader = function(lhs, rhs, desc)
   vim.keymap.set("n", "<Leader>" .. lhs, rhs, { desc = desc })
 end
--- Keymaps ====================================================
--- stylua: ignore start
-nmap('[p', '<Cmd>exe "put! " . v:register<CR>',                'put above')
-nmap(']p', '<Cmd>exe "put "  . v:register<Cr>',                'put below')
-nmap_leader('ei', '<Cmd>edit $MYVIMRC<CR>',                    'init.lua')
-nmap_leader('aa', '<Cmd>lua vim.lsp.buf.code_action()<CR>',    'lsp code action')
-nmap_leader('ar', '<Cmd>lua vim.lsp.buf.rename()<CR>',         'lsp rename')
-nmap_leader('fi', '<Cmd>lua vim.lsp.buf.implementation()<CR>', 'lsp find implementation')
-nmap_leader('fr', '<Cmd>lua vim.lsp.buf.references()<CR>',     'lsp find references')
+
+nmap_leader('ca', '<Cmd>lua vim.lsp.buf.code_action()<CR>',    'lsp code action')
+nmap_leader('ci', '<Cmd>lua vim.lsp.buf.implementation()<CR>', 'lsp find implementation')
+nmap_leader('cr', '<Cmd>lua vim.lsp.buf.references()<CR>',     'lsp find references')
+nmap_leader('cR', '<Cmd>lua vim.lsp.buf.rename()<CR>',         'lsp rename')
 
 nmap_leader(';', '<Cmd>vsplit<CR>', 'vsplit')
 nmap_leader('-', '<Cmd>split<CR>', 'hsplit')
diff --git a/private_dot_config/nvim/lua/plugin/01_whichkey.lua b/private_dot_config/nvim/lua/plugin/01_whichkey.lua
index 51fa17f..0b5e0b0 100644
--- a/private_dot_config/nvim/lua/plugin/01_whichkey.lua
+++ b/private_dot_config/nvim/lua/plugin/01_whichkey.lua
@@ -9,9 +9,9 @@ return {
       end,
       spec = {
         { "<leader>f", group = "find" },
-        { "<leader>a", group = "lsp action" },
-        { "<leader>s", group = "snippet" },
-        { "<leader>e", group = "edit config" },
+        { "<leader>a", group = "ai" },
+        { "<leader>c", group = "lsp actions" },
+        { "<leader>s", group = "snippets" },
       },
     },
     keys = {
@@ -20,7 +20,7 @@ return {
         function()
           require("which-key").show({ global = true })
         end,
-        desc = "buffer local keymaps",
+        desc = "show local keymaps",
       },
     },
   },
diff --git a/private_dot_config/nvim/lua/plugin/38_oil.lua b/private_dot_config/nvim/lua/plugin/38_oil.lua
index a6aa792..60c1450 100644
--- a/private_dot_config/nvim/lua/plugin/38_oil.lua
+++ b/private_dot_config/nvim/lua/plugin/38_oil.lua
@@ -2,7 +2,28 @@ return {
   {
     "stevearc/oil.nvim",
     dependencies = { { "nvim-mini/mini.icons" } },
-    opts = {},
+    opts = {
+      use_default_keymaps = false,
+      keymaps = {
+        ["g?"] = { "actions.show_help", mode = "n" },
+        ["<CR>"] = "actions.select",
+        ["<leader><leader>"] = "actions.preview",
+        ["-"] = { "actions.parent", mode = "n" },
+        ["="] = { "actions.open_cwd", mode = "n" },
+        ["+"] = { "actions.cd", mode = "n" },
+        ["<leader>;"] = { "actions.select", opts = { vertical = true } },
+        ["<leader>-"] = { "actions.select", opts = { horizontal = true } },
+        ["<leader>x"] = "actions.open_external",
+        ["g."] = { "actions.toggle_hidden", mode = "n" },
+      },
+      float = {
+        padding = 2,
+        max_width = 0,
+        max_height = 0,
+        border = nil,
+        preview_split = "auto",
+      },
+    },
     lazy = false,
     keys = {
       { "<leader>o", mode = "n", "<Cmd>Oil<CR>", desc = "oil" },
diff --git a/private_dot_config/nvim/lua/plugin/40_ai.lua b/private_dot_config/nvim/lua/plugin/40_ai.lua
index 9574b83..d91e78d 100644
--- a/private_dot_config/nvim/lua/plugin/40_ai.lua
+++ b/private_dot_config/nvim/lua/plugin/40_ai.lua
@@ -32,9 +32,9 @@ return {
     -- stylua: ignore start
     keys = {
       { "<leader>ac", mode = { "n", "v" }, "<cmd>CodeCompanionChat Toggle<cr>", desc = "toggle chat" },
-      { "<leader>ai", mode = { "n", "v" }, "<cmd>CodeCompanionActions<cr>",     desc = "actions picker" },
-      { "<leader>y",  mode = { "v" },      "<cmd>CodeCompanionChat Add<cr>",    desc = "put in chat",  },
-      { "<leader>ap", mode = { "n", "v" }, "<cmd>CodeCompanion<cr>",            desc = "in-line prompt",  },
+      { "<leader>aa", mode = { "n", "v" }, "<cmd>CodeCompanionActions<cr>",     desc = "actions picker" },
+      { "<leader>ap",  mode = { "v" },      "<cmd>CodeCompanionChat Add<cr>",    desc = "put in chat",  },
+      { "<leader>ai", mode = { "n", "v" }, "<cmd>CodeCompanion<cr>",            desc = "in-line prompt",  },
     },
     -- stylua: ignore end
     opts = {