8 files changed, 29 insertions, 8 deletions
diff --git a/pkgs/custom-neovim/config/init.lua b/pkgs/custom-neovim/config/init.lua
index 7fa0669..9ae14b8 100644
--- a/pkgs/custom-neovim/config/init.lua
+++ b/pkgs/custom-neovim/config/init.lua
@@ -12,7 +12,6 @@ require("statusline")
 require("lsp")
 require("completion")
 
--- Require plugin configs.
 -- UI Plugins:
 require("plugins.tabby")
 require("plugins.mini.clue")
@@ -23,6 +22,7 @@ require("plugins.mini.files")
 require("plugins.dropbar")
 require("plugins.auto-session")
 require("plugins.gitsigns")
+require("plugins.namu")
 
 -- LSP Plugins:
 require("plugins.actions-preview")
diff --git a/pkgs/custom-neovim/config/lua/completion.lua b/pkgs/custom-neovim/config/lua/completion.lua
index b690293..ce87340 100644
--- a/pkgs/custom-neovim/config/lua/completion.lua
+++ b/pkgs/custom-neovim/config/lua/completion.lua
@@ -37,8 +37,8 @@ cmp.setup({
     end,
   },
   mapping = {
-    ['<Up>'] = cmp.mapping.select_prev_item(select_opts),
-    ['<Down>'] = cmp.mapping.select_next_item(select_opts),
+    -- ['<Up>'] = cmp.mapping.select_prev_item(select_opts),
+    -- ['<Down>'] = cmp.mapping.select_next_item(select_opts),
 
     ['<C-p>'] = cmp.mapping.select_prev_item(select_opts),
     ['<C-n>'] = cmp.mapping.select_next_item(select_opts),
@@ -47,6 +47,7 @@ cmp.setup({
     ['<C-d>'] = cmp.mapping.scroll_docs(4),
 
     ['<C-e>'] = cmp.mapping.abort(),
+    -- ['<esc>'] = cmp.mapping.abort(),
     ['<C-y>'] = cmp.mapping.confirm({select = true}),
     ['<CR>'] = cmp.mapping.confirm({select = false}),
 
@@ -74,7 +75,7 @@ cmp.setup({
       elseif col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') then
         fallback()
       else
-        cmp.complete()
+        -- cmp.complete()
       end
     end, {'i', 's'}),
 
diff --git a/pkgs/custom-neovim/config/lua/lsp.lua b/pkgs/custom-neovim/config/lua/lsp.lua
index 7511004..a01758c 100644
--- a/pkgs/custom-neovim/config/lua/lsp.lua
+++ b/pkgs/custom-neovim/config/lua/lsp.lua
@@ -28,10 +28,10 @@ vim.api.nvim_create_autocmd('LspAttach', {
 
     -- LSP Pickers
     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", "<leader>s", "Open symbol picker", ":lua Snacks.picker.lsp_symbols()<cr>")
-    mapkey("n", "<leader>S", "Open workspace symbol picker", ":lua Snacks.picker.lsp_workspace_symbols()<cr>")
+    -- mapkey("n", "<leader>I", "Open workspace diagnostic picker", ":Namu diagnostics<cr>")
+    mapkey("n", "<leader>i", "Open diagnostic picker", ":Namu diagnostics<cr>")
+    mapkey("n", "<leader>s", "Open symbol picker", ":Namu symbols<cr>")
+    mapkey("n", "<leader>S", "Open workspace symbol picker", ":Namu workspace<cr>")
 
     -- Goto Keys
     mapkey('n', 'gD', "Go to declaration", vim.lsp.buf.declaration)
diff --git a/pkgs/custom-neovim/config/lua/mappings.lua b/pkgs/custom-neovim/config/lua/mappings.lua
index c6ee242..0bcff87 100644
--- a/pkgs/custom-neovim/config/lua/mappings.lua
+++ b/pkgs/custom-neovim/config/lua/mappings.lua
@@ -17,6 +17,7 @@ mapkey("n", "<leader>p", "Open picker picker", ":lua Snacks.picker.pickers()<cr>
 mapkey("n", "<leader>'", "Open last picker", ":lua Snacks.picker.resume()<cr>")
 mapkey("n", "<leader><leader>", "Open smart picker", ":lua Snacks.picker.smart()<cr>")
 mapkey("n", "<leader>z", "Open zoxide picker", ":lua Snacks.picker.zoxide()<cr>")
+mapkey("n", "<leader>T", "Open treesitter picker", ":Namu treesitter<cr>")
 
 -- Tabs
 mapkey("n", "<leader>t", "Manage tabs", "")
@@ -36,6 +37,12 @@ end)
 -- Windows
 mapkey("n", "<leader>w", "Manage windows", "<C-w>")
 
+-- Fix arrow keys in wincmd
+-- mapkey("n", "<c-w><left>", "Focus left", "lua vim.cmd.wincmd('h')<cr>")
+-- mapkey("n", "<c-w><down>", "Focus down", "lua vim.cmd.wincmd('j')<cr>")
+-- mapkey("n", "<c-w><up>", "Focus up", "lua vim.cmd.wincmd('k')<cr>")
+-- mapkey("n", "<c-w><right>", "Focus right", "lua vim.cmd.wincmd('l')<cr>")
+
 -- Sessions
 mapkey("n", "<leader>m", "Manage sessions", "")
 mapkey("n", "<leader>mm", "Open session picker", ":Autosession search<cr>")
diff --git a/pkgs/custom-neovim/config/lua/plugins/namu.lua b/pkgs/custom-neovim/config/lua/plugins/namu.lua
new file mode 100644
index 0000000..82275b9
--- /dev/null
+++ b/pkgs/custom-neovim/config/lua/plugins/namu.lua
@@ -0,0 +1 @@
+require("namu").setup()
diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix
index 10ec541..67a5e46 100644
--- a/pkgs/custom-neovim/default.nix
+++ b/pkgs/custom-neovim/default.nix
@@ -22,6 +22,7 @@ in
         auto-session
         nvim-ts-autotag
         gitsigns-nvim
+        git-plugins.namu-nvim-git
 
         # Completion
         nvim-cmp
diff --git a/pkgs/custom-neovim/design.md b/pkgs/custom-neovim/design.md
index aa0cfb6..0bc2dcd 100644
--- a/pkgs/custom-neovim/design.md
+++ b/pkgs/custom-neovim/design.md
@@ -21,3 +21,4 @@
 - make lazyvim launch with default shell bash
 - make mini.git run commands from cwd instead of git root
 - make all gaps in statusbar from a component
+- make nix file autoindent work properly (maybe remove smartindent?)
diff --git a/pkgs/custom-neovim/git-plugins.nix b/pkgs/custom-neovim/git-plugins.nix
index 6e26e40..a956923 100644
--- a/pkgs/custom-neovim/git-plugins.nix
+++ b/pkgs/custom-neovim/git-plugins.nix
@@ -17,4 +17,14 @@
       sha256 = "sha256-Zbs+Xd6kGfR+s/f6xhxXBdKJA2N4WqcJDPWVkGaM7S0=";
     };
   }); # go back to regular which-key when this commit is merged: https://github.com/folke/which-key.nvim/pull/974
+  namu-nvim-git = pkgs.vimUtils.buildVimPlugin {
+    name = "namu-nvim";
+    version = "git";
+    src = pkgs.fetchFromGitHub {
+      owner = "bassamsdata";
+      repo = "namu.nvim";
+      tag = "v0.6.0";
+      sha256 = "sha256-ywKb/VVNSa/LtiQaSO2lqff2ujupIcc9P9AJg/p6mKw=";
+    };
+  };
 }