Massive Updates

config/nvim/lua/plugins/bufferline.lua

@@ -3,6 +3,9 @@ return {
   keys = {
     { "[B", "<cmd>BufferLineMovePrev<cr>", desc = "Move buffer prev" },
     { "]B", "<cmd>BufferLineMoveNext<cr>", desc = "Move buffer next" },
+    { "<leader>.", "<Cmd>BufferLinePick<CR>", desc = "Pick Buffer" },
+    { "<leader>bS", "<Cmd>BufferLineSortByDirectory<CR>", desc = "Sort By Directory" },
+    { "<leader>bs", "<Cmd>BufferLineSortByExtension<CR>", desc = "Sort By Extensions" },
     { "<leader>b1", "<cmd>BufferLineGoToBuffer 1<cr>", desc = "Buffer 1" },
     { "<leader>b2", "<cmd>BufferLineGoToBuffer 2<cr>", desc = "Buffer 2" },
     { "<leader>b3", "<cmd>BufferLineGoToBuffer 3<cr>", desc = "Buffer 3" },

config/nvim/lua/plugins/dashboard.lua

@@ -18,4 +18,7 @@ return {
     opts.config.header = vim.split(logo, "\n")
     return opts
   end,
+  keys = {
+    { "<leader>fd", "<cmd>Dash<cr>", desc = "Dashboard" },
+  },
 }

config/nvim/lua/plugins/extras/coding/ai/codeium.lua

@@ -5,7 +5,12 @@ return {
     config = function()
       local opts = { expr = true, silent = true }
 
-      vim.g.codeium_filetypes = { TelescopePrompt = false, DressingInput = false }
+      vim.g.codeium_filetypes = {
+        TelescopePrompt = false,
+        DressingInput = false,
+        ["neo-tree-popup"] = false,
+        ["dap-repl"] = false,
+      }
 
       vim.g.codeium_disable_bindings = 1
 

config/nvim/lua/plugins/extras/coding/annotation.lua

@@ -8,7 +8,7 @@ return {
     -- stylua: ignore
     keys = {
       { "<leader>ad", function() require("neogen").generate() end, desc = "Default Annotation" },
-      { "<leader>ac", function() require("neogen").generate({ type = "class" }) end, desc = "Class" },
+      { "<leader>aC", function() require("neogen").generate({ type = "class" }) end, desc = "Class" },
       { "<leader>af", function() require("neogen").generate({ type = "func" }) end, desc = "Function" },
       { "<leader>at", function() require("neogen").generate({ type = "type" }) end, desc = "Type" },
       { "<leader>aF", function() require("neogen").generate({ type = "file" }) end, desc = "File" },
@@ -18,7 +18,7 @@ return {
     "folke/which-key.nvim",
     opts = {
       defaults = {
-        ["<leader>a"] = { name = " annotation" },
+        ["<leader>a"] = { name = " annotation/snippets" },
       },
     },
   },

config/nvim/lua/plugins/extras/coding/cmp/dotenv.lua

@@ -0,0 +1,9 @@
+return {
+  "hrsh7th/nvim-cmp",
+  dependencies = {
+    "SergioRibera/cmp-dotenv",
+  },
+  opts = function(_, opts)
+    table.insert(opts.sources, { name = "dotenv" })
+  end,
+}

config/nvim/lua/plugins/extras/coding/snippets.lua

@@ -0,0 +1,24 @@
+return {
+  {
+    "chrisgrieser/nvim-scissors",
+    dependencies = {
+      "rcarriga/nvim-notify",
+    },
+    opts = {
+      jsonFormatter = "jq",
+    },
+    -- stylua: ignore
+    keys = {
+      { "<leader>aS", function() require("scissors").editSnippet() end, desc = "Edit Snippets" },
+      { "<leader>as", function() require("scissors").addNewSnippet() end, desc = "Add Snippets" },
+    },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>a"] = { name = " annotation/snippets" },
+      },
+    },
+  },
+}

config/nvim/lua/plugins/extras/editor/fold.lua

@@ -1,48 +1,4 @@
 return {
-  {
-    "lewis6991/gitsigns.nvim",
-    opts = {
-      signs = {
-        add = { text = "┃" },
-        change = { text = "┃" },
-        delete = { text = "󱈸" },
-        topdelete = { text = "󱈸" },
-        changedelete = { text = "┃" },
-        untracked = { text = "┇" },
-      },
-      signcolumn = true,
-      numhl = true,
-    },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    init = function()
-      local keys = require("lazyvim.plugins.lsp.keymaps").get()
-      keys[#keys + 1] = { "K", false }
-    end,
-  },
-  { -- better statuscolumn
-    "luukvbaal/statuscol.nvim",
-    event = { "LazyFile" },
-    opts = function()
-      local builtin = require("statuscol.builtin")
-      return {
-        ft_ignore = { "neo-tree", "neo-tree-popup", "alpha", "lazy", "mason" },
-        segments = {
-          { text = { builtin.lnumfunc }, click = "v:lua.ScLa" },
-          {
-            sign = { name = { "Diagnostic*" }, text = { ".*" }, maxwidth = 1, colwidth = 1, auto = true },
-            click = "v:lua.ScSa",
-          },
-          { text = { builtin.foldfunc, " " }, click = "v:lua.ScFa" },
-        },
-      }
-    end,
-    init = function() end,
-    config = function(_, opts)
-      require("statuscol").setup(opts)
-    end,
-  },
   { -- better fold
     "kevinhwang91/nvim-ufo",
     event = { "LazyFile" },
@@ -103,13 +59,11 @@ return {
     end,
     config = function(_, opts)
       require("ufo").setup(opts)
-
-      local map = require("lazyvim.util").safe_keymap_set
-      map("n", "K", function()
-        if not require("ufo").peekFoldedLinesUnderCursor() then
-          vim.lsp.buf.hover()
-        end
-      end, { desc = "Peek folded lines under cursor or hover" })
     end,
   },
+  {
+    "chrisgrieser/nvim-origami",
+    event = { "LazyFile" },
+    opts = {},
+  },
 }

config/nvim/lua/plugins/extras/editor/harpoon.lua

@@ -2,7 +2,9 @@ return {
   {
     "ThePrimeagen/harpoon",
     branch = "harpoon2",
-    dependencies = { "nvim-lua/plenary.nvim" },
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+    },
     --stylua: ignore
     keys = {
       { "<leader>ha", function() require("harpoon"):list():append() end, desc = "Add Mark" },

config/nvim/lua/plugins/extras/editor/oil.lua

@@ -9,6 +9,6 @@ return {
   },
   -- stylua: ignore
   keys = {
-    { "<leader>;", function() require("oil").toggle_float() end, desc = "Toggle oil" },
+    { "<leader><bs>", function() require("oil").toggle_float() end, desc = "Toggle oil" },
   },
 }

config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua

@@ -4,29 +4,29 @@ return {
     cmd = { "FloatermNew", "FloatermToggle", "FloatermNext", "FloatermPrev", "FloatermLast", "FloatermFirst" },
     --stylua: ignore
     keys = {
-  { "<leader>Ts", "<cmd>FloatermNew --disposable --name=duaroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> dua i<CR>", desc = "Workspace Size (root dir)" },
-  { "<leader>TS", "<cmd>FloatermNew --disposable --name=duabuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer> dua i<CR>", desc = "Workspace Size (cwd)" },
-  { "<A-e>", "<cmd>FloatermNew --disposable --name=yaziroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> yazi<CR>", desc = "File Explorer (root dir)" },
-  { "<leader>gg", "<cmd>FloatermNew --disposable --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> lazygit<CR>", desc = "Lazygit (root dir)" },
-  { "<leader>gG", "<cmd>FloatermNew --disposable --name=lazygitbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer> lazygit<CR>", desc = "Lazygit (cwd)" },
-  { "<leader>Td", "<cmd>FloatermNew --disposable --name=lazydocker --opener=edit --titleposition=center --height=0.85 --width=0.85 lazydocker<CR>", desc = "Lazydocker" },
-  { "<leader>Tb", "<cmd>FloatermNew --disposable --name=btop --opener=edit --titleposition=center --height=0.85 --width=0.85 btop<CR>", desc = "Btop" },
-  { "<leader>Tn", "<cmd>FloatermNew --disposable --name=navi --opener=edit --titleposition=center --height=0.85 --width=0.85 pages<CR>", desc = "Navi Pages" },
-  { "<leader>Tp", "<cmd>FloatermNew --disposable --name=proc --opener=edit --titleposition=center --height=0.85 --width=0.85 proc<CR>", desc = "Systemd Processes" },
-  { "<leader>TB", "<cmd>FloatermNew --disposable --name=bandwhich --opener=edit --titleposition=center --height=0.85 --width=0.85 bandwhich<CR>", desc = "Bandwidth" },
-  { "<leader>gF", "<cmd>FloatermNew --disposable --name=forgit --opener=edit --titleposition=center --height=0.85 --width=0.85 fgit<CR>", desc = "Forgit" },
-  { "<leader>gf", "<cmd>FloatermNew! --disposable --name=onefetch --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> gfetch<CR>", desc = "Gitfetch" },
-  { "<leader>cen", "<cmd>FloatermNew --name=node --opener=edit --titleposition=center --wintype=split --height=0.35 node<CR>", desc = "Node" },
-  { "<leader>cep", "<cmd>FloatermNew --name=python --opener=edit --titleposition=center --wintype=split --height=0.35 python<CR>", desc = "Python" },
+      { "<leader>Ts", "<cmd>FloatermNew --disposable --name=duaroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> dua i<CR>", desc = "Workspace Size (root dir)" },
+      { "<leader>TS", "<cmd>FloatermNew --disposable --name=duabuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer> dua i<CR>", desc = "Workspace Size (cwd)" },
+      { "<A-e>", "<cmd>FloatermNew --disposable --name=yaziroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> yazi<CR>", desc = "File Explorer (root dir)" },
+      { "<leader>gg", "<cmd>FloatermNew --disposable --name=lazygitroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> lazygit<CR>", desc = "Lazygit (root dir)" },
+      { "<leader>gG", "<cmd>FloatermNew --disposable --name=lazygitbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer> lazygit<CR>", desc = "Lazygit (cwd)" },
+      { "<leader>Td", "<cmd>FloatermNew --disposable --name=lazydocker --opener=edit --titleposition=center --height=0.85 --width=0.85 lazydocker<CR>", desc = "Lazydocker" },
+      { "<leader>Tb", "<cmd>FloatermNew --disposable --name=btop --opener=edit --titleposition=center --height=0.85 --width=0.85 btop<CR>", desc = "Btop" },
+      { "<leader>Tn", "<cmd>FloatermNew --disposable --name=navi --opener=edit --titleposition=center --height=0.85 --width=0.85 pages<CR>", desc = "Navi Pages" },
+      { "<leader>Tp", "<cmd>FloatermNew --disposable --name=proc --opener=edit --titleposition=center --height=0.85 --width=0.85 proc<CR>", desc = "Systemd Processes" },
+      { "<leader>TB", "<cmd>FloatermNew --disposable --name=bandwhich --opener=edit --titleposition=center --height=0.85 --width=0.85 bandwhich<CR>", desc = "Bandwidth" },
+      { "<leader>gF", "<cmd>FloatermNew --disposable --name=forgit --opener=edit --titleposition=center --height=0.85 --width=0.85 fgit<CR>", desc = "Forgit" },
+      { "<leader>gf", "<cmd>FloatermNew! --disposable --name=onefetch --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root> gfetch<CR>", desc = "Gitfetch" },
+      { "<leader>cen", "<cmd>FloatermNew --name=node --opener=edit --titleposition=center --wintype=split --height=0.35 node<CR>", desc = "Node" },
+      { "<leader>cep", "<cmd>FloatermNew --name=python --opener=edit --titleposition=center --wintype=split --height=0.35 python<CR>", desc = "Python" },
       { "<S-Right>", "<Esc><Esc><cmd>FloatermNext<CR>", mode = { "t" }, desc = "Next Terminal" },
       { "<S-Left>", "<Esc><Esc><cmd>FloatermPrev<CR>", mode = { "t" }, desc = "Prev Terminal" },
       { "<A-Right>", "<Esc><Esc><cmd>FloatermLast<CR>", mode = { "t" }, desc = "Last Terminal" },
       { "<A-Left>", "<Esc><Esc><cmd>FloatermFirst<CR>", mode = { "t" }, desc = "First Terminal" },
       { [[<c-\>]], "<cmd>FloatermToggle<cr>", mode = { "n", "t" }, desc = "Toggle Terminal" },
-  { "<leader>ftf", "<cmd>FloatermNew --name=floatroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root><cr>", desc = "Floating (root dir)" },
-  { "<leader>ftF", "<cmd>FloatermNew --name=floatbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer><cr>", desc = "Floating (cwd)" },
-  { "<leader>fts", "<cmd>FloatermNew --name=splitroot --opener=edit --titleposition=center --height=0.35 --wintype=split --cwd=<root><cr>", desc = "Split (root dir)" },
-  { "<leader>ftS", "<cmd>FloatermNew --name=splitbuffer --opener=edit --titleposition=center --height=0.35 --wintype=split --cwd=<buffer><cr>", desc = "Split (cwd)" },
+      { "<leader>ftf", "<cmd>FloatermNew --name=floatroot --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<root><cr>", desc = "Floating (root dir)" },
+      { "<leader>ftF", "<cmd>FloatermNew --name=floatbuffer --opener=edit --titleposition=center --height=0.85 --width=0.85 --cwd=<buffer><cr>", desc = "Floating (cwd)" },
+      { "<leader>fts", "<cmd>FloatermNew --name=splitroot --opener=edit --titleposition=center --height=0.35 --wintype=split --cwd=<root><cr>", desc = "Split (root dir)" },
+      { "<leader>ftS", "<cmd>FloatermNew --name=splitbuffer --opener=edit --titleposition=center --height=0.35 --wintype=split --cwd=<buffer><cr>", desc = "Split (cwd)" },
     },
   },
   {
@@ -37,7 +37,7 @@ return {
       end)
     end,
     keys = {
-      { "<c-/>", "<cmd>Telescope floaterm<cr>", desc = "Terminals" },
+      { [[<A-\>]], "<cmd>Telescope floaterm<cr>", desc = "Terminals" },
     },
   },
   {

config/nvim/lua/plugins/extras/formatting/rustfmt.lua

@@ -1,10 +1,8 @@
 return {
-  {
-    "stevearc/conform.nvim",
-    opts = function(_, opts)
-      opts.formatters_by_ft.rust = opts.formatters_by_ft.rust or {}
-      table.insert(opts.formatters_by_ft.rust, "rustfmt")
-      return opts
-    end,
-  },
+  "stevearc/conform.nvim",
+  opts = function(_, opts)
+    opts.formatters_by_ft.rust = opts.formatters_by_ft.rust or {}
+    table.insert(opts.formatters_by_ft.rust, "rustfmt")
+    return opts
+  end,
 }

config/nvim/lua/plugins/extras/formatting/trim_newlines.lua

@@ -0,0 +1,8 @@
+return {
+  "stevearc/conform.nvim",
+  opts = function(_, opts)
+    opts.formatters_by_ft["_"] = opts.formatters_by_ft["_"] or {}
+    table.insert(opts.formatters_by_ft["_"], "trim_newlines")
+    return opts
+  end,
+}

config/nvim/lua/plugins/extras/formatting/trim_whitespace.lua

@@ -0,0 +1,8 @@
+return {
+  "stevearc/conform.nvim",
+  opts = function(_, opts)
+    opts.formatters_by_ft["_"] = opts.formatters_by_ft["_"] or {}
+    table.insert(opts.formatters_by_ft["_"], "trim_whitespace")
+    return opts
+  end,
+}

config/nvim/lua/plugins/extras/lang/go-extended.lua

@@ -8,7 +8,7 @@ return {
       "nvim-treesitter/nvim-treesitter",
     },
     opts = {},
-    event = { "CmdlineEnter" },
+    event = { "LazyFile" },
     ft = { "go", "gomod" },
     build = ':lua require("go.install").update_all_sync()',
   },

config/nvim/lua/plugins/extras/lang/rust-extended.lua

@@ -62,6 +62,14 @@ return {
       },
     },
   },
+  {
+    "stevearc/conform.nvim",
+    opts = function(_, opts)
+      opts.formatters_by_ft.toml = opts.formatters_by_ft.toml or {}
+      table.insert(opts.formatters_by_ft.toml, "taplo")
+      return opts
+    end,
+  },
   {
     "luckasRanarison/nvim-devdocs",
     optional = true,

config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua

@@ -1,6 +1,65 @@
+local inlayHints = {
+  includeInlayParameterNameHints = "all",
+  includeInlayParameterNameHintsWhenArgumentMatchesName = true,
+  includeInlayFunctionParameterTypeHints = true,
+  includeInlayVariableTypeHints = true,
+  includeInlayVariableTypeHintsWhenTypeMatchesName = true,
+  includeInlayPropertyDeclarationTypeHints = true,
+  includeInlayFunctionLikeReturnTypeHints = true,
+  includeInlayEnumMemberValueHints = true,
+}
+
+local function denoConfigExists()
+  local root = require("lazyvim.util.root").get() .. "/deno.json"
+
+  if vim.fn.filereadable(root) == 1 then
+    return true
+  end
+
+  return false
+end
+
 return {
   { import = "lazyvim.plugins.extras.lang.typescript" },
   { import = "lazyvim.plugins.extras.lang.json" },
+  {
+    "williamboman/mason.nvim",
+    opts = function(_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      vim.list_extend(opts.ensure_installed, { "deno" })
+    end,
+  },
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        tsserver = {
+          init_options = {
+            preferences = {
+              disableSuggestions = true,
+            },
+          },
+          settings = {
+            typescript = {
+              inlayHints = inlayHints,
+            },
+            javascript = {
+              inlayHints = inlayHints,
+            },
+          },
+        },
+        denols = {
+          root_dir = require("lspconfig").util.root_pattern("deno.json", "deno.jsonc", "deno.lock"),
+        },
+      },
+      setup = {
+        tsserver = function(_, opts)
+          -- Disable tsserver if denols is present
+          return denoConfigExists()
+        end,
+      },
+    },
+  },
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)
@@ -25,64 +84,6 @@ return {
       "typescriptreact",
     },
   },
-  {
-    -- TODO: Need to look more into this plugin
-    "pmizio/typescript-tools.nvim",
-    enabled = false,
-    event = {
-      "BufRead *.js,*.jsx,*.mjs,*.cjs,*ts,*tsx",
-      "BufNewFile *.js,*.jsx,*.mjs,*.cjs,*ts,*tsx",
-    },
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      "neovim/nvim-lspconfig",
-    },
-    opts = {
-      on_attach = function(client, bufnr)
-        client.server_capabilities.documentFormattingProvider = false
-        client.server_capabilities.documentRangeFormattingProvider = false
-
-        vim.keymap.set(
-          "n",
-          "gD",
-          "<Cmd>TSToolsGoToSourceDefinition<CR>",
-          { buffer = bufnr, desc = "Source Definition" }
-        )
-
-        vim.keymap.set(
-          "n",
-          "<localleader>i",
-          "<Cmd>TSToolsAddMissingImports<CR>",
-          { buffer = bufnr, desc = "Add missing imports" }
-        )
-        vim.keymap.set(
-          "n",
-          "<localleader>o",
-          "<Cmd>TSToolsOrganizeImports<CR>",
-          { buffer = bufnr, desc = "Organize imports" }
-        )
-        vim.keymap.set(
-          "n",
-          "<localleader>r",
-          "<Cmd>TSToolsRemoveUnused<CR>",
-          { buffer = bufnr, desc = "Remove unused variables" }
-        )
-        vim.keymap.set("n", "<localleader>f", "<Cmd>TSToolsFixAll<CR>", { buffer = bufnr, desc = "Fix all" })
-      end,
-      settings = {
-        tsserver_file_preferences = {
-          includeInlayParameterNameHints = "all",
-          includeInlayParameterNameHintsWhenArgumentMatchesName = false,
-          includeInlayFunctionParameterTypeHints = true,
-          includeInlayVariableTypeHints = true,
-          includeInlayPropertyDeclarationTypeHints = true,
-          includeInlayFunctionLikeReturnTypeHints = true,
-          includeInlayEnumMemberValueHints = true,
-        },
-      },
-      code_lens = "all",
-    },
-  },
   {
     "nvim-neotest/neotest",
     optional = true,

config/nvim/lua/plugins/extras/linting/biome.lua

@@ -1,17 +0,0 @@
-return {
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "biome" })
-    end,
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        biome = {},
-      },
-    },
-  },
-}

config/nvim/lua/plugins/extras/linting/cspell.lua

@@ -0,0 +1,30 @@
+return {
+  {
+    "williamboman/mason.nvim",
+    opts = function(_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      vim.list_extend(opts.ensure_installed, { "cspell" })
+    end,
+  },
+  {
+    "mfussenegger/nvim-lint",
+    opts = function(_, opts)
+      opts.linters_by_ft["*"] = opts.linters_by_ft["*"] or {}
+      table.insert(opts.linters_by_ft["*"], "cspell")
+
+      opts.linters.cspell = {
+        condition = function(ctx)
+          if vim.fs.find({ "cspell.json" }, { path = ctx.filename, upward = true })[1] then
+              -- stylua: ignore
+              vim.keymap.set("n", "<leader>!", function() require("util.cspell").addWordToDictionary() end, { desc = "Add Word to Dictionary", silent = true })
+            return true
+          else
+            return false
+          end
+        end,
+      }
+
+      return opts
+    end,
+  },
+}

config/nvim/lua/plugins/extras/linting/typos.lua

@@ -0,0 +1,17 @@
+return {
+  {
+    "williamboman/mason.nvim",
+    opts = function(_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      vim.list_extend(opts.ensure_installed, { "typos" })
+    end,
+  },
+  {
+    "mfussenegger/nvim-lint",
+    opts = function(_, opts)
+      opts.linters_by_ft["*"] = opts.linters_by_ft["*"] or {}
+      table.insert(opts.linters_by_ft["*"], "typos")
+      return opts
+    end,
+  },
+}

config/nvim/lua/plugins/extras/ui/comment-box.lua

@@ -1,5 +1,23 @@
 return {
-  "LudoPinelli/comment-box.nvim",
-  event = "LazyFile",
-  opts = {},
+  {
+    "LudoPinelli/comment-box.nvim",
+    opts = {},
+    keys = {
+      { "<leader>acb", "<cmd>CBccbox<CR>", mode = { "n", "v" }, desc = "Comment Box" },
+      { "<leader>act", "<cmd>CBllline<CR>", mode = { "n", "v" }, desc = "Tiled Line" },
+      { "<leader>acl", "<cmd>CBline<CR>", desc = "Line" },
+      { "<leader>acm", "<cmd>CBllbox14<CR>", mode = { "n", "v" }, desc = "Marked" },
+      { "<leader>acc", "<cmd>CBcatalog<CR>", desc = "Catalog" },
+      { "<leader>acd", "<cmd>CBd<CR>", mode = { "n", "v" }, desc = "Delete Comment Style" },
+    },
+  },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      defaults = {
+        ["<leader>a"] = { name = " annotation/snippets" },
+        ["<leader>ac"] = { name = "comments" },
+      },
+    },
+  },
 }

config/nvim/lua/plugins/extras/ui/status-column.lua

@@ -0,0 +1,39 @@
+return {
+  {
+
+    "luukvbaal/statuscol.nvim",
+    event = { "LazyFile" },
+    opts = function()
+      local builtin = require("statuscol.builtin")
+      return {
+        ft_ignore = { "neo-tree", "neo-tree-popup", "alpha", "lazy", "mason", "dashboard" },
+        segments = {
+          { text = { builtin.lnumfunc }, click = "v:lua.ScLa" },
+          {
+            sign = { name = { "Diagnostic*" }, text = { ".*" }, maxwidth = 1, colwidth = 1, auto = true },
+            click = "v:lua.ScSa",
+          },
+          { text = { builtin.foldfunc, " " }, click = "v:lua.ScFa" },
+        },
+      }
+    end,
+    config = function(_, opts)
+      require("statuscol").setup(opts)
+    end,
+  },
+  {
+    "lewis6991/gitsigns.nvim",
+    opts = {
+      signs = {
+        add = { text = "┃" },
+        change = { text = "┃" },
+        delete = { text = "󱈸" },
+        topdelete = { text = "󱈸" },
+        changedelete = { text = "┃" },
+        untracked = { text = "┇" },
+      },
+      signcolumn = true,
+      numhl = true,
+    },
+  },
+}

config/nvim/lua/plugins/extras/util/cloak.lua

@@ -0,0 +1,5 @@
+return {
+  "laytan/cloak.nvim",
+  event = "BufRead .env*",
+  opts = {},
+}

config/nvim/lua/plugins/extras/util/discordrcp.lua

@@ -2,26 +2,24 @@ return {
   "andweeb/presence.nvim",
   event = "VeryLazy",
   opts = {
-    -- General options
-    auto_update = true, -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`)
-    neovim_image_text = "Chad Editor", -- Text displayed when hovered over the Neovim image
-    main_image = "file", -- Main image display (either "neovim" or "file")
-    client_id = "793271441293967371", -- Use your own Discord application client id (not recommended)
-    log_level = nil, -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error")
-    debounce_timeout = 10, -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`)
-    enable_line_number = false, -- Displays the current line number instead of the current project
-    blacklist = {}, -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
-    buttons = true, -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`, or a function(buffer: string, repo_url: string|nil): table)
-    file_assets = {}, -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference)
-    show_time = true, -- Show the timer
+    auto_update = true,
+    neovim_image_text = "Chad Editor",
+    main_image = "file",
+    client_id = "793271441293967371",
+    log_level = nil,
+    debounce_timeout = 10,
+    enable_line_number = false,
+    blacklist = {},
+    buttons = true,
+    file_assets = {},
+    show_time = true,
 
-    -- Rich Presence text options
-    editing_text = "Editing %s", -- Format string rendered when an editable file is loaded in the buffer (either string or function(filename: string): string)
-    file_explorer_text = "Browsing %s", -- Format string rendered when browsing a file explorer (either string or function(file_explorer_name: string): string)
-    git_commit_text = "Committing changes", -- Format string rendered when committing changes in git (either string or function(filename: string): string)
-    plugin_manager_text = "Managing plugins", -- Format string rendered when managing plugins (either string or function(plugin_manager_name: string): string)
-    reading_text = "Reading %s", -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string)
-    workspace_text = "Working on %s", -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string)
-    line_number_text = "Line %s out of %s", -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string)
+    editing_text = "Editing %s",
+    file_explorer_text = "Browsing %s",
+    git_commit_text = "Committing changes",
+    plugin_manager_text = "Managing plugins",
+    reading_text = "Reading %s",
+    workspace_text = "Working on %s",
+    line_number_text = "Line %s out of %s",
   },
 }

config/nvim/lua/plugins/extras/util/esqueleto.lua

@@ -2,10 +2,18 @@ return {
   "cvigilv/esqueleto.nvim",
   event = "VeryLazy",
   opts = {
-    directories = { vim.fn.stdpath("config") .. "/templates" },
+    directories = {
+      vim.fn.stdpath("config") .. "/templates",
+    },
     patterns = {
-      "LICENSE",
+      -- File
       "README",
+      "LICENSE",
+      -- Filetype
+      "sh",
+      "markdown",
+      "python",
+      "lua",
     },
   },
 }

config/nvim/lua/plugins/extras/util/neovide.lua

@@ -0,0 +1,39 @@
+if not vim.g.neovide then
+  return {}
+end
+
+RefreshGuiFont = function()
+  vim.opt.guifont = string.format("%s:h%s", vim.g.gui_font_face, vim.g.gui_font_size)
+end
+
+ResizeGuiFont = function(delta)
+  vim.g.gui_font_size = vim.g.gui_font_size + delta
+  RefreshGuiFont()
+end
+
+-- Keymaps
+local opts = { noremap = true, silent = true }
+
+vim.keymap.set({ "n", "i" }, "<C-+>", function()
+  ResizeGuiFont(1)
+end, opts)
+vim.keymap.set({ "n", "i" }, "<C-->", function()
+  ResizeGuiFont(-1)
+end, opts)
+
+vim.g.neovide_padding_top = 5
+vim.g.neovide_padding_right = 5
+vim.g.neovide_padding_left = 5
+
+vim.g.neovide_floating_blur_amount_x = 5.0
+vim.g.neovide_floating_blur_amount_y = 5.0
+
+vim.g.neovide_transparency = 0.85
+
+vim.g.neovide_cursor_antialiasing = false
+
+vim.g.neovide_cursor_vfx_mode = "pixiedust"
+
+vim.opt.winblend = 20
+
+return {}

config/nvim/lua/plugins/extras/util/vscode.lua

@@ -2,7 +2,11 @@ if not vim.g.vscode then
   return {}
 end
 
-vim.o.spell = false
+local Config = require("lazy.core.config")
+local Plugin = require("lazy.core.plugin")
+local vscode = require("vscode-neovim")
+
+local map = vim.keymap.set
 
 -- Add any additional plugins in vscode, you can set vscode=true on a plugin spec.
 local enabled = {
@@ -14,37 +18,51 @@ local enabled = {
   "mini.surround",
   "nvim-treesitter",
   "nvim-treesitter-textobjects",
+  "nvim-various-textobjs",
   "nvim-ts-context-commentstring",
   "vim-repeat",
+  "highlight-undo.nvim",
   "LazyVim",
 }
 
-local Config = require("lazy.core.config")
-local Plugin = require("lazy.core.plugin")
 Config.options.checker.enabled = false
 Config.options.change_detection.enabled = false
 Config.options.defaults.cond = function(plugin)
   return vim.tbl_contains(enabled, plugin.name) or plugin.vscode
 end
 
+vim.o.spell = false
+vim.notify = vscode.notify
+vim.g.clipboard = vim.g.vscode_clipboard
+
+local function vscode_action(cmd)
+  return function()
+    vscode.action(cmd)
+  end
+end
+
 -- Add some vscode specific keymaps
 vim.api.nvim_create_autocmd("User", {
   pattern = "LazyVimKeymaps",
   callback = function()
     -- find file
-    vim.keymap.set("n", "<leader><space>", "<cmd>Find<cr>")
+    map("n", "<leader><space>", "<cmd>Find<cr>")
     -- find in files
-    vim.keymap.set("n", "<leader>/", [[<cmd>call VSCodeNotify('workbench.action.findInFiles')<cr>]])
+    map("n", "<leader>/", vscode_action("workbench.action.findInFiles"))
     -- open symbol
-    vim.keymap.set("n", "<leader>ss", [[<cmd>call VSCodeNotify('workbench.action.gotoSymbol')<cr>]])
+    map("n", "<leader>ss", vscode_action("workbench.action.gotoSymbol"))
     -- view problems
-    vim.keymap.set("n", "<leader>xx", [[<cmd>call VSCodeNotify('workbench.actions.view.problems')<cr>]])
+    map("n", "<leader>xx", vscode_action("workbench.actions.view.problems"))
     -- open file explorer in left sidebar
-    vim.keymap.set("n", "<leader>e", [[<cmd>call VSCodeNotify('workbench.view.explorer')<cr>]])
+    map("n", "<leader>e", vscode_action("workbench.view.explorer"))
     -- Code Action
-    vim.keymap.set("n", "<leader>ca", [[<cmd>call VSCodeNotify('editor.action.codeAction')<cr>]])
+    map("n", "<leader>ca", vscode_action("editor.action.codeAction"))
     -- Open terminal
-    vim.keymap.set("n", "<leader>ft", [[<cmd>call VSCodeNotify('workbench.action.terminal.focus')<cr>]])
+    map("n", "<leader>ft", vscode_action("workbench.action.terminal.focus"))
+    -- LSP actions
+    map("n", "gy", vscode_action("editor.action.goToTypeDefinition"))
+    map("n", "gr", vscode_action("editor.action.goToReferences"))
+    map("n", "gi", vscode_action("editor.action.goToImplementation"))
   end,
 })
 
@@ -60,6 +78,10 @@ return {
   },
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = { highlight = { enable = false } },
+    opts = {
+      highlight = {
+        enable = false,
+      },
+    },
   },
 }

config/nvim/lua/plugins/lazyvim-extras.lua

@@ -74,7 +74,6 @@ return {
   { "echasnovski/mini.starter", optional = true },
 
   -- Util
-  { "luckasRanarison/tree-sitter-hypr", optional = true },
   { "echasnovski/mini.hipatterns", optional = true },
   { "ahmedkhalf/project.nvim", optional = true },
 }

config/nvim/lua/plugins/lazyvim-included.lua

@@ -2,8 +2,6 @@
 
 return {
   -- Coding
-  { "L3MON4D3/LuaSnip" },
-  { "rafamadriz/friendly-snippets" },
   { "echasnovski/mini.surround" },
   { "JoosepAlviste/nvim-ts-context-commentstring" },
   { "echasnovski/mini.comment" },

config/nvim/lua/plugins/lspconfig.lua

@@ -1,23 +1,5 @@
 local nvim_0_10 = vim.fn.has("nvim-0.10")
 
-local function toggle_diag_virtext()
-  local virtual_text = { -- Default virtual_text opts from Lazy.Nvim
-    spacing = 4,
-    source = "if_many",
-    prefix = "●",
-  }
-  local config = vim.diagnostic.config()
-  if type(config.virtual_text) == "table" then
-    config.virtual_text = false
-    vim.diagnostic.config(config)
-    vim.notify("Disable diagnostics virtualtext", 5, { title = "Diagnostics" })
-  else
-    config.virtual_text = virtual_text
-    vim.diagnostic.config(config)
-    vim.notify("Enabled diagnostics virtualtext", 5, { title = "Diagnostics" })
-  end
-end
-
 return {
   {
     "neovim/nvim-lspconfig",
@@ -26,19 +8,19 @@ return {
 
       keys[#keys + 1] = { "<leader>cl", false }
       keys[#keys + 1] = { "<leader>cil", "<cmd>LspInfo<cr>", desc = "Lsp" }
-      keys[#keys + 1] = { "<leader>uv", toggle_diag_virtext, desc = "Toggle Diagnostic VirtualText" }
-
-      keys[#keys + 1] = {
-        "<leader>cll",
-        "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<cr>",
-        desc = "List Folders",
-      }
-
-      keys[#keys + 1] = { "<leader>clh", vim.lsp.codelens.run, desc = "Run Code Lens" }
-      keys[#keys + 1] = { "<leader>cld", vim.lsp.codelens.refresh, desc = "Refresh Code Lens" }
       keys[#keys + 1] = { "<leader>clr", "<cmd>LspRestart<cr>", desc = "Restart Lsp" }
       keys[#keys + 1] = { "<leader>cls", "<cmd>LspStart<cr>", desc = "Start Lsp" }
       keys[#keys + 1] = { "<leader>clS", "<cmd>LspStop<cr>", desc = "Stop Lsp" }
+
+      -- stylua: ignore
+      keys[#keys + 1] = { "<leader>cll", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<cr>", desc = "List Workspace" }
+
+      -- stylua: ignore
+      keys[#keys + 1] = { "<leader>clr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", desc = "Remove workspace" }
+      keys[#keys + 1] = { "<leader>cla", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", desc = "Add workspace" }
+
+      keys[#keys + 1] = { "<leader>clh", vim.lsp.codelens.run, desc = "Run Code Lens" }
+      keys[#keys + 1] = { "<leader>cld", vim.lsp.codelens.refresh, desc = "Refresh Code Lens" }
     end,
     opts = {
       -- options for vim.diagnostic.config()
@@ -70,81 +52,19 @@ return {
         enabled = nvim_0_10,
       },
       servers = {
-        -- typos_lsp = {
-        --   settings = {
-        --     diagnosticSeverity = "Warning", TODO: Look at this
-        --   },
-        -- },
         lua_ls = {
           settings = {
             Lua = {
               hint = {
-                enable = true,
-                setType = true,
+                enable = nvim_0_10,
+                setType = nvim_0_10,
               },
             },
           },
         },
-        tsserver = {
-          init_options = {
-            preferences = {
-              disableSuggestions = true,
-            },
-          },
-          settings = {
-            typescript = {
-              format = {
-                indentSize = vim.o.shiftwidth,
-                convertTabsToSpaces = vim.o.expandtab,
-                tabSize = vim.o.tabstop,
-              },
-              inlayHints = {
-                includeInlayParameterNameHints = "all",
-                includeInlayParameterNameHintsWhenArgumentMatchesName = true,
-                includeInlayFunctionParameterTypeHints = true,
-                includeInlayVariableTypeHints = true,
-                includeInlayVariableTypeHintsWhenTypeMatchesName = true,
-                includeInlayPropertyDeclarationTypeHints = true,
-                includeInlayFunctionLikeReturnTypeHints = true,
-                includeInlayEnumMemberValueHints = true,
-              },
-            },
-            javascript = {
-              format = {
-                indentSize = vim.o.shiftwidth,
-                convertTabsToSpaces = vim.o.expandtab,
-                tabSize = vim.o.tabstop,
-              },
-              inlayHints = {
-                includeInlayParameterNameHints = "all",
-                includeInlayParameterNameHintsWhenArgumentMatchesName = true,
-                includeInlayFunctionParameterTypeHints = true,
-                includeInlayVariableTypeHints = true,
-                includeInlayVariableTypeHintsWhenTypeMatchesName = true,
-                includeInlayPropertyDeclarationTypeHints = true,
-                includeInlayFunctionLikeReturnTypeHints = true,
-                includeInlayEnumMemberValueHints = true,
-              },
-            },
-            completions = {
-              completeFunctionCalls = true,
-            },
-          },
-        },
       },
     },
   },
-  {
-    "simrat39/rust-tools.nvim",
-    optional = true,
-    opts = function(_, opts)
-      opts.tools = {
-        inlay_hints = {
-          auto = not nvim_0_10,
-        },
-      }
-    end,
-  },
   {
     "folke/which-key.nvim",
     opts = {

config/nvim/lua/plugins/luasnip.lua

@@ -0,0 +1,10 @@
+return {
+  "L3MON4D3/LuaSnip",
+  dependencies = {
+    "rafamadriz/friendly-snippets",
+    config = function()
+      require("luasnip.loaders.from_vscode").lazy_load()
+      require("luasnip.loaders.from_vscode").lazy_load({ paths = vim.fn.stdpath("config") .. "/snippets" })
+    end,
+  },
+}

config/nvim/lua/plugins/nvim-lint.lua

@@ -1,15 +0,0 @@
-return {
-  "mfussenegger/nvim-lint",
-  opts = {
-    linters_by_ft = {
-      ["*"] = { "cspell" },
-    },
-    linters = {
-      cspell = {
-        condition = function(ctx)
-          return vim.fs.find({ "cspell.json" }, { path = ctx.filename, upward = true })[1]
-        end,
-      },
-    },
-  },
-}