From d656f0dd8c211283dfc6bd7cc3d527aa92635383 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Sat, 13 Jul 2024 20:13:08 +0200
Subject: [PATCH 1/3] feat(nvim): add wilder as wildmenu replacement

---
 neovim/default.nix |  4 ++++
 neovim/wilder.lua  | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 neovim/wilder.lua

diff --git a/neovim/default.nix b/neovim/default.nix
index a52092c..a5a5048 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -16,6 +16,9 @@
         vim-bbye
         ansible-vim
 
+        # better wildmenu
+        wilder-nvim
+
         # ui
         dressing-nvim
 
@@ -162,6 +165,7 @@
             ${builtins.readFile ./dap.lua }
             ${builtins.readFile ./neorg.lua }
             ${builtins.readFile ./illuminate.lua }
+            ${builtins.readFile ./wilder.lua }
 
             vim.g.gitblame_date_format = "%r"
         EOF
diff --git a/neovim/wilder.lua b/neovim/wilder.lua
new file mode 100644
index 0000000..9a11ef7
--- /dev/null
+++ b/neovim/wilder.lua
@@ -0,0 +1,32 @@
+local wilder = require('wilder')
+
+wilder.setup({ modes = { ':', '/', '?' } })
+
+wilder.set_option('pipeline', {
+  wilder.branch(
+    wilder.python_file_finder_pipeline({
+      file_command = { "rg", "--files" },
+      dir_command = { 'find', '.', '-type', 'd', '-printf', '%P\n' },
+      filters = { 'fuzzy_filter', 'difflib_sorter' },
+    }),
+    wilder.cmdline_pipeline({
+      language = "python",
+      fuzzy = 1,
+    }),
+    wilder.python_search_pipeline({
+      pattern = wilder.python_fuzzy_pattern(),
+      sorter = wilder.python_difflib_sorter(),
+      engine = 're',
+    })
+  )
+})
+
+-- Set renderer
+wilder.set_option('renderer', wilder.popupmenu_renderer({
+  highlighter = wilder.basic_highlighter(),
+  left = { ' ', wilder.popupmenu_devicons() },
+  right = { ' ', wilder.popupmenu_scrollbar() },
+  pumblend = 20,
+  max_height = '15',  -- Adjust the maximum height as needed
+  border = 'rounded', -- Border style can be 'single', 'double', etc.
+}))

From 2741e136577a3f7ed3c66387e1f87fa4a05680b9 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Sat, 13 Jul 2024 20:14:22 +0200
Subject: [PATCH 2/3] feat(nvim): replace delimate with autopairs

---
 neovim/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/neovim/default.nix b/neovim/default.nix
index a5a5048..16d29a8 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -12,9 +12,10 @@
         # theme
         nvim-solarized-lua
 
-        delimitMate
         vim-bbye
         ansible-vim
+        # auto-close brackets, etc
+        nvim-autopairs
 
         # better wildmenu
         wilder-nvim
@@ -168,6 +169,8 @@
             ${builtins.readFile ./wilder.lua }
 
             vim.g.gitblame_date_format = "%r"
+
+            require("nvim-autopairs").setup({})
         EOF
       '';
     };

From d1378a49323d9d37463b9ca8dba843e0ed8646a2 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Sat, 13 Jul 2024 20:15:21 +0200
Subject: [PATCH 3/3] chore(nvim): remove unused plugins

---
 neovim/default.nix | 11 -----------
 neovim/keymaps.lua |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/neovim/default.nix b/neovim/default.nix
index 16d29a8..b0574f5 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -12,8 +12,6 @@
         # theme
         nvim-solarized-lua
 
-        vim-bbye
-        ansible-vim
         # auto-close brackets, etc
         nvim-autopairs
 
@@ -41,11 +39,8 @@
         indent-blankline-nvim
         plenary-nvim
         vim-illuminate
-        registers-nvim
         vim-surround
 
-        editorconfig-nvim
-
         # git
         gitsigns-nvim
         vim-fugitive
@@ -136,12 +131,6 @@
         lua << EOF
             vim.o.guifont = "DejaVu Sans Mono:h10"
 
-            if vim.g.neovide then
-                vim.g.neovide_fullscreen = true
-                vim.g.neovide_cursor_animation_length = 0.01
-                vim.g.neovide_cursor_trail_length = 0.01
-            end
-
             ${builtins.readFile ./keymaps.lua }
             ${builtins.readFile ./options.lua }
             ${builtins.readFile ./commands.lua }
diff --git a/neovim/keymaps.lua b/neovim/keymaps.lua
index 18b7360..2179b03 100644
--- a/neovim/keymaps.lua
+++ b/neovim/keymaps.lua
@@ -60,7 +60,7 @@ vim.api.nvim_create_autocmd("TermOpen", {
 })
 
 -- buffer closing
-nnoremap("gq", ":Bdelete<CR>")
+nnoremap("gq", ":bdelete<CR>")
 
 -- toggle search highlighting
 vim.cmd('nnoremap <expr> * v:hlsearch ? ":nohlsearch<cr>" : "*"')