chore(nvim): Change to lazy.nvim recommended format

2025-12-21 08:43:00 +00:00 · 2025-02-26 03:06:43 +00:00 · 2025-02-26 03:06:43 +00:00 · f10828fdac
commit f10828fdac
parent 19cedd3fdc
23 changed files with 579 additions and 414 deletions
--- a/tools/nvim/lua/plugins/appearance.lua
+++ b/tools/nvim/lua/plugins/appearance.lua
@ -9,13 +9,10 @@ return {
        light = "latte",
        dark = "mocha",
      },
-      styles = {
-        -- keywords = { "underline" },
-      },
      integrations = {
        "lualine",
      },
-    }
+    },
  },

  { "olimorris/onedarkpro.nvim" },
@ -31,30 +28,61 @@ return {
  },
  { -- Highlight yanked text
    "gbprod/yanky.nvim",
-    config = function()
-      require("yanky").setup({
-        highlight = {
-          on_put = true,
-          on_yank = true,
-          timer = 500,
-        },
-      })
-    end,
+    opts = {
+      highlight = {
+        on_put = true,
+        on_yank = true,
+        timer = 500,
+      },
+    },
  },
-  { import = "plugins.mod.alpha-nvim" },  -- Dashboard
-  { import = "plugins.mod.winbar-nvim" }, -- Breadcrumb
-  { import = "plugins.mod.bufferline" },  -- Buffer Top Bar
-  {                                       -- Git Blames, Changes
+  { import = "plugins.mod.alpha-nvim" }, -- Dashboard
+  { -- Breadcrumb
+    "Bekaboo/dropbar.nvim",
+    dependencies = {
+      "nvim-telescope/telescope-fzf-native.nvim",
+      build = "make",
+    },
+    opts = {},
+    keys = {
+      {
+        "<Leader>+",
+        function()
+          require("dropbar.api").pick()
+        end,
+        desc = "Pick symbols in winbar",
+      },
+      {
+        "[;",
+        function()
+          require("dropbar.api").goto_context_start()
+        end,
+        desc = "Go to start of current context",
+      },
+      {
+        "];",
+        function()
+          require("dropbar.api").select_next_context()
+        end,
+        desc = "Select next context",
+      },
+    },
+  },
+  { import = "plugins.mod.bufferline" }, -- Buffer Top Bar
+  { -- Git Blames, Changes
    "lewis6991/gitsigns.nvim",
-    config = function()
-      require("gitsigns").setup({
-        current_line_blame = true,
-      })
-    end,
+    opts = {
+      current_line_blame = true,
+    },
+    keys = {
+      { "b", ":Gitsigns blame<CR>", desc = "Blame file" },
+      { "d", ":Gitsigns diffthis<CR>", desc = "Diff file" },
+      { "B", ":Gitsigns toggle_current_line_blame<CR>", desc = "Toggle line blame" },
+    },
  },
  { -- Highlight and navigate between TODOs
    "folke/todo-comments.nvim",
-    dependencies = { "nvim-lua/plenary.nvim" },
    opts = {},
+    dependencies = { "nvim-lua/plenary.nvim" },
  },
 }
--- a/tools/nvim/lua/plugins/completion.lua
+++ b/tools/nvim/lua/plugins/completion.lua
@ -15,8 +15,9 @@ return {
  },
  {
    "zbirenbaum/copilot-cmp",
-    config = function()
-      require("copilot_cmp").setup()
-    end,
+    opts = {},
+    -- config = function()
+    --   require("copilot_cmp").setup()
+    -- end,
  },
 }
--- a/tools/nvim/lua/plugins/edit.lua
+++ b/tools/nvim/lua/plugins/edit.lua
@ -2,16 +2,15 @@ return {
  {
    "folke/flash.nvim",
    event = "VeryLazy",
-    ---@type Flash.Config
    opts = {},
  -- stylua: ignore
-  keys = {
-    { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
-    { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
-    { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
-    { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-    { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
-  },
+    keys = {
+      { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
+      { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
+      { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
+      { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+      { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
+    },
  },
  {
    "js0ny/vim-visual-multi-colemak-hnei",
@ -21,20 +20,12 @@ return {
    "echasnovski/mini.pairs",
    version = false,
    opts = {},
-    -- config = function()
-    --   require("mini.pairs").setup()
-    -- end,
  },
  {
    "kylechui/nvim-surround",
    version = "*", -- Use for stability; omit to use `main` branch for the latest features
    event = "VeryLazy",
    opts = {},
-    -- config = function()
-    --   require("nvim-surround").setup({
-    --     -- Configuration here, or leave empty to use defaults
-    --   })
-    -- end,
  },
  {
    "MagicDuck/grug-far.nvim",
--- a/tools/nvim/lua/plugins/fileutils.lua
+++ b/tools/nvim/lua/plugins/fileutils.lua
@ -1,51 +1,29 @@
 return {
-  { import = "plugins.mod.auto-session" },
+  {
+    "rmagatti/auto-session",
+    lazy = false,
+
+    opts = {
+      suppressed_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
+    },
+  },
  { import = "plugins.mod.nvim-tree" },
  { import = "plugins.mod.telescope" },
-  { import = "plugins.mod.projects" },
  {
-    "lewis6991/hover.nvim",
+    "ahmedkhalf/project.nvim",
+    opts = {
+      detection_methods = { "lsp", "pattern" },
+      patterns = { ".git", "Makefile", "package.json" },
+      sync_root_with_cwd = true,
+      silent_chdir = true,
+      scope_chdir = "global",
+    },
    config = function()
-      require("hover").setup({
-        init = function()
-          -- Require providers
-          require("hover.providers.lsp")
-          -- require('hover.providers.gh')
-          -- require('hover.providers.gh_user')
-          -- require('hover.providers.jira')
-          -- require('hover.providers.dap')
-          -- require('hover.providers.fold_preview')
-          require("hover.providers.diagnostic")
-          -- require('hover.providers.man')
-          -- require('hover.providers.dictionary')
-        end,
-        preview_opts = {
-          border = "single",
-        },
-        -- Whether the contents of a currently open hover window should be moved
-        -- to a :h preview-window when pressing the hover keymap.
-        preview_window = false,
-        title = true,
-        mouse_providers = {
-          "LSP",
-        },
-        mouse_delay = 1000,
-      })
-
-      -- Setup keymaps
-      vim.keymap.set("n", "gE", require("hover").hover_select, { desc = "hover.nvim (select)" })
-      vim.keymap.set("n", "<C-p>", function()
-        require("hover").hover_switch("previous")
-      end, { desc = "hover.nvim (previous source)" })
-      vim.keymap.set("n", "<C-n>", function()
-        require("hover").hover_switch("next")
-      end, { desc = "hover.nvim (next source)" })
-
-      -- Mouse support
-      vim.keymap.set("n", "<MouseMove>", require("hover").hover_mouse, { desc = "hover.nvim (mouse)" })
-      vim.o.mousemoveevent = true
+      require("telescope").load_extension("projects")
    end,
+    dependencies = { "nvim-telescope/telescope.nvim" },
  },
+  { import = "plugins.mod.hover-nvim" },
  {
    "kdheepak/lazygit.nvim",
    lazy = true,
--- a/tools/nvim/lua/plugins/lsp.lua
+++ b/tools/nvim/lua/plugins/lsp.lua
@ -32,15 +32,10 @@ return {
      { "williamboman/mason.nvim" },
      { "neovim/nvim-lspconfig" },
    },
-    config = function()
-      local mason_lspconfig = require("mason-lspconfig")
-      local servers = require("config.servers").servers
-
-      mason_lspconfig.setup({
-        ensure_installed = servers,
-        automatic_installation = false,
-      })
-    end,
+    opts = {
+      ensure_installed = require("config.servers").servers,
+      automatic_installation = false,
+    },
  },
  { import = "plugins.mod.conform-nvim" },
  { "nvim-treesitter/nvim-treesitter-context" },
@ -82,7 +77,15 @@ return {
    end,
  },
  { import = "plugins.mod.trouble-nvim" },
-  { import = "plugins.mod.nvim-treesitter" },
+  {
+    "nvim-treesitter/nvim-treesitter",
+    run = ":TSUpdate",
+    opts = {
+      ensure_installed = { "markdown", "markdown_inline", "latex", "python" },
+      highlight = { enable = true },
+      indent = { enable = true },
+    },
+  },
  {
    "folke/lazydev.nvim",
    ft = "lua", -- only load on lua files
--- a/tools/nvim/lua/plugins/misc.lua
+++ b/tools/nvim/lua/plugins/misc.lua
@ -1,16 +1,36 @@
 return {
  { "wakatime/vim-wakatime", lazy = false },
-  { "voldikss/vim-floaterm" },
  {
-    "CRAG666/betterTerm.nvim",
-    opts = {
-      position = "bot",
-      size = 15,
-    }
+    "voldikss/vim-floaterm",
+    keys = {
+      { "!", ":FloatermToggle<CR>", desc = "Toggle Terminal" },
+      { "<leader>tt", ":FloatermToggle<CR>", desc = "Toggle Terminal" },
+      { "<leader>fT", ":FloatermNew<CR>", desc = "Spawn a float terminal" },
+    },
+    cmd = {
+      "FloatermToggle",
+      "FloatermNew",
+    },
+  },
+  {
+    "CRAG666/code_runner.nvim",
+    config = true,
+    keys = {
+      { "<leader>cr", ":RunCode<CR>", desc = "Run code" },
+    },
+    dependencies = {
+
+      {
+        "CRAG666/betterTerm.nvim",
+        opts = {
+          position = "bot",
+          size = 15,
+        },
+      },
+    },
  },
-  { "CRAG666/code_runner.nvim",            config = true },
  { import = "plugins.mod.obsidian-nvim" },
  { import = "plugins.mod.which-keys-nvim" },
  { import = "plugins.mod.copilot-lua" },
-  { import = "plugins.mod.avante-nvim" }
+  { import = "plugins.mod.avante-nvim" },
 }
--- a/tools/nvim/lua/plugins/mod/alpha-nvim.lua
+++ b/tools/nvim/lua/plugins/mod/alpha-nvim.lua
@ -2,9 +2,12 @@
 return {
  {
    "goolord/alpha-nvim",
-    dependencies = {
-      -- 'echasnovski/mini.icons',
-      -- 'nvim-lua/plenary.nvim'
+    dependencies = {},
+    keys = {
+      { "<leader>ba", ":Alpha<CR>", desc = "Toggle Alpha Dashboard" },
+    },
+    cmd = {
+      "Alpha",
    },
    config = function()
      local alpha = require("alpha")
--- a/tools/nvim/lua/plugins/mod/auto-session.lua
+++ b/tools/nvim/lua/plugins/mod/auto-session.lua
@ -1,15 +0,0 @@
---@diagnostic disable: undefined-doc-name
-return {
-  {
-    "rmagatti/auto-session",
-    lazy = false,
-
-    ---enables autocomplete for opts
-    ---@module "auto-session"
-    ---@type AutoSession.Config
-    opts = {
-      suppressed_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
-      -- log_level = 'debug',
-    },
-  },
-}
--- a/tools/nvim/lua/plugins/mod/bufferline.lua
+++ b/tools/nvim/lua/plugins/mod/bufferline.lua
@ -2,29 +2,46 @@ return {
  "akinsho/bufferline.nvim",
  dependencies = "nvim-tree/nvim-web-devicons", -- 图标支持
  after = "catppuccin",
-  config = function()
-    require("bufferline").setup({
-      options = {
-        indicator = {
-          icon = "▎", -- this should be omitted if indicator style is not 'icon'
-          style = "icon",
-        },
-        diagnostics = "nvim_lsp",
-        diagnostics_indicator = function(count, level, diagnostics_dict, context)
-          local icon = level:match("error") and " " or " "
-          return " " .. icon .. count
-        end,
-
-        show_buffer_icons = true,
-        numbers = "ordinal", -- 显示 buffer 序号
-        close_command = "bdelete! %d", -- 关闭 buffer 的命令
-        right_mouse_command = "bdelete! %d", -- 右键关闭
-        offsets = {
-          { filetype = "NvimTree", text = "资源管理器", text_align = "center" },
-        },
-        separator_style = "thin",
+  lazy = false,
+  keys = {
+    { "<leader>b1", ":BufferLineGotoBuffer 1<CR>", desc = "Switch to Buffer #1" },
+    { "<leader>b2", ":BufferLineGotoBuffer 2<CR>", desc = "Switch to Buffer #2" },
+    { "<leader>b3", ":BufferLineGotoBuffer 3<CR>", desc = "Switch to Buffer #3" },
+    { "<leader>b4", ":BufferLineGotoBuffer 4<CR>", desc = "Switch to Buffer #4" },
+    { "<leader>b5", ":BufferLineGotoBuffer 5<CR>", desc = "Switch to Buffer #5" },
+    { "<leader>b6", ":BufferLineGotoBuffer 6<CR>", desc = "Switch to Buffer #6" },
+    { "<leader>b7", ":BufferLineGotoBuffer 7<CR>", desc = "Switch to Buffer #7" },
+    { "<leader>b8", ":BufferLineGotoBuffer 8<CR>", desc = "Switch to Buffer #8" },
+    { "<leader>b9", ":BufferLineGotoBuffer 9<CR>", desc = "Switch to Buffer #9" },
+    { "<leader>bb", ":BufferLinePick<CR>", desc = "Quick Switch Buffers" },
+    { "<leader>bD", ":BufferLineCloseOthers<CR>", desc = "Delete Other Buffers" },
+    { "<leader>bxx", ":BufferLineCloseOthers<CR>", desc = "Delete Other Buffers" },
+    { "<leader>bxh", ":BufferLineCloseLeft<CR>", desc = "Delete Buffers Left" },
+    { "<leader>bxi", ":BufferLineCloseRight<CR>", desc = "Delete Buffers Right" },
+    { "<leader>bX", ":BufferLineCloseOthers<CR>", desc = "Delete Other Buffers" },
+    { "<leader>bt", ":BufferLineTogglePin<CR>", desc = "Pin Buffer" },
+  },
+  opts = {
+    options = {
+      indicator = {
+        icon = "▎", -- this should be omitted if indicator style is not 'icon'
+        style = "icon",
      },
-      highlights = require("catppuccin.groups.integrations.bufferline").get(),
-    })
-  end,
+      diagnostics = "nvim_lsp",
+      diagnostics_indicator = function(count, level, diagnostics_dict, context)
+        local icon = level:match("error") and " " or " "
+        return " " .. icon .. count
+      end,
+
+      show_buffer_icons = true,
+      numbers = "ordinal", -- 显示 buffer 序号
+      close_command = "bdelete! %d", -- 关闭 buffer 的命令
+      right_mouse_command = "bdelete! %d", -- 右键关闭
+      offsets = {
+        { filetype = "NvimTree", text = "资源管理器", text_align = "center" },
+      },
+      separator_style = "thin",
+    },
+    highlights = require("catppuccin.groups.integrations.bufferline").get(),
+  },
 }
--- a/tools/nvim/lua/plugins/mod/hover-nvim.lua
+++ b/tools/nvim/lua/plugins/mod/hover-nvim.lua
@ -0,0 +1,58 @@
+return {
+  "lewis6991/hover.nvim",
+  opts = {
+    init = function()
+      -- Require providers
+      require("hover.providers.lsp")
+      -- require('hover.providers.gh')
+      -- require('hover.providers.gh_user')
+      -- require('hover.providers.jira')
+      -- require('hover.providers.dap')
+      -- require('hover.providers.fold_preview')
+      require("hover.providers.diagnostic")
+      -- require('hover.providers.man')
+      -- require('hover.providers.dictionary')
+    end,
+    preview_opts = {
+      border = "single",
+    },
+    -- Whether the contents of a currently open hover window should be moved
+    -- to a :h preview-window when pressing the hover keymap.
+    preview_window = false,
+    title = true,
+    mouse_providers = {
+      "LSP",
+    },
+    mouse_delay = 1000,
+  },
+  keys = {
+    {
+      "gE",
+      function()
+        require("hover").hover_select()
+      end,
+      desc = "hover.nvim (select)",
+    },
+    {
+      "<C-p>",
+      function()
+        require("hover").hover_switch("previous")
+      end,
+      desc = "hover.nvim (previous source)",
+    },
+    {
+      "<C-n>",
+      function()
+        require("hover").hover_switch("next")
+      end,
+      desc = "hover.nvim (next source)",
+    },
+    {
+      "<MouseMove>",
+      function()
+        require("hover").hover_mouse()
+      end,
+      desc = "hover.nvim (mouse)",
+    },
+  },
+}
--- a/tools/nvim/lua/plugins/mod/lspconfig.lua
+++ b/tools/nvim/lua/plugins/mod/lspconfig.lua
@ -1,4 +0,0 @@
-return {
-  "neovim/nvim-lspconfig",
-  lazy = false,
-}
--- a/tools/nvim/lua/plugins/mod/lualine/init.lua
+++ b/tools/nvim/lua/plugins/mod/lualine/init.lua
@ -20,39 +20,8 @@ local config = {
    component_separators = { left = "", right = "" },
    section_separators = { left = "", right = "" },
    theme = "catppuccin",
-    -- theme = {
-    --   -- We are going to use lualine_c an lualine_x as left and
-    --   -- right section. Both are highlighted by c theme .  So we
-    --   -- are just setting default looks o statusline
-    --   -- normal = { c = { fg = colors.mantle, bg = colors.mantle } },
-    --   -- visual = { c = { fg = colors.mantle, bg = colors.mauve } },
-    --   -- normal = { c = { fg = colors.mantle, bg = colors.sapphire } },
-    --   inactive = { c = { fg = colors.mantle, bg = colors.mantle } },
-    --   normal = {
-    --     a = {
-    --       fg = colors.scheme.mantle,
-    --       bg = colors.mode.n,
-    --     },
-    --     b = {
-    --       bg = colors.scheme.surface2,
-    --     },
-    --     c = {
-    --       bg = colors.scheme.crust,
-    --     },
-    --   },
-    --   visual = {
-    --     a = {
-    --       fg = colors.scheme.mantle,
-    --       bg = colors.mode.v,
-    --     },
-    --   },
-    --   insert = {
-    --     a = {
-    --       fg = colors.scheme.mantle,
-    --       bg = colors.mode.i,
-    --     },
-    --   },
-    -- },
+    -- IDE-like Global Status
+    globalstaus = true,
  },
  sections = {
    -- these are to remove the defaults
--- a/tools/nvim/lua/plugins/mod/markview.lua
+++ b/tools/nvim/lua/plugins/mod/markview.lua
@ -1,3 +1,5 @@
+-- This won't be loaded
+-- I keep this since render-markdown sometimes buggy
 return {
  {
    "OXY2DEV/markview.nvim",
@ -6,25 +8,22 @@ return {
      "nvim-treesitter/nvim-treesitter",
      "nvim-tree/nvim-web-devicons",
    },
-    config = function()
-      local presets = require("markview.presets")
-      require("markview").setup({
-        checkboxes = presets.checkboxes.nerd,
-        headings = {
-          enable = true,
-          shift_width = 1,
-          heading_1 = {
-            style = "label",
-            hl = "MarkviewH1",
-          },
+    opts = {
+      checkboxes = require("markview-presets").checkboxes.nerd,
+      headings = {
+        enable = true,
+        shift_width = 1,
+        heading_1 = {
+          style = "label",
+          hl = "MarkviewH1",
        },
-        code_blocks = {
-          style = "language",
-          language_direction = "right",
-          hl = "MarkviewCode",
-          info_hl = "MarkviewCodeInfo",
-        },
-      })
-    end,
+      },
+      code_blocks = {
+        style = "language",
+        language_direction = "right",
+        hl = "MarkviewCode",
+        info_hl = "MarkviewCodeInfo",
+      },
+    },
  },
 }
--- a/tools/nvim/lua/plugins/mod/nvim-tree.lua
+++ b/tools/nvim/lua/plugins/mod/nvim-tree.lua
@ -23,30 +23,31 @@ return {
  "nvim-tree/nvim-tree.lua",
  version = "*",
  lazy = false,
+  keys = {
+    { "<leader>ft", ":NvimTreeToggle", desc = "Toggle File Explorer" },
+  },
  dependencies = {
    "nvim-tree/nvim-web-devicons",
  },
-  config = function()
-    require("nvim-tree").setup({
-      on_attach = my_on_attach,
-      sync_root_with_cwd = true,
-      respect_buf_cwd = true,
-      disable_netrw = true,
-      renderer = {
-        icons = {
-          glyphs = {
-            git = { -- https://github.com/nvim-neo-tree/neo-tree.nvim/blob/main/doc/neo-tree.txt#L1077C1-L1077C29
-              unmerged = "",
-              renamed = "➜",
-              deleted = "",
-              untracked = "",
-              ignored = "",
-              unstaged = "󰄱",
-              staged = "",
-            },
+  opts = {
+    on_attach = my_on_attach,
+    sync_root_with_cwd = true,
+    respect_buf_cwd = true,
+    disable_netrw = true,
+    renderer = {
+      icons = {
+        glyphs = {
+          git = { -- https://github.com/nvim-neo-tree/neo-tree.nvim/blob/main/doc/neo-tree.txt#L1077C1-L1077C29
+            unmerged = "",
+            renamed = "➜",
+            deleted = "",
+            untracked = "",
+            ignored = "",
+            unstaged = "󰄱",
+            staged = "",
          },
        },
      },
-    })
-  end,
+    },
+  },
 }
--- a/tools/nvim/lua/plugins/mod/nvim-treesitter.lua
+++ b/tools/nvim/lua/plugins/mod/nvim-treesitter.lua
@ -1,11 +0,0 @@
-return {
-  "nvim-treesitter/nvim-treesitter",
-  run = ":TSUpdate",
-  config = function()
-    require("nvim-treesitter.configs").setup({
-      ensure_installed = { "markdown", "markdown_inline", "latex", "python" },
-      highlight = { enable = true },
-      indent = { enable = true },
-    })
-  end,
-}
--- a/tools/nvim/lua/plugins/mod/projects.lua
+++ b/tools/nvim/lua/plugins/mod/projects.lua
@ -1,15 +0,0 @@
-return {
-  "ahmedkhalf/project.nvim",
-  config = function()
-    require("project_nvim").setup({
-      detection_methods = { "lsp", "pattern" },
-      patterns = { ".git", "Makefile", "package.json" },
-      sync_root_with_cwd = true,
-      silent_chdir = true,
-      scope_chdir = "global",
-    })
-
-    require("telescope").load_extension("projects")
-  end,
-  dependencies = { "nvim-telescope/telescope.nvim" },
-}
--- a/tools/nvim/lua/plugins/mod/render-markdown.lua
+++ b/tools/nvim/lua/plugins/mod/render-markdown.lua
@ -2,77 +2,73 @@ return {
  {
    "MeanderingProgrammer/render-markdown.nvim",
    lazy = false,
+    ft = { "markdown", "Avante" },
    opts = {
      file_types = { "markdown", "Avante" },
+      render_modes = { "n", "c", "t" },
+      latex = {
+        enabled = true,
+        converter = "latex2text",
+        highlight = "RenderMarkdownMath",
+        top_pad = 0,
+        bottom_pad = 0,
+      },
+      heading = {
+        sign = false,
+        position = "inline",
+        width = "block",
+        left_margin = 0.5,
+        left_pad = 0.2,
+        right_pad = 0.2,
+      },
+      link = {
+        custom = {
+          python = { pattern = "%.py", icon = " " },
+          lua = { pattern = "%.lua", icon = " " },
+          markdown = { pattern = "%.md", icon = " " },
+        },
+      },
+      bullet = {
+        icons = { "󰮯 ", "●", "○", "◆", "◇" },
+      },
+      checkbox = {
+        checked = { scope_highlight = "@markup.strikethrough" },
+        unchecked = { scope_highlight = "@comment.todo" },
+      },
+      code = {
+        position = "right",
+        width = "block",
+        right_pad = 10,
+      },
+      callout = {
+        note = { raw = "[!NOTE]", rendered = "󰋽 Note", highlight = "RenderMarkdownInfo" },
+        tip = { raw = "[!TIP]", rendered = "󰌶 Tip", highlight = "RenderMarkdownSuccess" },
+        important = { raw = "[!IMPORTANT]", rendered = "󰅾 Important", highlight = "RenderMarkdownHint" },
+        warning = { raw = "[!WARNING]", rendered = "󰀪 Warning", highlight = "RenderMarkdownWarn" },
+        caution = { raw = "[!CAUTION]", rendered = "󰳦 Caution", highlight = "RenderMarkdownError" },
+        abstract = { raw = "[!ABSTRACT]", rendered = "󰨸 Abstract", highlight = "RenderMarkdownInfo" },
+        summary = { raw = "[!SUMMARY]", rendered = "󰨸 Summary", highlight = "RenderMarkdownInfo" },
+        tldr = { raw = "[!TLDR]", rendered = "󰨸 Tldr", highlight = "RenderMarkdownInfo" },
+        info = { raw = "[!INFO]", rendered = "󰋽 Info", highlight = "RenderMarkdownInfo" },
+        todo = { raw = "[!TODO]", rendered = "󰗡 Todo", highlight = "RenderMarkdownInfo" },
+        hint = { raw = "[!HINT]", rendered = "󰌶 Hint", highlight = "RenderMarkdownSuccess" },
+        success = { raw = "[!SUCCESS]", rendered = "󰄬 Success", highlight = "RenderMarkdownSuccess" },
+        check = { raw = "[!CHECK]", rendered = "󰄬 Check", highlight = "RenderMarkdownSuccess" },
+        done = { raw = "[!DONE]", rendered = "󰄬 Done", highlight = "RenderMarkdownSuccess" },
+        question = { raw = "[!QUESTION]", rendered = "󰘥 Question", highlight = "RenderMarkdownWarn" },
+        help = { raw = "[!HELP]", rendered = "󰘥 Help", highlight = "RenderMarkdownWarn" },
+        faq = { raw = "[!FAQ]", rendered = "󰘥 Faq", highlight = "RenderMarkdownWarn" },
+        attention = { raw = "[!ATTENTION]", rendered = "󰀪 Attention", highlight = "RenderMarkdownWarn" },
+        failure = { raw = "[!FAILURE]", rendered = "󰅖 Failure", highlight = "RenderMarkdownError" },
+        fail = { raw = "[!FAIL]", rendered = "󰅖 Fail", highlight = "RenderMarkdownError" },
+        missing = { raw = "[!MISSING]", rendered = "󰅖 Missing", highlight = "RenderMarkdownError" },
+        danger = { raw = "[!DANGER]", rendered = "󱐌 Danger", highlight = "RenderMarkdownError" },
+        error = { raw = "[!ERROR]", rendered = "󱐌 Error", highlight = "RenderMarkdownError" },
+        bug = { raw = "[!BUG]", rendered = "󰨰 Bug", highlight = "RenderMarkdownError" },
+        example = { raw = "[!EXAMPLE]", rendered = "󰉹 Example", highlight = "RenderMarkdownHint" },
+        quote = { raw = "[!QUOTE]", rendered = "󱆨 Quote", highlight = "RenderMarkdownQuote" },
+        cite = { raw = "[!CITE]", rendered = "󱆨 Cite", highlight = "RenderMarkdownQuote" },
+      },
    },
-    ft = { "markdown", "Avante" },
-    config = function()
-      require("render-markdown").setup({
-        render_modes = { "n", "c", "t" },
-        latex = {
-          enabled = true,
-          converter = "latex2text",
-          highlight = "RenderMarkdownMath",
-          top_pad = 0,
-          bottom_pad = 0,
-        },
-        heading = {
-          sign = false,
-          position = "inline",
-          width = "block",
-          left_margin = 0.5,
-          left_pad = 0.2,
-          right_pad = 0.2,
-        },
-        link = {
-          custom = {
-            python = { pattern = "%.py", icon = " " },
-            lua = { pattern = "%.lua", icon = " " },
-            markdown = { pattern = "%.md", icon = " " },
-          },
-        },
-        bullet = {
-          icons = { "󰮯 ", "●", "○", "◆", "◇" },
-        },
-        checkbox = {
-          checked = { scope_highlight = "@markup.strikethrough" },
-          unchecked = { scope_highlight = "@comment.todo" },
-        },
-        code = {
-          position = "right",
-          width = "block",
-          right_pad = 10,
-        },
-        callout = {
-          note = { raw = "[!NOTE]", rendered = "󰋽 Note", highlight = "RenderMarkdownInfo" },
-          tip = { raw = "[!TIP]", rendered = "󰌶 Tip", highlight = "RenderMarkdownSuccess" },
-          important = { raw = "[!IMPORTANT]", rendered = "󰅾 Important", highlight = "RenderMarkdownHint" },
-          warning = { raw = "[!WARNING]", rendered = "󰀪 Warning", highlight = "RenderMarkdownWarn" },
-          caution = { raw = "[!CAUTION]", rendered = "󰳦 Caution", highlight = "RenderMarkdownError" },
-          abstract = { raw = "[!ABSTRACT]", rendered = "󰨸 Abstract", highlight = "RenderMarkdownInfo" },
-          summary = { raw = "[!SUMMARY]", rendered = "󰨸 Summary", highlight = "RenderMarkdownInfo" },
-          tldr = { raw = "[!TLDR]", rendered = "󰨸 Tldr", highlight = "RenderMarkdownInfo" },
-          info = { raw = "[!INFO]", rendered = "󰋽 Info", highlight = "RenderMarkdownInfo" },
-          todo = { raw = "[!TODO]", rendered = "󰗡 Todo", highlight = "RenderMarkdownInfo" },
-          hint = { raw = "[!HINT]", rendered = "󰌶 Hint", highlight = "RenderMarkdownSuccess" },
-          success = { raw = "[!SUCCESS]", rendered = "󰄬 Success", highlight = "RenderMarkdownSuccess" },
-          check = { raw = "[!CHECK]", rendered = "󰄬 Check", highlight = "RenderMarkdownSuccess" },
-          done = { raw = "[!DONE]", rendered = "󰄬 Done", highlight = "RenderMarkdownSuccess" },
-          question = { raw = "[!QUESTION]", rendered = "󰘥 Question", highlight = "RenderMarkdownWarn" },
-          help = { raw = "[!HELP]", rendered = "󰘥 Help", highlight = "RenderMarkdownWarn" },
-          faq = { raw = "[!FAQ]", rendered = "󰘥 Faq", highlight = "RenderMarkdownWarn" },
-          attention = { raw = "[!ATTENTION]", rendered = "󰀪 Attention", highlight = "RenderMarkdownWarn" },
-          failure = { raw = "[!FAILURE]", rendered = "󰅖 Failure", highlight = "RenderMarkdownError" },
-          fail = { raw = "[!FAIL]", rendered = "󰅖 Fail", highlight = "RenderMarkdownError" },
-          missing = { raw = "[!MISSING]", rendered = "󰅖 Missing", highlight = "RenderMarkdownError" },
-          danger = { raw = "[!DANGER]", rendered = "󱐌 Danger", highlight = "RenderMarkdownError" },
-          error = { raw = "[!ERROR]", rendered = "󱐌 Error", highlight = "RenderMarkdownError" },
-          bug = { raw = "[!BUG]", rendered = "󰨰 Bug", highlight = "RenderMarkdownError" },
-          example = { raw = "[!EXAMPLE]", rendered = "󰉹 Example", highlight = "RenderMarkdownHint" },
-          quote = { raw = "[!QUOTE]", rendered = "󱆨 Quote", highlight = "RenderMarkdownQuote" },
-          cite = { raw = "[!CITE]", rendered = "󱆨 Cite", highlight = "RenderMarkdownQuote" },
-        },
-      })
-    end,
  },
 }
--- a/tools/nvim/lua/plugins/mod/telescope.lua
+++ b/tools/nvim/lua/plugins/mod/telescope.lua
@ -1,32 +1,49 @@
 return {
  "nvim-telescope/telescope.nvim",
-  config = function()
-    require("telescope").setup({
-      defaults = {
-        prompt_prefix = require("config.icons").telescope,
-        selection_caret = " ",
-        entry_prefix = " ",
-        layout_config = { -- https://github.com/NvChad/NvChad/blob/v2.5/lua/nvchad/configs/telescope.lua
-          horizontal = {
-            prompt_position = "top",
-            preview_width = 0.55,
-          },
-          width = 0.87,
-          height = 0.80,
+  opts = {
+    defaults = {
+      prompt_prefix = require("config.icons").telescope,
+      selection_caret = " ",
+      entry_prefix = " ",
+      layout_config = { -- https://github.com/NvChad/NvChad/blob/v2.5/lua/nvchad/configs/telescope.lua
+        horizontal = {
+          prompt_position = "top",
+          preview_width = 0.55,
        },
-        mappings = {
-          n = {
-            ["n"] = "move_selection_next",
-            ["e"] = "move_selection_previous",
-            ["w"] = "preview_scrolling_up",
-            ["r"] = "preview_scrolling_down",
-            ["a"] = "preview_scrolling_left",
-            ["s"] = "preview_scrolling_right",
-            ["q"] = require("telescope.actions").close,
-          },
+        width = 0.87,
+        height = 0.80,
+      },
+      mappings = {
+        n = {
+          ["n"] = "move_selection_next",
+          ["e"] = "move_selection_previous",
+          ["w"] = "preview_scrolling_up",
+          ["r"] = "preview_scrolling_down",
+          ["a"] = "preview_scrolling_left",
+          ["s"] = "preview_scrolling_right",
+          ["q"] = require("telescope.actions").close,
        },
      },
-    })
-  end,
+    },
+  },
  dependencies = { "nvim-lua/plenary.nvim" },
+  keys = {
+    { "<leader><leader>", ":Telescope find_files<CR>", desc = "Find Files" },
+    { "<leader>/", ":Telescope live_grep<CR>", desc = "Grep Files" },
+    { "<leader>;", ":Telescope<CR>", desc = "Show Telescope Commands" },
+    { "<leader>ui", ":Telescope colorscheme<CR>", desc = "Change colorscheme" },
+    { "<leader>pp", ":Telescope projects<CR>", desc = "List all Projects" },
+    { "<leader>pg", ":Telescope projects<CR>", desc = "List all Git Projects" },
+    { "<leader>ps", ":Telescope session-lens<CR>", desc = "List all sessions" },
+    { "<leader>gs", ":Telescope git_status<CR>", desc = "Git Status" },
+    { "<leader>gt", ":Telescope git_branches<CR>", desc = "Git Branches" },
+    { "<leader>gc", ":Telescope git_commits<CR>", desc = "Show commits" },
+    { "<leader>fb", ":Telescope buffers<CR>", desc = "List Buffers" },
+    { "<leader>ff", ":Telescope fd<CR>", desc = "Find Files" },
+    { "<leader>ce", ":Telescope diagnostics<CR>", desc = "Navigate errors/warnings" },
+    { "<leader>cs", ":Telescope treesitter<CR>", desc = "Search symbols" },
+    { "<leader>cS", ":Telescope grep_string<CR>", desc = "Search current symbol" },
+    { "<leader>bB", ":Telescope buffers<CR>", desc = "List Buffers" },
+    { "<leader>fl", ":Telescope filetypes", desc = "Set Filetype/Lang to ..." },
+  },
 }
--- a/tools/nvim/lua/plugins/mod/winbar-nvim.lua
+++ b/tools/nvim/lua/plugins/mod/winbar-nvim.lua
@ -1,41 +0,0 @@
-return {
-  {
-    "fgheng/winbar.nvim",
-    config = function()
-      require("winbar").setup({
-        enabled = true,
-        show_file_path = true,
-        show_symbols = true,
-        colors = {
-          path = "",
-          file_name = "",
-          symbols = "",
-        },
-        icons = {
-          file_icon_default = "",
-          seperator = ">",
-          editor_state = "●",
-          lock_icon = "",
-        },
-        exclude_filetype = {
-          "help",
-          "startify",
-          "dashboard",
-          "packer",
-          "neogitstatus",
-          "NvimTree",
-          "Trouble",
-          "alpha",
-          "lir",
-          "Outline",
-          "spectre_panel",
-          "toggleterm",
-          "qf",
-          "floaterm",
-          "orgagenda",
-          "grug-far"
-        },
-      })
-    end,
-  },
-}