chore: update plugins

Allows using astroui's lsp and treesitter based fold methods

lazy-lock.json

@@ -1,79 +1,74 @@
 {
-  "AstroNvim": { "branch": "main", "commit": "cc6dc97f0f059a4ba5dda916ffc137d6609fa0ff" },
+  "AstroNvim": { "branch": "main", "commit": "f9bce33cab08bd3c327f8a1619eba63c9b7262ae" },
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "aerial.nvim": { "branch": "master", "commit": "603156d4fd58963a05f221e76b1a25bc79ed55b0" },
+  "aerial.nvim": { "branch": "master", "commit": "6ab1a0ce4874d21610fc5a67a6c82c7b943c635b" },
-  "astrocommunity": { "branch": "main", "commit": "c87c236dce71107637d2fc30e9dcc116d5d60097" },
+  "astrocommunity": { "branch": "main", "commit": "4e6feff7aa400cf5742c72d03cc238163ed20be6" },
-  "astrocore": { "branch": "main", "commit": "d687e4b66b93783dfdafee1e64d363b7706056ff" },
+  "astrocore": { "branch": "main", "commit": "c797dd5a592e2bd154f2503e231b8a4083659534" },
-  "astrolsp": { "branch": "main", "commit": "4b7df0e3f2ddfa815c7b3eb6793e94f9697629ab" },
+  "astrolsp": { "branch": "main", "commit": "414775e4b49a46bd7105cc5498ea7bb312359bf2" },
-  "astrotheme": { "branch": "main", "commit": "53d093f172c7beb72bae5c0a350880223c2735de" },
+  "astrotheme": { "branch": "main", "commit": "0a3fb361f1e3d6a0cbb42e93f3d01fb5203b6752" },
-  "astroui": { "branch": "main", "commit": "8a9fa27631abc7d466dbdd14f9489d561eb49d67" },
+  "astroui": { "branch": "main", "commit": "4943abbd42674b43249313afe83b91065a40e4be" },
-  "better-escape.nvim": { "branch": "master", "commit": "bb197e51a91a635deb88630813c3bfc284413697" },
+  "better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
-  "clangd_extensions.nvim": { "branch": "main", "commit": "8f7b72100883e0e34400d9518d40a03f21e4d0a6" },
+  "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
-  "cmake-tools.nvim": { "branch": "master", "commit": "f1f917b584127b673c25138233cebf1d61a19f35" },
+  "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "clangd_extensions.nvim": { "branch": "main", "commit": "b67cc417d9020fb4b83d46662351b4d16894905e" },
+  "cmake-tools.nvim": { "branch": "master", "commit": "88e07c6bff838a5bda2f461e9c1122b79ff0829f" },
   "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
-  "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" },
+  "dev-tools.nvim": { "branch": "main", "commit": "96cf12d605f4f2cee0a0b844f8df5d1e8b33db38" },
-  "crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
+  "garbage-day.nvim": { "branch": "main", "commit": "08c46d9d6c918207ee04983c3eb6a89753e960a4" },
-  "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
-  "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" },
+  "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
-  "heirline.nvim": { "branch": "master", "commit": "7a79753c1a42c3f52e89a6c42429e7f871e560cd" },
+  "heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" },
+  "inc-rename.nvim": { "branch": "main", "commit": "8ae25b35ae16ca4bd5de3d3c472eec3b574018d4" },
-  "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
+  "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "fc38521ea4d9ec8dbd4c2819ba8126cea743943b" },
+  "lsplinks.nvim": { "branch": "master", "commit": "94d729170e95298ce86ba41ef66f8756f6062b34" },
-  "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" },
+  "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" },
-  "lsplinks.nvim": { "branch": "master", "commit": "11d7a7177bc39d38a061df4a0ca0de8650853751" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "lspsaga.nvim": { "branch": "main", "commit": "e64351d0e6335eadf089aa2b9f17221e54ca10a4" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
-  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
+  "mason.nvim": { "branch": "main", "commit": "197f6352c276bbc2d25541dfce00ec50d1a4e88f" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
+  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "neo-tree.nvim": { "branch": "main", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" },
-  "mini.bufremove": { "branch": "main", "commit": "1ee294a97e091d3cf967974df622c0d887890dc2" },
+  "neoconf.nvim": { "branch": "main", "commit": "907a1fe4e346aab2989af6848d7d697098506c5e" },
-  "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
+  "neogit": { "branch": "master", "commit": "6617978288d58eb121754b5dd890e893d9a7e8d6" },
-  "neoconf.nvim": { "branch": "main", "commit": "545b57d48d4bbc8f426aade4f2122c8296e9a0c0" },
+  "none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" },
-  "neodev.nvim": { "branch": "main", "commit": "1f4ebcc10852518166ce165e57d425a4265a10d4" },
+  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
-  "neogit": { "branch": "master", "commit": "d55bf6114c6cfba013e4c0e817e29e7752554ab7" },
+  "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
-  "none-ls.nvim": { "branch": "main", "commit": "0e0a940477cc08fa7b1799384a1d668058ed4e61" },
+  "nvim-dap": { "branch": "master", "commit": "14fe46ae16eb272629144a93f7738f5279665a4f" },
-  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
+  "nvim-dap-repl-highlights": { "branch": "master", "commit": "4f4cdb9ccd567512fd4f602e411b8f7ab5f69002" },
-  "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
+  "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
-  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "0671e0eabc6842676d3310370e8fae4e1c51d7f9" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "b42a5ccec7457b44e89f7ed3b3afb1b375bb2093" },
-  "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" },
+  "nvim-lspconfig": { "branch": "master", "commit": "fa2662510d30b06168b6e2e6915518decde6bbac" },
-  "nvim-dap-repl-highlights": { "branch": "master", "commit": "a7512fc0a0de0c0be8d58983939856dda6f72451" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
+  "nvim-spider": { "branch": "main", "commit": "220efa63c20830a9bf0593a57366b96dd5790212" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "52638640ae309cacdaff785fdbb854437bd1ee5c" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-lspconfig": { "branch": "master", "commit": "04680101ff79e99b4e33a4386ec27cbd0d360c75" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" },
-  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
-  "nvim-spider": { "branch": "main", "commit": "b1c542a78522d59432a827f6ec2b28f9422c7e7f" },
+  "nvim-ufo": { "branch": "main", "commit": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94" },
-  "nvim-treesitter": { "branch": "master", "commit": "45e0d66246f31306d890b91301993fa1623e79f1" },
+  "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "b91c98afa6c42819aea6cbc1ba38272f5456a5cf" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
+  "refactoring.nvim": { "branch": "master", "commit": "74b608dfee827c2372250519d433cc21cb083407" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" },
+  "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
-  "nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" },
+  "rustaceanvim": { "branch": "master", "commit": "12504405821c05874d2d1f6b5ec919f9808e2c99" },
-  "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" },
+  "schemastore.nvim": { "branch": "main", "commit": "05924b7383fa17f13f7a7e7ecc8ce83b3c340ce2" },
-  "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
+  "smart-splits.nvim": { "branch": "master", "commit": "ddb23c1a1cf1507bda487cda7f6e4690965ef9f5" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "snacks.nvim": { "branch": "main", "commit": "5eac729fa290248acfe10916d92a5ed5e5c0f9ed" },
-  "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
+  "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
-  "refactoring.nvim": { "branch": "master", "commit": "c406fc5fb4d7ba5fce7b668637075fad6e75e9f8" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "resession.nvim": { "branch": "master", "commit": "c4d92a57b3936a2d6e1c087dbd6b670da2b1b082" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "rustaceanvim": { "branch": "master", "commit": "29f42cc149f915d771c550b6dfe7c788d856cf04" },
+  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
-  "smart-splits.nvim": { "branch": "master", "commit": "0523920a07c54eea7610f342ca8c1bddbee4b626" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope.nvim": { "branch": "master", "commit": "dc6fc321a5ba076697cca89c9d7ea43153276d81" },
-  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "toggleterm.nvim": { "branch": "main", "commit": "137d06fb103952a0fb567882bb8527e2f92d327d" },
   "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
   "vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" },
-  "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
+  "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
   "vim-sandwich": { "branch": "master", "commit": "74cf93d58ccc567d8e2310a69860f1b93af19403" },
   "vim-slint": { "branch": "main", "commit": "9badce3860297562bb5e80ba1666628f9e0ac632" },
-  "vimwiki": { "branch": "dev", "commit": "705ad1e0dded0e3b7ff5fac78547ab67c9d39bdf" },
+  "vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" },
-  "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
+  "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }
 }

lua/lazy_setup.lua

@@ -1,12 +1,11 @@
 require("lazy").setup({
-    spec = {
+    {
-        {
+        "AstroNvim/AstroNvim",
-            "AstroNvim/AstroNvim",
+        version = "^5",
-            -- version = "^4",
+        import = "astronvim.plugins",
-            import = "astronvim.plugins",
-        },
-        { import = "plugins" },
     },
+    { import = "plugins" },
+} --[[@as LazySpec]], {
     install = { colorscheme = { "astrodark", "habamax" } },
     performance = {
         rtp = {

lua/plugins/00-core.lua

@@ -1,13 +1,2 @@
 ---@type LazySpec
-return {
+return {}
-    { "goolord/alpha-nvim", enabled = false },
-    -- Which-key
-    -- {
-    --     "folke/which-key.nvim",
-    --     opts = {
-    --         plugins = {
-    --             registers = false,
-    --         },
-    --     },
-    -- }
-}

lua/plugins/05-community.lua

@@ -7,31 +7,37 @@ return {
 
     -- Language packs
     { enabled = true, import = "astrocommunity.pack.cpp" },
+    { enabled = true, import = "astrocommunity.pack.json" },
     { enabled = true, import = "astrocommunity.pack.lua" },
     { enabled = true, import = "astrocommunity.pack.markdown" },
+    { enabled = true, import = "astrocommunity.pack.rust" },
 
     { enabled = home, import = "astrocommunity.pack.bash" },
-    { enabled = home, import = "astrocommunity.pack.rust" },
+    { enabled = home, import = "astrocommunity.pack.html-css" },
+    { enabled = home, import = "astrocommunity.pack.just" },
+    { enabled = home, import = "astrocommunity.pack.tailwindcss" },
 
     { enabled = work, import = "astrocommunity.pack.cs" },
     { enabled = work, import = "astrocommunity.pack.ps1" },
 
-    { enabled = false, import = "astrocommunity.pack.html-css" },
     { enabled = false, import = "astrocommunity.pack.java" },
     { enabled = false, import = "astrocommunity.pack.proto" },
     { enabled = false, import = "astrocommunity.pack.wgsl" }, -- WebGLShaderLanguage
 
     -- DAP
-    { enabled = home, import = "astrocommunity.debugging.telescope-dap-nvim" },
+    { enabled = true, import = "astrocommunity.debugging.telescope-dap-nvim" },
-    { enabled = home, import = "astrocommunity.debugging.nvim-dap-virtual-text" },
+    { enabled = true, import = "astrocommunity.debugging.nvim-dap-virtual-text" },
-    { enabled = home, import = "astrocommunity.debugging.nvim-dap-repl-highlights" },
+    { enabled = true, import = "astrocommunity.debugging.nvim-dap-repl-highlights" },
+
     -- Motions
     { import = "astrocommunity.syntax.vim-sandwich" }, -- Surround
     { import = "astrocommunity.motion.nvim-spider" }, -- Move in subwords
     -- Lsp
-    { import = "astrocommunity.lsp.lsp-signature-nvim" }, -- Support for lsp signatureHelp
+    { import = "astrocommunity.diagnostics.trouble-nvim" }, -- Diagnostics navigation
+    { import = "astrocommunity.lsp.dev-tools-nvim" }, -- Nicer menus
+    { import = "astrocommunity.lsp.garbage-day-nvim" }, -- Kill unused LSP servers
+    { import = "astrocommunity.lsp.inc-rename-nvim" }, -- Visual renaming of lsp symbols
     { import = "astrocommunity.lsp.lsplinks-nvim" }, -- Support for document links (needed?)
-    { import = "astrocommunity.lsp.lspsaga-nvim" }, -- Nicer menus for LSP
     -- CVS
     { import = "astrocommunity.git.diffview-nvim" }, -- Diff
     { import = "astrocommunity.git.neogit" }, -- Git

lua/plugins/14-options.lua

@@ -3,27 +3,55 @@ return {
     "AstroNvim/astrocore",
     ---@type AstroCoreOpts
     opts = {
+        features = {
+            large_buf = { size = 1024 * 256, lines = 10000 },
+            autopairs = true,
+            cmp = true,
+            diagnostics = { virtual_text = false, virtual_lines = true },
+            highlighturl = true,
+            notifications = true,
+        },
         options = {
             opt = {
                 clipboard = "",
-                cmdheight = 1,
+                cmdheight = 0,
+                diffopt = {
+                    -- default
+                    "internal",
+                    "closeoff",
+                    "filler",
+                    -- end default
+                    "iwhite",
+                    "algorithm:histogram",
+                    "indent-heuristic",
+                    "linematch:60",
+                },
                 expandtab = true,
-                foldmethod = "syntax",
-                foldnestmax = 150,
                 grepprg = vim.fn.executable("rg") and "rg --vimgrep" or nil,
-                guifont = { "VictorMono Nerd Font", "Hack Nerd Font Mono", ":h10" },
+                guifont = {
-                listchars = { tab = "> ", extends = ">", precedes = "<", space = "·" },
+                    "VictorMono Nerd Font",
-                number = true,
+                    "Hack Nerd Font Mono",
-                path = vim.list_extend(vim.opt.path:get(), { "**" }),
+                    ":h10",
+                },
+                listchars = {
+                    tab = "> ",
+                    extends = ">",
+                    precedes = "<",
+                    space = "·",
+                },
+                linebreak = true,
+                breakat = " 	(),;{}[]",
+                showbreak = "",
+                number = false,
+                pumblend = 0,
                 relativenumber = false,
                 shiftwidth = 4,
                 signcolumn = "auto",
                 spell = false,
                 tabstop = 4,
-                textwidth = 120,
+                textwidth = 100,
-                wrap = true,
                 winblend = 0,
-                pumblend = 0,
+                wrap = true,
             },
             g = {
                 neovide_hide_mouse_when_typing = true,

lua/plugins/15-mappings.lua

@@ -5,7 +5,10 @@ return {
     opts = {
         mappings = {
             n = {
-                ["<Leader>e"] = { "<Cmd>Neotree toggle reveal reveal_force_cwd<CR>", desc = "Toggle Explorer" },
+                ["<Leader>e"] = {
+                    "<Cmd>Neotree toggle reveal reveal_force_cwd<CR>",
+                    desc = "Toggle Explorer",
+                },
             },
             t = {
                 ["<Esc>"] = [[<C-\><C-n>]],

lua/plugins/16-commands.lua

@@ -4,12 +4,25 @@ return {
     ---@type AstroCoreOpts
     opts = {
         commands = {
-            TermOpen = {
+            CopyFilename = {
-                function()
+                'let @+=expand("%:p")',
-                    vim.bo.number = false
+                desc = "Copy filename to clipboard",
-                    vim.bo.spell = false
+            },
-                end,
+            P4Edit = {
-                desc = "Remove linenumber in term buffers",
+                "!p4 edit %:p",
+                desc = "Edit in perforce",
+            },
+            P4History = {
+                "!p4vc history %:p",
+                desc = "Perforce history",
+            },
+            P4Timelapse = {
+                "!p4vc tlv %:p",
+                desc = "Perfoce timelapse view",
+            },
+            P4RevisionGraph = {
+                "!p4vc revisiongraph %:p",
+                desc = "Perforce revision graph",
             },
         },
     },

lua/plugins/20-lsp.lua

@@ -1,32 +1,48 @@
 ---@type LazySpec
 return {
-    "AstroNvim/astrolsp",
+    {
-    ---@type AstroLSPOpts
+        "AstroNvim/astrolsp",
-    opts = {
+        optional = true,
-        mappings = {
+        ---@type AstroLSPOpts
-            n = {
+        opts = {
-                gh = {
+            ---@diagnostic disable: missing-fields
-                    function() require("clangd_extensions.switch_source_header").switch_source_header() end,
+            config = {
-                    desc = "Switch to matching source or header file",
+                clangd = {
-                    cond = "textDocument/switchSourceHeader",
+                    filetypes = { "c", "cpp", "objc", "objcpp", "cuda" },
+                    cmd = {
+                        "clangd",
+                        "--header-insertion=never", -- Disable auto includes
+                        "--enable-config", -- Enable .clangd and clangd.yaml files
+                    },
                 },
+                slint_lsp = {
+                    root_dir = function() end, -- Fix missing root_dir issue in neoconf (lspconfig doesn't define it...)
+                },
+                qmlls = {
+                    cmd = { "qmlls6" },
+                },
+            },
+            servers = {
+                "qmlls",
+            },
+            features = {
+                signature_help = true,
+                inlay_hints = true,
+                codelens = true,
+                semantic_tokens = true,
             },
         },
-        ---@diagnostic disable: missing-fields
+    },
-        config = {
+    {
-            clangd = {
+        "zeioth/garbage-day.nvim",
-                filetypes = { "c", "cpp", "objc", "objcpp", "cuda" },
+        optional = true,
-                cmd = {
+        opts = {
-                    "clangd",
+            excluded_lsp_clients = {
-                    "--header-insertion=never", -- Disable auto includes
+                "null-ls",
-                    "--enable-config", -- Enable .clangd and clangd.yaml files
+                "jdtls",
-                },
+                "marksman",
-            },
+                "lua_ls",
-            slint_lsp = {
+                "dev-tools",
-                root_dir = function() end, -- Fix missing root_dir issue in neoconf (lspconfig doesn't define it...)
-            },
-            qmlls = {
-                cmd = { "qmlls6" },
             },
         },
     },

lua/plugins/21-format.lua

@@ -0,0 +1,12 @@
+---@type LazySpec
+return {
+    "stevearc/conform.nvim",
+    optional = true,
+    ---@module "conform"
+    ---@type conform.setupOpts
+    opts = {
+        formatters_by_ft = {
+            rust = { "leptosfmt", lsp_format = "first" },
+        },
+    },
+}

lua/plugins/30-cvs.lua

@@ -1,13 +1,23 @@
 ---@type LazySpec
 return {
-    --[[
     {
-        "lewis6991/gitsigns.nvim",
+        "folke/snacks.nvim",
+        optional = true,
+        --@type snacks.Config
         opts = {
-            signcolumn = false,
+            gitbrowse = {
-            numhl = true,
+                remote_patterns = {
-            current_line_blame_opts = { ignore_whitespace = true },
+                    { "^gitea@(.+):(.+)$", "https://%1/%2" },
+                },
+                url_patterns = {
+                    ["git.niverton.ovh"] = {
+                        branch = "/src/branch/{branch}",
+                        file = "/src/branch/{branch}/{file}#L{line_start}-L{line_end}",
+                        permalink = "/src/commit/{commit}/{file}#L{line_start}-L{line_end}",
+                        commit = "/commit/{commit}",
+                    },
+                },
+            },
         },
     },
-    ]]
 }

lua/plugins/40-heirline.lua

@@ -21,7 +21,9 @@ return {
 
             opts.statusline = {
                 hl = "statusline",
-                comp.mode({ mode_text = { hl = { bold = true }, padding = { left = 1, right = 1 } } }),
+                comp.mode({
+                    mode_text = { hl = { bold = true }, padding = { left = 1, right = 1 } },
+                }),
                 comp.file_info({
                     filetype = false,
                     filename = {
@@ -37,7 +39,7 @@ return {
                 comp.treesitter({ padding = { right = 1 } }), -- Extra space to separate from next component
                 comp.git_diff(),
                 comp.git_branch(),
-                comp.nav({ scrollbar = false }),
+                comp.nav({ scrollbar = false, padding = { right = 1 } }),
             }
 
             local get_file_path = status.provider.filename({
@@ -53,11 +55,15 @@ return {
             end
 
             opts.winbar = {
-                init = function(self) self.bufnr = vim.api.nvim_get_current_buf() end,
+                init = function(self)
+                    self.bufnr = vim.api.nvim_get_current_buf()
+                end,
                 fallthrough = false,
                 {
                     -- Display file path when window is not active
-                    condition = function() return not status.condition.is_active() end,
+                    condition = function()
+                        return not status.condition.is_active()
+                    end,
                     {
                         -- Set display priority to hide when component is too big to fit
                         flexible = 1,

lua/plugins/50-user.lua

@@ -1,6 +1,6 @@
 ---@type LazySpec
 return {
-    -- { "echasnovski/mini.align", event = "User AstroFile" },
     { "tpope/vim-abolish", event = "User AstroFile" },
     { "slint-ui/vim-slint", ft = "slint" },
+    -- { "stevearc/profile.nvim", lazy = false }, -- Profiling lua
 }

stylua.toml

@@ -1,8 +1,8 @@
-column_width = 120
+column_width = 100
 line_endings = "Unix"
 indent_type = "Spaces"
 call_parentheses = "Always"
-collapse_simple_statement = "Always"
+collapse_simple_statement = "Never"
 
 [sort_requires]
 enabled = true