chore: update plugins

Allows using astroui's lsp and treesitter based fold methods

init.lua

@@ -1,5 +1,5 @@
 local lazypath = vim.env.LAZY or vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not (vim.env.LAZY or vim.loop.fs_stat(lazypath)) then
+if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
     vim.g.astronvim_first_install = true
     vim.fn.system({
         "git",

lazy-lock.json

@@ -1,78 +1,74 @@
 {
-  "AstroNvim": { "branch": "v4", "commit": "4b1788e9f6d87d7510a0eafa1fb52425efda959e" },
+  "AstroNvim": { "branch": "main", "commit": "f9bce33cab08bd3c327f8a1619eba63c9b7262ae" },
-  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
+  "aerial.nvim": { "branch": "master", "commit": "6ab1a0ce4874d21610fc5a67a6c82c7b943c635b" },
-  "aerial.nvim": { "branch": "master", "commit": "993142d49274092c64a2d475aa726df3c323949d" },
+  "astrocommunity": { "branch": "main", "commit": "4e6feff7aa400cf5742c72d03cc238163ed20be6" },
-  "astrocommunity": { "branch": "v4", "commit": "632e3b7790f86c3452bed9b7e4395e23fb7d9994" },
+  "astrocore": { "branch": "main", "commit": "c797dd5a592e2bd154f2503e231b8a4083659534" },
-  "astrocore": { "branch": "main", "commit": "027e12b93d70cae4063f97b38d782718b0160c98" },
+  "astrolsp": { "branch": "main", "commit": "414775e4b49a46bd7105cc5498ea7bb312359bf2" },
-  "astrolsp": { "branch": "main", "commit": "cd9b51f260da4e16c723d9461740b605ec045cc2" },
+  "astrotheme": { "branch": "main", "commit": "0a3fb361f1e3d6a0cbb42e93f3d01fb5203b6752" },
-  "astrotheme": { "branch": "main", "commit": "9afb9e9a76544ada1bd93975f32a5841a6a4b310" },
+  "astroui": { "branch": "main", "commit": "4943abbd42674b43249313afe83b91065a40e4be" },
-  "astroui": { "branch": "main", "commit": "d51b2e815164a371ce2dea2b46facdf971f8d5d1" },
+  "better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
-  "better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" },
+  "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
-  "clangd_extensions.nvim": { "branch": "main", "commit": "34c8eaa12be192e83cd4865ce2375e9f53e728f2" },
+  "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
-  "cmake-tools.nvim": { "branch": "master", "commit": "a4cd0b3a2c8a166a54b36bc00579954426748959" },
+  "clangd_extensions.nvim": { "branch": "main", "commit": "b67cc417d9020fb4b83d46662351b4d16894905e" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmake-tools.nvim": { "branch": "master", "commit": "88e07c6bff838a5bda2f461e9c1122b79ff0829f" },
   "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "dev-tools.nvim": { "branch": "main", "commit": "96cf12d605f4f2cee0a0b844f8df5d1e8b33db38" },
-  "conform.nvim": { "branch": "master", "commit": "bf109f061fc3cd75394b7823923187ae045cbf22" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "crates.nvim": { "branch": "main", "commit": "b4f4987ccdb1cc3899ee541ef4375c73c48c4570" },
+  "garbage-day.nvim": { "branch": "main", "commit": "08c46d9d6c918207ee04983c3eb6a89753e960a4" },
-  "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
-  "dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" },
+  "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
-  "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
+  "heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" },
-  "gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" },
+  "inc-rename.nvim": { "branch": "main", "commit": "8ae25b35ae16ca4bd5de3d3c472eec3b574018d4" },
-  "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "heirline.nvim": { "branch": "master", "commit": "03cff30d7e7d3ba6fdc00925f015822f79cef908" },
+  "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
+  "lsplinks.nvim": { "branch": "master", "commit": "94d729170e95298ce86ba41ef66f8756f6062b34" },
-  "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
+  "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
-  "lsplinks.nvim": { "branch": "master", "commit": "eda2acee14c0e39d9efbadb5d067a7cda2a5cc31" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" },
+  "mason.nvim": { "branch": "main", "commit": "197f6352c276bbc2d25541dfce00ec50d1a4e88f" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
+  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
-  "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
+  "neo-tree.nvim": { "branch": "main", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" },
-  "mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" },
+  "neoconf.nvim": { "branch": "main", "commit": "907a1fe4e346aab2989af6848d7d697098506c5e" },
-  "neo-tree.nvim": { "branch": "main", "commit": "6011391412b003ffbaf5615d6df8ade154726117" },
+  "neogit": { "branch": "master", "commit": "6617978288d58eb121754b5dd890e893d9a7e8d6" },
-  "neoconf.nvim": { "branch": "main", "commit": "8137a976a5eb55d8d1a4950f7afe28861affa3db" },
+  "none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" },
-  "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
+  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
-  "neogit": { "branch": "master", "commit": "55eb562bf4ef7d2c370291e3185421c3333999ee" },
+  "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
-  "none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" },
+  "nvim-dap": { "branch": "master", "commit": "14fe46ae16eb272629144a93f7738f5279665a4f" },
-  "none-ls.nvim": { "branch": "main", "commit": "72e25ed4162474ef5d666525853f8a42bffd97c5" },
+  "nvim-dap-repl-highlights": { "branch": "master", "commit": "4f4cdb9ccd567512fd4f602e411b8f7ab5f69002" },
-  "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
+  "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
-  "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "b42a5ccec7457b44e89f7ed3b3afb1b375bb2093" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "fa2662510d30b06168b6e2e6915518decde6bbac" },
-  "nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-dap-repl-highlights": { "branch": "master", "commit": "902d533b2682c26d6be4f8a4d1dfd895cbba4840" },
+  "nvim-spider": { "branch": "main", "commit": "220efa63c20830a9bf0593a57366b96dd5790212" },
-  "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d67715d3b746a19e951b6b0a99663fa909bb9e64" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-nio": { "branch": "master", "commit": "ed70af8ad9d4dafdb55539ed2b4454aac2a2a0c3" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
-  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
+  "nvim-ufo": { "branch": "main", "commit": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94" },
-  "nvim-spider": { "branch": "main", "commit": "bcc9fa38a62637491b75b02e364191553fd858a2" },
+  "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
-  "nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "nvim-treesitter": { "branch": "master", "commit": "36860295919fb18e57cd637b2a5f22e16f750c2f" },
+  "refactoring.nvim": { "branch": "master", "commit": "74b608dfee827c2372250519d433cc21cb083407" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" },
+  "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
+  "rustaceanvim": { "branch": "master", "commit": "12504405821c05874d2d1f6b5ec919f9808e2c99" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
+  "schemastore.nvim": { "branch": "main", "commit": "05924b7383fa17f13f7a7e7ecc8ce83b3c340ce2" },
-  "nvim-ufo": { "branch": "main", "commit": "c1e8102e4e954e1c46f46cda2587769238e24f16" },
+  "smart-splits.nvim": { "branch": "master", "commit": "ddb23c1a1cf1507bda487cda7f6e4690965ef9f5" },
-  "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" },
+  "snacks.nvim": { "branch": "main", "commit": "5eac729fa290248acfe10916d92a5ed5e5c0f9ed" },
-  "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
+  "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
-  "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "refactoring.nvim": { "branch": "master", "commit": "d2786877c91aa409c824f27b4ce8a9f560dda60a" },
+  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
-  "resession.nvim": { "branch": "master", "commit": "742aba4998123fc11f490a3aeffe8f550b2cb789" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "rustaceanvim": { "branch": "master", "commit": "b0548ff58d34caa220f8806c518fedb6453fc48e" },
-  "smart-splits.nvim": { "branch": "master", "commit": "83bdcc3db3b272a6e73b0f3aea0f5bc0a8da2696" },
-  "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
-  "telescope.nvim": { "branch": "master", "commit": "c816406bd50ade6ec754474f08974154487d417c" },
-  "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
-  "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
   "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
-  "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" },
+  "vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" },
-  "vimwiki": { "branch": "dev", "commit": "69318e74c88ef7677e2496fd0a836446ceac61e8" },
+  "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
-  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
+  "vim-sandwich": { "branch": "master", "commit": "74cf93d58ccc567d8e2310a69860f1b93af19403" },
+  "vim-slint": { "branch": "main", "commit": "9badce3860297562bb5e80ba1666628f9e0ac632" },
+  "vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" },
+  "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }
 }

lua/lazy_setup.lua

@@ -1,13 +1,11 @@
 require("lazy").setup({
-    spec = {
-        -- TODO: remove branch v4 on release
     {
         "AstroNvim/AstroNvim",
-            branch = "v4",
+        version = "^5",
         import = "astronvim.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

@@ -3,33 +3,40 @@ local work = not home
 
 ---@type LazySpec
 return {
-    { "AstroNvim/astrocommunity", branch = "v4" },
+    { "AstroNvim/astrocommunity" },
 
     -- 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.motion.nvim-surround" }, -- Surround
+    { 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?)
     -- CVS
     { import = "astrocommunity.git.diffview-nvim" }, -- Diff
@@ -37,4 +44,5 @@ return {
     -- Tools
     { import = "astrocommunity.editing-support.conform-nvim" },
     { import = "astrocommunity.editing-support.refactoring-nvim" },
+    { import = "astrocommunity.syntax.vim-easy-align" },
 }

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,
+                winblend = 0,
                 wrap = true,
-                winblend = 50,
-                pumblend = 30,
             },
             g = {
                 neovide_hide_mouse_when_typing = true,

lua/plugins/15-mappings.lua

@@ -4,6 +4,12 @@ return {
     ---@type AstroCoreOpts
     opts = {
         mappings = {
+            n = {
+                ["<Leader>e"] = {
+                    "<Cmd>Neotree toggle reveal reveal_force_cwd<CR>",
+                    desc = "Toggle Explorer",
+                },
+            },
             t = {
                 ["<Esc>"] = [[<C-\><C-n>]],
                 ["<A-h>"] = [[<C-\><C-N><C-w>h]],

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,17 +1,10 @@
 ---@type LazySpec
 return {
+    {
         "AstroNvim/astrolsp",
+        optional = true,
         ---@type AstroLSPOpts
         opts = {
-        mappings = {
-            n = {
-                gh = {
-                    function() require("clangd_extensions.switch_source_header").switch_source_header() end,
-                    desc = "Switch to matching source or header file",
-                    cond = "textDocument/switchSourceHeader",
-                },
-            },
-        },
             ---@diagnostic disable: missing-fields
             config = {
                 clangd = {
@@ -22,6 +15,35 @@ return {
                         "--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,
+            },
+        },
+    },
+    {
+        "zeioth/garbage-day.nvim",
+        optional = true,
+        opts = {
+            excluded_lsp_clients = {
+                "null-ls",
+                "jdtls",
+                "marksman",
+                "lua_ls",
+                "dev-tools",
+            },
         },
     },
 }

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/25-comp.lua

@@ -1,23 +1,4 @@
 ---@type LazySpec
 return {
-    {
+    { "L3MON4D3/LuaSnip", enabled = false },
-        "astronvim/astrocore",
-        opts = {
-            commands = {
-                LuaSnipExitOnModeChange = {
-                    function(evt)
-                        local ok, luasnip = pcall(require, "luasnip")
-                        if
-                            ok
-                            and luasnip.session
-                            and luasnip.session.current_nodes[evt.buf]
-                            and not luasnip.session.jump_active
-                        then
-                            luasnip.unlink_current()
-                        end
-                    end,
-                },
-            },
-        },
-    },
 }

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,5 +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