diff --git a/config/nvim/.github/README.md b/config/nvim/.github/README.md
index 47184461..55d07ec2 100644
--- a/config/nvim/.github/README.md
+++ b/config/nvim/.github/README.md
@@ -277,7 +277,7 @@
📜 LSP
-- [simrat39/symbols-outline.nvim](https://dotfyle.com/plugins/simrat39/symbols-outline.nvim)
+- [j-hui/fidget.nvim](https://dotfyle.com/plugins/j-hui/fidget.nvim)
- [antosha417/nvim-lsp-file-operations](https://github.com/antosha417/nvim-lsp-file-operations)
- [Wansmer/symbol-usage.nvim](https://dotfyle.com/plugins/Wansmer/symbol-usage.nvim)
- [aznhe21/actions-preview.nvim](https://dotfyle.com/plugins/aznhe21/actions-preview.nvim)
@@ -310,6 +310,8 @@
🔖 Marks
- [ThePrimeagen/harpoon](https://dotfyle.com/plugins/ThePrimeagen/harpoon)
+- [otavioschwanck/arrow.nvim](https://dotfyle.com/plugins/otavioschwanck/arrow.nvim)
+- [cbochs/grapple.nvim](https://dotfyle.com/plugins/cbochs/grapple.nvim)
- [tomasky/bookmarks.nvim](https://dotfyle.com/plugins/tomasky/bookmarks.nvim)
@@ -608,6 +610,7 @@
- markdownlint
- pylint
- ruff
+- selene
- shellcheck
- sqlfluff
- stylelint
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 04793082..980b8069 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,45 +1,45 @@
{
- "LazyVim": { "branch": "main", "commit": "c0ad2209b67f125a1f1a1ae3ccd6e89b7ffc8946" },
+ "LazyVim": { "branch": "main", "commit": "e3bfcb9bf74292dc846f5d1710fbb2e8f36a687a" },
"LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
- "SchemaStore.nvim": { "branch": "main", "commit": "5d7f8c3e7ae4e3fa5daedb83306406f95257201c" },
- "actions-preview.nvim": { "branch": "master", "commit": "5c240e6356156b72cfbf7c05feefadae61d7a06f" },
+ "SchemaStore.nvim": { "branch": "main", "commit": "b788bde023f9fbc2eb86e89d32c0bf98a60ae406" },
+ "actions-preview.nvim": { "branch": "master", "commit": "5072b1b1065a6b22bdd46b5c21780a91d6a08071" },
"autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" },
"bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" },
"bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" },
"catppuccin": { "branch": "main", "commit": "045e3499d9ec8d84635fb08877ae44fd33f6a38d" },
- "ccc.nvim": { "branch": "main", "commit": "2ef48b4c2f19c9516ff9c76c1410d32bcc83ca70" },
+ "ccc.nvim": { "branch": "main", "commit": "f3d9d31aab7990d50ae6922fd7c1e3a9eb7da183" },
"cinnamon.nvim": { "branch": "master", "commit": "c406ffda3a0302f32c23b24ab756ea20467d6578" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
- "codeium.vim": { "branch": "main", "commit": "c6728c9ebef67f97c252d9754f1466a74ef7551e" },
- "compiler.nvim": { "branch": "main", "commit": "f8ceb89b0b1dcd6d470aedd5b8c4b66545da068d" },
+ "codeium.vim": { "branch": "main", "commit": "5b8f68d5c0e32ae97d073a56ff14dba5646ec223" },
+ "compiler.nvim": { "branch": "main", "commit": "cb684ac7cfb3872bbdcd64cfc4d3e0c2affaab62" },
"conform.nvim": { "branch": "master", "commit": "5a15cc46e75cad804fd51ec5af9227aeb1d1bdaa" },
- "crates.nvim": { "branch": "main", "commit": "ec2b04a380c9f3a8e6ca38c230e4990d71978143" },
+ "crates.nvim": { "branch": "main", "commit": "535773ed3b321d68ddd6ef8cd5a1e07b345026a6" },
"dashboard-nvim": { "branch": "master", "commit": "413442b12d85315fc626c44a0ce4929b213ef604" },
"dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" },
"diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
- "dooku.nvim": { "branch": "main", "commit": "65777027f612b6f46417ae6224204174a0f270ec" },
+ "dooku.nvim": { "branch": "main", "commit": "123e34d3b0b4cfb8b2e6d686bc713b671123cbf0" },
"dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
"edgy.nvim": { "branch": "main", "commit": "0b35dc6da4cae6cc2f724bc610eadf955cd2319b" },
"flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
"friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
- "garbage-day.nvim": { "branch": "main", "commit": "01a43b77459bc06038045afade8f003f08a3d02f" },
+ "garbage-day.nvim": { "branch": "main", "commit": "029214aff15487822fbbbce6c622d1c380a20fed" },
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
"glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" },
- "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" },
+ "grapple.nvim": { "branch": "main", "commit": "59d458e378c4884f22b7a68e61c07ed3e41aabf0" },
"headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
"hydra.nvim": { "branch": "master", "commit": "55de54543d673824435930ecf533256eea2e565b" },
"icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" },
"indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
- "kitty-scrollback.nvim": { "branch": "main", "commit": "93b4286c4e2c9d4a73ccbefb3adbc688d3ed5fe4" },
+ "kitty-scrollback.nvim": { "branch": "main", "commit": "95c401021ed1f272081b422da547faffc096d943" },
"lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
"live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" },
"lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" },
"lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
- "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
+ "mason-lspconfig.nvim": { "branch": "main", "commit": "55716a879568a498fa236593c8119789054a3b8e" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
"mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
"mini.ai": { "branch": "main", "commit": "ee9446a17c160aba6a04ff22097389c41872c878" },
@@ -49,8 +49,8 @@
"mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" },
"mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" },
"multicursors.nvim": { "branch": "main", "commit": "8b3e14682eed06a532b155c7eae33e174846b3fd" },
- "neo-tree.nvim": { "branch": "v3.x", "commit": "459c60317cc1d251f6eb3b6f010d015d5d24b806" },
- "neoconf.nvim": { "branch": "main", "commit": "db1d1bd45f4e91da6abc898281711fa47eda0ece" },
+ "neo-tree.nvim": { "branch": "v3.x", "commit": "7f2ebdef3b55374390714ac7c0a7fe6b0dae498a" },
+ "neoconf.nvim": { "branch": "main", "commit": "d21739358bca9811f783c9a3d5e91c7b3abc3005" },
"neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
"neogen": { "branch": "main", "commit": "b95347a588401a755eadd17482edc1662876bd58" },
"noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
@@ -58,25 +58,25 @@
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
"nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" },
"nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
- "nvim-dap-virtual-text": { "branch": "master", "commit": "a5fc69240869c0fee8ff176bc9e4efdf8bdfb596" },
+ "nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" },
"nvim-devdocs": { "branch": "master", "commit": "521d24661ffe6d1ba025debea2675c765a9c1ee1" },
"nvim-lint": { "branch": "master", "commit": "e824adb9bc01647f71e55457353a68f0f37f9931" },
"nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" },
- "nvim-lspconfig": { "branch": "master", "commit": "e172dd599cff2ae5267871b5e33fb42934c4df43" },
+ "nvim-lspconfig": { "branch": "master", "commit": "99330586c6e1912c890fc39d19d97571fde660cd" },
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
"nvim-puppeteer": { "branch": "main", "commit": "d72c7045683c0960e9ae6ae9628d0907b2cab9f3" },
- "nvim-recorder": { "branch": "main", "commit": "df9044801b9b59b740b89fd64ed23038dd293e91" },
+ "nvim-recorder": { "branch": "main", "commit": "f37f8e80b32c2a5dca2bd8f6d9dce278b3f5e434" },
"nvim-spectre": { "branch": "master", "commit": "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf" },
- "nvim-treesitter": { "branch": "master", "commit": "9775d5d7c724f81acdd441e7e9edefc4514e990b" },
+ "nvim-treesitter": { "branch": "master", "commit": "488bec03254207b1dd071be8cb1fb78434b6e777" },
"nvim-treesitter-context": { "branch": "master", "commit": "b8b7e52c1517d401d7c519787d5dc4528c41291a" },
"nvim-treesitter-endwise": { "branch": "master", "commit": "60e8c288e011403f248b5f6478dde12bed8a6c55" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" },
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
"nvim-various-textobjs": { "branch": "main", "commit": "3782eb41a964f45788843e34f325a470f0dc6757" },
- "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" },
+ "nvim-web-devicons": { "branch": "master", "commit": "75df79feb02d5e0ec114e447453775d4d291ea03" },
"nvim_context_vt": { "branch": "master", "commit": "8f7b6b46292e0819290b0d368abc3366b8a163fc" },
- "obsidian.nvim": { "branch": "main", "commit": "51bc68824044f96165b670db2d5bad30b354f188" },
+ "obsidian.nvim": { "branch": "main", "commit": "979f154090099fc6e31f8bb639a30e2e3e5841d3" },
"outline.nvim": { "branch": "main", "commit": "a8d40aecb799196303ff3521c0e31c87bba57198" },
"overseer.nvim": { "branch": "master", "commit": "b72f6d23ce47ccd427be2341f389c63448278f17" },
"package-info.nvim": { "branch": "master", "commit": "45acce5b12ce824332d8000cc2c91805b6710446" },
@@ -85,20 +85,20 @@
"plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "cfc3f53cfa0fbabd95bd33747288aea24fe45211" },
"refactoring.nvim": { "branch": "master", "commit": "93d69cce9f0cbee8afae5b2380b296323792645f" },
- "rustaceanvim": { "branch": "master", "commit": "387ca846d632f8c90631536341ca1778b4c2c497" },
+ "rustaceanvim": { "branch": "master", "commit": "c787f5b0fafc29f9487b1314b19515451fd990e7" },
"search-replace.nvim": { "branch": "main", "commit": "d92290a02d97f4e9b8cd60d28b56b403432158d5" },
"semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" },
- "smart-splits.nvim": { "branch": "master", "commit": "1ae8794e9e7fbdf0ec4074f2d0e056556a834f75" },
+ "smart-splits.nvim": { "branch": "master", "commit": "039fb0a5172cc35ffee7cc9d40d9496541609799" },
"sqlite.lua": { "branch": "master", "commit": "40701b6151f8883980c1548647116de39b763540" },
- "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" },
+ "suda.vim": { "branch": "master", "commit": "257767d7977414210b6db9df0be39b9789d83978" },
"telescope-floaterm.nvim": { "branch": "main", "commit": "ccd3f40ae30dce5de0e5d0f5069e08e7d9ad6d23" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
"telescope-lazy.nvim": { "branch": "main", "commit": "3487d6212fe1b5750ae239e2207f4cb603004d36" },
"telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
"telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" },
- "telescope.nvim": { "branch": "master", "commit": "dc1ea28cc2a02cd1cebb9d80e967807d668f78f8" },
+ "telescope.nvim": { "branch": "master", "commit": "7472420f8734c710bd7009081cef9b97f08a3821" },
"todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
- "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" },
+ "tokyonight.nvim": { "branch": "main", "commit": "c025baf23b62f044eff1f4ef561c45de636f0e32" },
"trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
"ts-error-translator.nvim": { "branch": "main", "commit": "1d24a38427fd2030c5f4e82156c87ab7d6d44814" },
"ts-node-action": { "branch": "master", "commit": "e37eb458378de5d994df459a53711b2546abef0f" },
diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json
index c72160d2..85c7f89e 100644
--- a/config/nvim/lazyvim.json
+++ b/config/nvim/lazyvim.json
@@ -15,15 +15,15 @@
"plugins.extras.coding.treesitter.puppeteer",
"plugins.extras.coding.treesitter.various-textobjs",
"plugins.extras.coding.yanky",
- "plugins.extras.dap.core",
+ "plugins.extras.dap.core-extended",
"plugins.extras.dap.persistent-breakpoints",
"plugins.extras.editor.color",
"plugins.extras.editor.compiler",
"plugins.extras.editor.docs.devdocs",
"plugins.extras.editor.docs.obsidian",
"plugins.extras.editor.git.diffview",
- "plugins.extras.editor.harpoon",
"plugins.extras.editor.live-server",
+ "plugins.extras.editor.marks.grapple",
"plugins.extras.editor.outline-extended",
"plugins.extras.editor.package-info",
"plugins.extras.editor.search-replace",
@@ -41,6 +41,22 @@
"plugins.extras.lang.web.html-css",
"plugins.extras.lang.web.typescript-extended",
"plugins.extras.lang.web.vue",
+ "plugins.extras.lazyvim.bufferline",
+ "plugins.extras.lazyvim.cmp",
+ "plugins.extras.lazyvim.dashboard",
+ "plugins.extras.lazyvim.flash",
+ "plugins.extras.lazyvim.gitsigns",
+ "plugins.extras.lazyvim.lspconfig",
+ "plugins.extras.lazyvim.lualine",
+ "plugins.extras.lazyvim.luasnip",
+ "plugins.extras.lazyvim.mason",
+ "plugins.extras.lazyvim.neo-tree",
+ "plugins.extras.lazyvim.noice",
+ "plugins.extras.lazyvim.nvim-notify",
+ "plugins.extras.lazyvim.persistence",
+ "plugins.extras.lazyvim.spectre",
+ "plugins.extras.lazyvim.telescope",
+ "plugins.extras.lazyvim.which-key",
"plugins.extras.linting.eslint-extended",
"plugins.extras.lsp.actions-preview",
"plugins.extras.lsp.file-operations",
@@ -61,5 +77,5 @@
"news": {
"NEWS.md": "2123"
},
- "version": 2
+ "version": 3
}
\ No newline at end of file
diff --git a/config/nvim/lua/config/autocmds.lua b/config/nvim/lua/config/autocmds.lua
index 06c3e841..b007bd05 100644
--- a/config/nvim/lua/config/autocmds.lua
+++ b/config/nvim/lua/config/autocmds.lua
@@ -1,7 +1,3 @@
--- Autocmds are automatically loaded on the VeryLazy event
--- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
--- Add any additional autocmds here
-
local ac = vim.api.nvim_create_autocmd
local ag = vim.api.nvim_create_augroup
@@ -71,6 +67,7 @@ ac("FileType", {
ac("TermOpen", {
callback = function()
vim.cmd("setlocal listchars= nonumber norelativenumber")
+ vim.cmd("setlocal nospell")
end,
})
diff --git a/config/nvim/lua/config/keymaps.lua b/config/nvim/lua/config/keymaps.lua
index 5eeed383..fd72675e 100644
--- a/config/nvim/lua/config/keymaps.lua
+++ b/config/nvim/lua/config/keymaps.lua
@@ -1,6 +1,3 @@
--- Keymaps are automatically loaded on the VeryLazy event
--- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
--- Add any additional keymaps here
local map = vim.keymap.set
local o = vim.opt
diff --git a/config/nvim/lua/config/lazy.lua b/config/nvim/lua/config/lazy.lua
index a10b6b7d..fa9a928a 100644
--- a/config/nvim/lua/config/lazy.lua
+++ b/config/nvim/lua/config/lazy.lua
@@ -9,17 +9,16 @@ vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
require("lazy").setup({
spec = {
- -- add LazyVim and import its plugins
- { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+ {
+ "LazyVim/LazyVim",
+ import = "lazyvim.plugins",
+ opts = { colorscheme = "catppuccin" },
+ },
{ import = "plugins" },
{ import = "lazyvim.plugins.extras.lazyrc" },
},
defaults = {
- -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
- -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
lazy = true,
- -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
- -- have outdated releases, which may break your Neovim install.
version = false, -- always use the latest git commit
-- version = "*", -- try installing the latest stable version for plugins that support semver
},
diff --git a/config/nvim/lua/config/options.lua b/config/nvim/lua/config/options.lua
index e4d1d5db..1b89d5bb 100644
--- a/config/nvim/lua/config/options.lua
+++ b/config/nvim/lua/config/options.lua
@@ -1,6 +1,3 @@
--- Options are automatically loaded before lazy.nvim startup
--- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
--- Add any additional options here
local go = vim.g
local o = vim.opt
@@ -34,5 +31,19 @@ go.root_spec = {
"cwd",
}
--- Show last command in the status line
+-- Disable annoying cmd line stuff
o.showcmd = false
+o.laststatus = 0
+o.cmdheight = 0
+
+-- Enable spell checking
+o.spell = true
+
+-- Backspacing and indentation when wrapping
+o.backspace = { "start", "eol", "indent" }
+o.breakindent = true
+
+-- Smoothscroll
+if vim.fn.has("nvim-0.10") == 1 then
+ o.smoothscroll = true
+end
diff --git a/config/nvim/lua/plugins/colorscheme.lua b/config/nvim/lua/plugins/colorscheme.lua
deleted file mode 100644
index 987ca4b8..00000000
--- a/config/nvim/lua/plugins/colorscheme.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
- "LazyVim/LazyVim",
- opts = {
- colorscheme = "catppuccin",
- },
-}
diff --git a/config/nvim/lua/plugins/disabled.lua b/config/nvim/lua/plugins/disabled.lua
new file mode 100644
index 00000000..18919359
--- /dev/null
+++ b/config/nvim/lua/plugins/disabled.lua
@@ -0,0 +1,20 @@
+-- Delete this condition if you want to execute the file
+if true then
+ return {}
+end
+
+-- Example of disabling some plugins. Add yours
+local disabled = {
+ {
+ "akinsho/bufferline.nvim",
+ },
+ {
+ "nvim-lualine/lualine.nvim",
+ },
+}
+
+for i, plugin in ipairs(disabled) do
+ plugin.enabled = false
+end
+
+return disabled
diff --git a/config/nvim/lua/plugins/extras/coding/ai/codeium.lua b/config/nvim/lua/plugins/extras/coding/ai/codeium.lua
index d8cb5f6e..6ab51d58 100644
--- a/config/nvim/lua/plugins/extras/coding/ai/codeium.lua
+++ b/config/nvim/lua/plugins/extras/coding/ai/codeium.lua
@@ -39,6 +39,7 @@ return {
},
{
"nvim-lualine/lualine.nvim",
+ optional = true,
opts = function(_, opts)
local icon = require("lazyvim.config").icons.kinds.Codeium
local function show_codeium_status()
diff --git a/config/nvim/lua/plugins/extras/coding/multicursor.lua b/config/nvim/lua/plugins/extras/coding/multicursor.lua
index 5e5cd21a..1b92d223 100644
--- a/config/nvim/lua/plugins/extras/coding/multicursor.lua
+++ b/config/nvim/lua/plugins/extras/coding/multicursor.lua
@@ -27,6 +27,7 @@ return {
},
{
"nvim-lualine/lualine.nvim",
+ optional = true,
opts = function(_, opts)
local function is_active()
local ok, hydra = pcall(require, "hydra.statusline")
diff --git a/config/nvim/lua/plugins/extras/coding/recorder.lua b/config/nvim/lua/plugins/extras/coding/recorder.lua
index fe3bdcd4..f3c0bfab 100644
--- a/config/nvim/lua/plugins/extras/coding/recorder.lua
+++ b/config/nvim/lua/plugins/extras/coding/recorder.lua
@@ -26,6 +26,7 @@ return {
},
{
"nvim-lualine/lualine.nvim",
+ optional = true,
opts = function(_, opts)
table.insert(opts.sections.lualine_x, 1, require("recorder").displaySlots)
end,
diff --git a/config/nvim/lua/plugins/extras/dap/core.lua b/config/nvim/lua/plugins/extras/dap/core-extended.lua
similarity index 100%
rename from config/nvim/lua/plugins/extras/dap/core.lua
rename to config/nvim/lua/plugins/extras/dap/core-extended.lua
diff --git a/config/nvim/lua/plugins/extras/editor/arrow.lua b/config/nvim/lua/plugins/extras/editor/marks/arrow.lua
similarity index 91%
rename from config/nvim/lua/plugins/extras/editor/arrow.lua
rename to config/nvim/lua/plugins/extras/editor/marks/arrow.lua
index a6b119db..129a0aba 100644
--- a/config/nvim/lua/plugins/extras/editor/arrow.lua
+++ b/config/nvim/lua/plugins/extras/editor/marks/arrow.lua
@@ -17,6 +17,7 @@ return {
},
{
"nvim-lualine/lualine.nvim",
+ optional = true,
opts = function(_, opts)
table.insert(opts.sections.lualine_c, require("arrow.statusline").text_for_statusline_with_icons())
end,
@@ -26,7 +27,7 @@ return {
optional = true,
opts = function(_, dashboard)
-- stylua: ignore
- local button = dashboard.button("m", "󱌧 " .. " Marks", function() require("arrow.ui").openMenu() end)
+ local button = dashboard.button("m", "󰛢 " .. " Marks", function() require("arrow.ui").openMenu() end)
button.opts.hl = "AlphaButtons"
button.opts.hl_shortcut = "AlphaShortcut"
table.insert(dashboard.section.buttons.val, 5, button)
@@ -40,7 +41,7 @@ return {
local arrow = {
action = function() require("arrow.ui").openMenu() end,
desc = " Marks",
- icon = "󱌧 ",
+ icon = "󰛢 ",
key = "m",
}
diff --git a/config/nvim/lua/plugins/extras/editor/marks/grapple.lua b/config/nvim/lua/plugins/extras/editor/marks/grapple.lua
new file mode 100644
index 00000000..ed4617f9
--- /dev/null
+++ b/config/nvim/lua/plugins/extras/editor/marks/grapple.lua
@@ -0,0 +1,78 @@
+local keys = {}
+
+-- stylua: ignore start
+for i = 1, 9 do
+ table.insert(keys, { "" .. i, "Grapple select index=" .. i .. "", desc = "File " .. i })
+end
+
+table.insert(keys, { "a", "Grapple tag", desc = "Add Mark" })
+table.insert(keys, { "", "Grapple toggle_tags", desc = "Marks" })
+table.insert(keys, { "t", "Telescope grapple tags", desc = "Marks (Telescope)" })
+table.insert(keys, { "C", "Grapple reset", desc = "Clear all Marks" })
+table.insert(keys, { "c", "Grapple untag", desc = "Clear current Mark" })
+table.insert(keys, { "s", "Grapple toggle_scopes", desc = "Scopes" })
+table.insert(keys, { "S", "Grapple toggle_loaded", desc = "Loaded Scopes" })
+
+table.insert(keys, { "]", "Grapple cycle forward", desc = "Next Mark" })
+table.insert(keys, { "[", "Grapple cycle backward", desc = "Prev Mark" })
+
+table.insert(keys, { "", "Grapple cycle forward", desc = "Next Mark" })
+table.insert(keys, { "", "Grapple cycle backward", desc = "Prev Mark" })
+-- stylua: ignore end
+
+return {
+ {
+ "cbochs/grapple.nvim",
+ dependencies = "nvim-tree/nvim-web-devicons",
+ cmd = { "Grapple" },
+ keys = keys,
+ config = function()
+ require("grapple").setup()
+ require("lazyvim.util").on_load("telescope.nvim", function()
+ require("telescope").load_extension("grapple")
+ end)
+ end,
+ },
+ {
+ "goolord/alpha-nvim",
+ optional = true,
+ opts = function(_, dashboard)
+ local button = dashboard.button("m", "󰛢 " .. " Marks", "Grapple toggle_tags")
+ button.opts.hl = "AlphaButtons"
+ button.opts.hl_shortcut = "AlphaShortcut"
+ table.insert(dashboard.section.buttons.val, 5, button)
+ end,
+ },
+ {
+ "nvimdev/dashboard-nvim",
+ optional = true,
+ opts = function(_, opts)
+ local grapple = {
+ action = "Grapple toggle_tags",
+ desc = " Marks",
+ icon = "󰛢 ",
+ key = "m",
+ }
+
+ grapple.desc = grapple.desc .. string.rep(" ", 43 - #grapple.desc)
+ grapple.key_format = " %s"
+
+ table.insert(opts.config.center, 5, grapple)
+ end,
+ },
+ {
+ "nvim-lualine/lualine.nvim",
+ optional = true,
+ opts = function(_, opts)
+ table.insert(opts.sections.lualine_c, { require("grapple").statusline, cond = require("grapple").exists })
+ end,
+ },
+ {
+ "folke/which-key.nvim",
+ opts = {
+ defaults = {
+ [""] = { name = "󰛢 marks" },
+ },
+ },
+ },
+}
diff --git a/config/nvim/lua/plugins/extras/editor/harpoon.lua b/config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua
similarity index 79%
rename from config/nvim/lua/plugins/extras/editor/harpoon.lua
rename to config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua
index 531de938..d0bf617a 100644
--- a/config/nvim/lua/plugins/extras/editor/harpoon.lua
+++ b/config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua
@@ -7,14 +7,14 @@ end
table.insert(keys, { "a", function() require("harpoon"):list():append() end, desc = "Add Mark" })
table.insert(keys, { "", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end, desc = "Marks" })
-table.insert(keys, { "t", "Telescope harpoon marks", desc = "Files (Telescope)" })
-table.insert(keys, { "c", function() require("harpoon"):list():clear() end, desc = "Clear all Files" })
+table.insert(keys, { "t", "Telescope harpoon marks", desc = "Marks (Telescope)" })
+table.insert(keys, { "c", function() require("harpoon"):list():clear() end, desc = "Clear all Marks" })
-table.insert(keys, { "]", function() require("harpoon"):list():next() end, desc = "Next Mark File" })
-table.insert(keys, { "[", function() require("harpoon"):list():prev() end, desc = "Prev Mark File" })
+table.insert(keys, { "]", function() require("harpoon"):list():next() end, desc = "Next Mark" })
+table.insert(keys, { "[", function() require("harpoon"):list():prev() end, desc = "Prev Mark" })
-table.insert(keys, { "", function() require("harpoon"):list():next() end, desc = "Next Mark File" })
-table.insert(keys, { "", function() require("harpoon"):list():prev() end, desc = "Prev Mark File" })
+table.insert(keys, { "", function() require("harpoon"):list():next() end, desc = "Next Mark" })
+table.insert(keys, { "", function() require("harpoon"):list():prev() end, desc = "Prev Mark" })
-- stylua: ignore end
return {
@@ -55,7 +55,8 @@ return {
"goolord/alpha-nvim",
optional = true,
opts = function(_, dashboard)
- local button = dashboard.button("m", "󱌧 " .. " Marks", "Telescope harpoon marks")
+ -- stylua: ignore
+ local button = dashboard.button("m", "󰛢 " .. " Marks", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end)
button.opts.hl = "AlphaButtons"
button.opts.hl_shortcut = "AlphaShortcut"
table.insert(dashboard.section.buttons.val, 5, button)
@@ -66,9 +67,10 @@ return {
optional = true,
opts = function(_, opts)
local harpoon = {
- action = "Telescope harpoon marks",
+ -- stylua: ignore
+ action = function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end,
desc = " Marks",
- icon = "󱌧 ",
+ icon = "󰛢 ",
key = "m",
}
@@ -82,7 +84,7 @@ return {
"folke/which-key.nvim",
opts = {
defaults = {
- [""] = { name = "󱌧 marks" },
+ [""] = { name = "󰛢 marks" },
},
},
},
diff --git a/config/nvim/lua/plugins/extras/editor/tabscope.lua b/config/nvim/lua/plugins/extras/editor/tabscope.lua
index 061d73af..57def814 100644
--- a/config/nvim/lua/plugins/extras/editor/tabscope.lua
+++ b/config/nvim/lua/plugins/extras/editor/tabscope.lua
@@ -1,5 +1,6 @@
return {
"akinsho/bufferline.nvim",
+ optional = true,
dependencies = {
"backdround/tabscope.nvim",
opts = {},
diff --git a/config/nvim/lua/plugins/extras/editor/telescope/file-browser.lua b/config/nvim/lua/plugins/extras/editor/telescope/file-browser.lua
new file mode 100644
index 00000000..3505fc1d
--- /dev/null
+++ b/config/nvim/lua/plugins/extras/editor/telescope/file-browser.lua
@@ -0,0 +1,25 @@
+return {
+ "nvim-telescope/telescope-file-browser.nvim",
+ config = function()
+ require("lazyvim.util").on_load("telescope.nvim", function()
+ require("telescope").setup({
+ extensions = {
+ file_browser = {
+ hijack_netrw = true,
+ },
+ },
+ })
+ require("telescope").load_extension("file_browser")
+ end)
+ end,
+ dependencies = {
+ "nvim-telescope/telescope.nvim",
+ "nvim-lua/plenary.nvim",
+ "nvim-tree/nvim-web-devicons",
+ },
+ -- stylua: ignore
+ keys = {
+ { "'", "Telescope file_browser", desc = "Telescope File Browser (root dir)" },
+ { '"', "Telescope file_browser path=%:p:h select_buffer=true", desc = "Telescope File Browser (cwd)" },
+ },
+}
diff --git a/config/nvim/lua/plugins/bufferline.lua b/config/nvim/lua/plugins/extras/lazyvim/bufferline.lua
similarity index 100%
rename from config/nvim/lua/plugins/bufferline.lua
rename to config/nvim/lua/plugins/extras/lazyvim/bufferline.lua
diff --git a/config/nvim/lua/plugins/cmp.lua b/config/nvim/lua/plugins/extras/lazyvim/cmp.lua
similarity index 100%
rename from config/nvim/lua/plugins/cmp.lua
rename to config/nvim/lua/plugins/extras/lazyvim/cmp.lua
diff --git a/config/nvim/lua/plugins/dashboard.lua b/config/nvim/lua/plugins/extras/lazyvim/dashboard.lua
similarity index 100%
rename from config/nvim/lua/plugins/dashboard.lua
rename to config/nvim/lua/plugins/extras/lazyvim/dashboard.lua
diff --git a/config/nvim/lua/plugins/flash.lua b/config/nvim/lua/plugins/extras/lazyvim/flash.lua
similarity index 100%
rename from config/nvim/lua/plugins/flash.lua
rename to config/nvim/lua/plugins/extras/lazyvim/flash.lua
diff --git a/config/nvim/lua/plugins/gitsigns.lua b/config/nvim/lua/plugins/extras/lazyvim/gitsigns.lua
similarity index 100%
rename from config/nvim/lua/plugins/gitsigns.lua
rename to config/nvim/lua/plugins/extras/lazyvim/gitsigns.lua
diff --git a/config/nvim/lua/plugins/lspconfig.lua b/config/nvim/lua/plugins/extras/lazyvim/lspconfig.lua
similarity index 100%
rename from config/nvim/lua/plugins/lspconfig.lua
rename to config/nvim/lua/plugins/extras/lazyvim/lspconfig.lua
diff --git a/config/nvim/lua/plugins/lualine.lua b/config/nvim/lua/plugins/extras/lazyvim/lualine.lua
similarity index 100%
rename from config/nvim/lua/plugins/lualine.lua
rename to config/nvim/lua/plugins/extras/lazyvim/lualine.lua
diff --git a/config/nvim/lua/plugins/luasnip.lua b/config/nvim/lua/plugins/extras/lazyvim/luasnip.lua
similarity index 89%
rename from config/nvim/lua/plugins/luasnip.lua
rename to config/nvim/lua/plugins/extras/lazyvim/luasnip.lua
index 38b189b5..54041cbc 100644
--- a/config/nvim/lua/plugins/luasnip.lua
+++ b/config/nvim/lua/plugins/extras/lazyvim/luasnip.lua
@@ -5,7 +5,9 @@ return {
config = function()
require("luasnip.loaders.from_vscode").lazy_load()
require("luasnip").filetype_extend("typescript", { "tsdoc" })
+ require("luasnip").filetype_extend("typescript", { "next-ts" })
require("luasnip").filetype_extend("javascript", { "jsdoc" })
+ require("luasnip").filetype_extend("javascript", { "next" })
require("luasnip").filetype_extend("lua", { "luadoc" })
require("luasnip").filetype_extend("python", { "pydoc" })
require("luasnip").filetype_extend("rust", { "rustdoc" })
diff --git a/config/nvim/lua/plugins/mason.lua b/config/nvim/lua/plugins/extras/lazyvim/mason.lua
similarity index 100%
rename from config/nvim/lua/plugins/mason.lua
rename to config/nvim/lua/plugins/extras/lazyvim/mason.lua
diff --git a/config/nvim/lua/plugins/neo-tree.lua b/config/nvim/lua/plugins/extras/lazyvim/neo-tree.lua
similarity index 100%
rename from config/nvim/lua/plugins/neo-tree.lua
rename to config/nvim/lua/plugins/extras/lazyvim/neo-tree.lua
diff --git a/config/nvim/lua/plugins/noice.lua b/config/nvim/lua/plugins/extras/lazyvim/noice.lua
similarity index 100%
rename from config/nvim/lua/plugins/noice.lua
rename to config/nvim/lua/plugins/extras/lazyvim/noice.lua
diff --git a/config/nvim/lua/plugins/nvim-notify.lua b/config/nvim/lua/plugins/extras/lazyvim/nvim-notify.lua
similarity index 100%
rename from config/nvim/lua/plugins/nvim-notify.lua
rename to config/nvim/lua/plugins/extras/lazyvim/nvim-notify.lua
diff --git a/config/nvim/lua/plugins/persistence.lua b/config/nvim/lua/plugins/extras/lazyvim/persistence.lua
similarity index 85%
rename from config/nvim/lua/plugins/persistence.lua
rename to config/nvim/lua/plugins/extras/lazyvim/persistence.lua
index 82a1e484..128f373b 100644
--- a/config/nvim/lua/plugins/persistence.lua
+++ b/config/nvim/lua/plugins/extras/lazyvim/persistence.lua
@@ -5,7 +5,7 @@ return {
"folke/persistence.nvim",
keys = {
{
- "qs",
+ "qS",
function()
p.save()
vim.notify("Session saved", vim.log.levels.INFO, { title = "Persistence" })
@@ -13,7 +13,6 @@ return {
desc = "Save Session",
},
-- stylua: ignore start
- { "qr", function() require("persistence").load({ last = true }) end, desc = "Restore Last Session" },
{ "qt",
function()
if isActive then
diff --git a/config/nvim/lua/plugins/spectre.lua b/config/nvim/lua/plugins/extras/lazyvim/spectre.lua
similarity index 100%
rename from config/nvim/lua/plugins/spectre.lua
rename to config/nvim/lua/plugins/extras/lazyvim/spectre.lua
diff --git a/config/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/extras/lazyvim/telescope.lua
similarity index 100%
rename from config/nvim/lua/plugins/telescope.lua
rename to config/nvim/lua/plugins/extras/lazyvim/telescope.lua
diff --git a/config/nvim/lua/plugins/which-key.lua b/config/nvim/lua/plugins/extras/lazyvim/which-key.lua
similarity index 100%
rename from config/nvim/lua/plugins/which-key.lua
rename to config/nvim/lua/plugins/extras/lazyvim/which-key.lua
diff --git a/config/nvim/lua/plugins/extras/linting/biome.lua b/config/nvim/lua/plugins/extras/linting/biome.lua
index 72af89c5..25e56fce 100644
--- a/config/nvim/lua/plugins/extras/linting/biome.lua
+++ b/config/nvim/lua/plugins/extras/linting/biome.lua
@@ -34,6 +34,9 @@ return {
["typescript"] = { "biome" },
["typescriptreact"] = { "biome" },
["javascriptreact"] = { "biome" },
+ ["astro"] = { "biome" },
+ ["svelte"] = { "biome" },
+ ["vue"] = { "biome" },
})
opts.formatters = {
diff --git a/config/nvim/lua/plugins/extras/linting/cspell.lua b/config/nvim/lua/plugins/extras/linting/cspell.lua
deleted file mode 100644
index 70b03766..00000000
--- a/config/nvim/lua/plugins/extras/linting/cspell.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-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", "!", function() require("util.cspell").addWordToDictionary() end, { desc = "Add Word to Dictionary", silent = true })
- return true
- else
- return false
- end
- end,
- }
-
- return opts
- end,
- },
-}
diff --git a/config/nvim/lua/plugins/extras/lsp/file-operations.lua b/config/nvim/lua/plugins/extras/lsp/file-operations.lua
index 94a01b67..d37a436c 100644
--- a/config/nvim/lua/plugins/extras/lsp/file-operations.lua
+++ b/config/nvim/lua/plugins/extras/lsp/file-operations.lua
@@ -1,5 +1,6 @@
return {
"nvim-neo-tree/neo-tree.nvim",
+ optional = true,
dependencies = {
"antosha417/nvim-lsp-file-operations",
opts = {},
diff --git a/config/nvim/lua/plugins/extras/test/core.lua b/config/nvim/lua/plugins/extras/test/core-extended.lua
similarity index 100%
rename from config/nvim/lua/plugins/extras/test/core.lua
rename to config/nvim/lua/plugins/extras/test/core-extended.lua
diff --git a/config/nvim/lua/plugins/extras/ui/fidget.lua b/config/nvim/lua/plugins/extras/ui/fidget.lua
new file mode 100644
index 00000000..42471579
--- /dev/null
+++ b/config/nvim/lua/plugins/extras/ui/fidget.lua
@@ -0,0 +1,18 @@
+return {
+ {
+ "j-hui/fidget.nvim",
+ event = "LspAttach",
+ opts = {},
+ },
+ {
+ "folke/noice.nvim",
+ optional = true,
+ opts = {
+ lsp = {
+ progress = {
+ enabled = false,
+ },
+ },
+ },
+ },
+}
diff --git a/config/nvim/lua/plugins/extras/ui/status-column.lua b/config/nvim/lua/plugins/extras/ui/status-column.lua
index a716c305..61e48f3e 100644
--- a/config/nvim/lua/plugins/extras/ui/status-column.lua
+++ b/config/nvim/lua/plugins/extras/ui/status-column.lua
@@ -1,6 +1,5 @@
return {
{
-
"luukvbaal/statuscol.nvim",
event = { "LazyFile" },
opts = function()
diff --git a/config/nvim/lua/plugins/lazyvim-extras.lua b/config/nvim/lua/plugins/lazyvim-extras.lua
index 95c4da92..680d59e5 100644
--- a/config/nvim/lua/plugins/lazyvim-extras.lua
+++ b/config/nvim/lua/plugins/lazyvim-extras.lua
@@ -15,7 +15,6 @@ return {
{ "tpope/vim-repeat", optional = true },
{ "echasnovski/mini.files", optional = true },
{ "SmiteshP/nvim-navic", optional = true },
- { "simrat39/symbols-outline.nvim", optional = true },
-- Lang
-- Clangd
@@ -56,7 +55,7 @@ return {
-- Rust
{ "Saecki/crates.nvim", optional = true },
- { "rouge8/neotest-rust", optional = true },
+ { "mrcjkb/rustaceanvim", optional = true },
-- Tailwind
{ "roobert/tailwindcss-colorizer-cmp.nvim", optional = true },
diff --git a/config/nvim/lua/util/cspell.lua b/config/nvim/lua/util/cspell.lua
deleted file mode 100644
index e5ea121e..00000000
--- a/config/nvim/lua/util/cspell.lua
+++ /dev/null
@@ -1,27 +0,0 @@
-local M = {}
-
-function M.addWordToDictionary()
- local word = vim.fn.expand("")
- local dictionary_path = require("lazyvim.util.root").get() .. "/cspell-dictionary.txt"
-
- -- Append the word to the dictionary file
- local file = io.open(dictionary_path, "a")
- if file then
- -- Detect new line at the end of the file or not
- local last_char = file:seek("end", -1)
- if last_char ~= nil and last_char ~= "\n" then
- word = "\n" .. word
- end
-
- file:write(word .. "")
- file:close()
- vim.notify("Added word to dictionary", "info", { title = "cSpell" })
-
- -- Reload buffer to update the dictionary
- vim.cmd("e!")
- else
- vim.notify("Could not open cSpell dictionary", "error", { title = "cSpell" })
- end
-end
-
-return M
diff --git a/config/nvim/spell/en.utf-8.add b/config/nvim/spell/en.utf-8.add
new file mode 100644
index 00000000..4c2b6f33
--- /dev/null
+++ b/config/nvim/spell/en.utf-8.add
@@ -0,0 +1,6 @@
+repl
+EditorConfig
+cmd
+dir
+stylua
+Smoothscroll
diff --git a/config/nvim/spell/en.utf-8.add.spl b/config/nvim/spell/en.utf-8.add.spl
new file mode 100644
index 00000000..9f126f9b
Binary files /dev/null and b/config/nvim/spell/en.utf-8.add.spl differ