From 0f65d87e113c666b4fbdb4a4f43c7d4d969d5141 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 16 Jul 2023 21:16:53 +0100
Subject: [PATCH] Add figet and wilder plugins for improvied ui

Remove noice for neovide compatability
---
 init.lua                      | 12 +++++------
 lua/plugins/fidget.lua        | 16 +++++++++++++++
 lua/plugins/noice.lua         | 34 -------------------------------
 lua/plugins/nvim_navbuddy.lua |  2 +-
 lua/plugins/spectre.lua       |  2 +-
 lua/plugins/wilder.lua        | 38 +++++++++++++++++++++++++++++++++++
 lua/ui/neovide.lua            |  2 --
 7 files changed, 62 insertions(+), 44 deletions(-)
 create mode 100644 lua/plugins/fidget.lua
 delete mode 100644 lua/plugins/noice.lua
 create mode 100644 lua/plugins/wilder.lua

diff --git a/init.lua b/init.lua
index dc86f5d..aa15e43 100644
--- a/init.lua
+++ b/init.lua
@@ -42,7 +42,6 @@ require("lazy").setup {
 }
 
 -- Set vim options
-vim.cmd [[colorscheme tokyonight]]
 vim.opt.shiftwidth = 4
 vim.opt.expandtab = true
 vim.opt.number = true
@@ -52,15 +51,16 @@ vim.opt.list = true
 vim.opt.splitbelow = true
 vim.opt.splitright = true
 vim.opt.foldlevelstart = 99
-
--- Global
 vim.g.loaded_perl_provider = 0
+vim.notify = require "notify"
+require "dressing"
 
 -- Common keymaps
 vim.keymap.set("i", "jk", "<esc>")
 vim.keymap.set("n", "<leader>l", "<cmd>Lazy<CR>")
 
 -- GUI settings
-if vim.g.neovide then
-    require "ui.neovide"
-end
+if vim.g.neovide then require "ui.neovide" end
+
+-- Colorscheme
+vim.cmd [[colorscheme tokyonight]]
diff --git a/lua/plugins/fidget.lua b/lua/plugins/fidget.lua
new file mode 100644
index 0000000..263767f
--- /dev/null
+++ b/lua/plugins/fidget.lua
@@ -0,0 +1,16 @@
+return {
+    "j-hui/fidget.nvim",
+    tag = "legacy",
+    opts = {
+        text = {
+            spinner = "dots",
+            done = "",
+            commenced = "",
+            completed = "",
+        },
+        window = {
+            blend = 20,
+            border = "rounded",
+        },
+    },
+}
diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua
deleted file mode 100644
index fd8825f..0000000
--- a/lua/plugins/noice.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-return {
-    "folke/noice.nvim",
-    cond = not vim.g.neovide,
-    event = { "VeryLazy" },
-    dependencies = {
-        "MunifTanjim/nui.nvim",
-        "rcarriga/nvim-notify",
-        "stevearc/dressing.nvim",
-    },
-    config = true,
-    opts = {
-        presets = {
-            bottom_search = true,
-            command_palette = true,
-            long_message_to_split = true,
-            inc_rename = false,
-            lsp_doc_border = true,
-        },
-        lsp = {
-            override = {
-                ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-                ["vim.lsp.util.stylize_markdown"] = true,
-                ["cmp.entry.get_documentation"] = true,
-            },
-        },
-        views = {
-            mini = {
-                position = { row = -2 },
-                border = { style = "rounded" },
-                win_options = { winblend = 0 },
-            },
-        },
-    },
-}
diff --git a/lua/plugins/nvim_navbuddy.lua b/lua/plugins/nvim_navbuddy.lua
index ee4a862..d2ec9a2 100644
--- a/lua/plugins/nvim_navbuddy.lua
+++ b/lua/plugins/nvim_navbuddy.lua
@@ -13,7 +13,7 @@ return {
     opts = {
         icons = require "ui.navic_icons",
         window = {
-            border = "none",
+            border = "rounded",
             size = "80%",
             sections = {
                 left = { border = "rounded" },
diff --git a/lua/plugins/spectre.lua b/lua/plugins/spectre.lua
index 6ff3e38..d7993bd 100644
--- a/lua/plugins/spectre.lua
+++ b/lua/plugins/spectre.lua
@@ -3,7 +3,7 @@ return {
     cmd = "Spectre",
     dependencies = { "nvim-lua/plenary.nvim" },
     init = function()
-        vim.keymap.set("n", "<leader>S", '<cmd>lua require("spectre").open()<CR>', { desc = "Open Spectre" })
+        vim.keymap.set("n", "<leader>so", '<cmd>lua require("spectre").open()<CR>', { desc = "Open Spectre" })
         vim.keymap.set(
             "n",
             "<leader>sw",
diff --git a/lua/plugins/wilder.lua b/lua/plugins/wilder.lua
new file mode 100644
index 0000000..428d650
--- /dev/null
+++ b/lua/plugins/wilder.lua
@@ -0,0 +1,38 @@
+return {
+    "gelguy/wilder.nvim",
+    config = function()
+        local wilder = require "wilder"
+        wilder.setup { modes = { "/", "?", ":" } }
+        -- Disable Python remote plugin
+        wilder.set_option("use_python_remote_plugin", 0)
+
+        wilder.set_option("pipeline", {
+            wilder.branch(
+                wilder.cmdline_pipeline {
+                    fuzzy = 1,
+                },
+                wilder.vim_search_pipeline()
+            ),
+        })
+
+        wilder.set_option(
+            "renderer",
+            wilder.renderer_mux {
+                [":"] = wilder.popupmenu_renderer {
+                    highlighter = wilder.basic_highlighter(),
+                    left = {
+                        " ",
+                        wilder.popupmenu_devicons(),
+                    },
+                    right = {
+                        " ",
+                        wilder.popupmenu_scrollbar(),
+                    },
+                },
+                ["/"] = wilder.wildmenu_renderer {
+                    highlighter = wilder.basic_highlighter(),
+                },
+            }
+        )
+    end,
+}
diff --git a/lua/ui/neovide.lua b/lua/ui/neovide.lua
index 3a96106..d8e03a9 100644
--- a/lua/ui/neovide.lua
+++ b/lua/ui/neovide.lua
@@ -11,5 +11,3 @@ vim.g.neovide_floating_blur_amount_y = 2.0
 
 vim.g.neovide_hide_mouse_when_typing = false
 vim.g.neovide_remember_window_size = false
-
-vim.notify = require "notify"