working on custom neovim

5 files changed, 21 insertions, 10 deletions

diff --git a/pkgs/custom-neovim/config/init.lua b/pkgs/custom-neovim/config/init.lua
index 6419790..1c1f70f 100644
--- a/pkgs/custom-neovim/config/init.lua
+++ b/pkgs/custom-neovim/config/init.lua
@@ -17,7 +17,7 @@ require("plugins.mini.clue")
 require("plugins.mini.indentscope")
 require("plugins.mini.notify")
 require("plugins.treesitter")
--- require("plugins.oil")
+require("plugins.oil")
 require("plugins.mini.files")
 
 -- LSP Plugins:
diff --git a/pkgs/custom-neovim/config/lua/mappings.lua b/pkgs/custom-neovim/config/lua/mappings.lua
index 9043096..8e166a9 100644
--- a/pkgs/custom-neovim/config/lua/mappings.lua
+++ b/pkgs/custom-neovim/config/lua/mappings.lua
@@ -53,6 +53,8 @@ vim.keymap.set("c", "<cr>", function()
 end, { expr = true }) -- Make enter complete command.
 mapkey("n", "<esc>", "Clear highlights", ":noh<cr>") -- Make esc clear highlights
 mapkey("n", "<leader>q", "Close buffer", ":bd<cr>")
+mapkey("n", "<leader>Q", "Force close buffer", ":bd!<cr>")
+mapkey({"n", "v"}, "<leader>d", "Really delete", [["_d]])
 
 -- Visual Movement Keys.
 -- mapkey({"n", "v"}, "j", "Go down visually", "gj")
diff --git a/pkgs/custom-neovim/config/lua/plugins/lspconfig.lua b/pkgs/custom-neovim/config/lua/plugins/lspconfig.lua
index a18b80d..fbb35bf 100644
--- a/pkgs/custom-neovim/config/lua/plugins/lspconfig.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/lspconfig.lua
@@ -38,9 +38,9 @@ vim.api.nvim_create_autocmd('LspAttach', {
     mapkey("n", "<leader>S", "Open workspace symbol picker", ":lua Snacks.picker.lsp_workspace_symbols()<cr>")
 
     -- LSP Pickers
-    mapkey('n', "<leader>a", "Perform code action", require("actions-preview").code_actions)
-    mapkey("n", "<leader>D", "Open workspace diagnostic picker", ":lua Snacks.picker.diagnostics()<cr>")
-    mapkey("n", "<leader>d", "Open diagnostic picker", [[:lua Snacks.picker.diagnostics_buffer()<cr>]])
+    mapkey('n', "<leader>a", "Perform code action", ":lua require('actions-preview').code_actions()<cr>")
+    mapkey("n", "<leader>I", "Open workspace diagnostic picker", ":lua Snacks.picker.diagnostics()<cr>")
+    mapkey("n", "<leader>i", "Open diagnostic picker", [[:lua Snacks.picker.diagnostics_buffer()<cr>]])
 
     mapkey('n', 'gr', "Buffer References", vim.lsp.buf.references)
     mapkey('n', '<localleader>f', "Format Buffer", function()
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/files.lua b/pkgs/custom-neovim/config/lua/plugins/mini/files.lua
index e64aefa..03a403a 100644
--- a/pkgs/custom-neovim/config/lua/plugins/mini/files.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/mini/files.lua
@@ -1,13 +1,13 @@
 require("mini.files").setup {
   mappings = {
     close       = '<esc>',
-    go_in       = 'l',
-    go_in_plus  = 'L',
-    go_out      = 'h',
-    go_out_plus = 'H',
+    go_in       = 'L',
+    go_in_plus  = '<c-l>',
+    go_out      = 'H',
+    go_out_plus = '<c-h>',
     mark_goto   = "'",
     mark_set    = 'm',
-    reset       = '<BS>',
+    reset       = '<leader>',
     reveal_cwd  = '@',
     show_help   = 'g?',
     synchronize = '=',
diff --git a/pkgs/custom-neovim/config/lua/plugins/snacks.lua b/pkgs/custom-neovim/config/lua/plugins/snacks.lua
index 9410544..d5e2095 100644
--- a/pkgs/custom-neovim/config/lua/plugins/snacks.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/snacks.lua
@@ -1,6 +1,15 @@
 require("snacks").setup {
   bigfile = { enabled = true },
-  picker = { enabled = true },
+  picker = {
+    enabled = true,
+    win = {
+      input = {
+        keys = {
+          ["<Esc>"] = { "close", mode = { "n", "i" } },
+        },
+      },
+    },
+  },
   lazygit = {
     enabled = true,
     config = {