chore: update plugins

Allows using astroui's lsp and treesitter based fold methods

.neoconf.json

@@ -0,0 +1,20 @@
+{
+  "neodev": {
+    "library": {
+      "enabled": true,
+      "plugins": true
+    }
+  },
+  "neoconf": {
+    "plugins": {
+      "lua_ls": {
+        "enabled": true
+      }
+    }
+  },
+  "lspconfig": {
+    "lua_ls": {
+      "Lua.format.enable": false
+    }
+  }
+}

.stylua.toml

@@ -0,0 +1,7 @@
+column_width = 120
+line_endings = "Unix"
+indent_type = "Spaces"
+indent_width = 2
+quote_style = "AutoPreferDouble"
+call_parentheses = "None"
+collapse_simple_statement = "Always"

init.lua

@@ -1,4 +1,24 @@
--- bootstrap lazy.nvim, AstroNvim, and user plugins
+local lazypath = vim.env.LAZY or vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-require("config.lazy")
+if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
--- run polish file at the very end
+    vim.g.astronvim_first_install = true
-pcall(require, "config.polish")
+    vim.fn.system({
+        "git",
+        "clone",
+        "--filter=blob:none",
+        "https://github.com/folke/lazy.nvim.git",
+        "--branch=stable",
+        lazypath,
+    })
+end
+vim.opt.rtp:prepend(lazypath)
+
+if not pcall(require, "lazy") then
+    vim.api.nvim_echo({
+        { ("Unable to load lazy from: %s\n"):format(lazypath), "ErrorMsg" },
+        { "Press any key to exit...", "MoreMsg" },
+    }, true, {})
+    vim.fn.getchar()
+    vim.cmd.quit()
+end
+
+require("lazy_setup")

lazy-lock.json

@@ -1,66 +1,74 @@
 {
-  "AstroNvim": { "branch": "v4", "commit": "865c34d9be8dff1ce7277085459fd1050c07b81b" },
+  "AstroNvim": { "branch": "main", "commit": "f9bce33cab08bd3c327f8a1619eba63c9b7262ae" },
-  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "954c81b53989097faaff0fabc11c29575288c3e1" },
+  "aerial.nvim": { "branch": "master", "commit": "6ab1a0ce4874d21610fc5a67a6c82c7b943c635b" },
-  "aerial.nvim": { "branch": "master", "commit": "ef08437108247d8805ae388f2699537eac2fd810" },
+  "astrocommunity": { "branch": "main", "commit": "4e6feff7aa400cf5742c72d03cc238163ed20be6" },
-  "astrobox": { "branch": "main", "commit": "b4d05200d32adfbc7c719b556d21476f80f0e36d" },
+  "astrocore": { "branch": "main", "commit": "c797dd5a592e2bd154f2503e231b8a4083659534" },
-  "astrocommunity": { "branch": "v4", "commit": "f58e86d0391e44d4847de749840a42c08c3b4039" },
+  "astrolsp": { "branch": "main", "commit": "414775e4b49a46bd7105cc5498ea7bb312359bf2" },
-  "astrocore": { "branch": "main", "commit": "e5d3846e82bc32aa2ddcd124466373a29112cb2d" },
+  "astrotheme": { "branch": "main", "commit": "0a3fb361f1e3d6a0cbb42e93f3d01fb5203b6752" },
-  "astrolsp": { "branch": "main", "commit": "d875f27c60b313f3de3c7d092026d8c9380a6039" },
+  "astroui": { "branch": "main", "commit": "4943abbd42674b43249313afe83b91065a40e4be" },
-  "astrotheme": { "branch": "main", "commit": "208d85fcc2fa19351d55b584666ea0b2ddf9db4e" },
+  "better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
-  "astroui": { "branch": "main", "commit": "3bdab235369ce132aa022f2aa81a4ccc038e2920" },
+  "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
-  "better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" },
+  "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
-  "clangd_extensions.nvim": { "branch": "main", "commit": "34c8eaa12be192e83cd4865ce2375e9f53e728f2" },
+  "clangd_extensions.nvim": { "branch": "main", "commit": "b67cc417d9020fb4b83d46662351b4d16894905e" },
-  "cmake-tools.nvim": { "branch": "master", "commit": "4e9d9f24c29dfd05f928a81b57ef5458c2e74ab0" },
+  "cmake-tools.nvim": { "branch": "master", "commit": "88e07c6bff838a5bda2f461e9c1122b79ff0829f" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" },
-  "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" },
+  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
+  "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "dev-tools.nvim": { "branch": "main", "commit": "96cf12d605f4f2cee0a0b844f8df5d1e8b33db38" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "crates.nvim": { "branch": "main", "commit": "b8ea20fda2e1029fbbb1bae7a9eab35c84037ca0" },
+  "garbage-day.nvim": { "branch": "main", "commit": "08c46d9d6c918207ee04983c3eb6a89753e960a4" },
-  "dressing.nvim": { "branch": "master", "commit": "8b7ae53d7f04f33be3439a441db8071c96092d19" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
-  "ferris.nvim": { "branch": "main", "commit": "ecc3b463ca8b138ce6a1eaab56c9b9e36d8fb29f" },
+  "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
-  "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
+  "heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" },
-  "gitsigns.nvim": { "branch": "main", "commit": "87640f5a877b18bdd49884dbcac220fed924b867" },
+  "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": "170e1b1fd7c11db00e46d802165fb277db601ae7" },
+  "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "7206c77cb931f79885fc47f88ae18f99148392eb" },
+  "lsplinks.nvim": { "branch": "master", "commit": "94d729170e95298ce86ba41ef66f8756f6062b34" },
-  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
+  "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" },
-  "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" },
+  "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "d1f7258f80867f718d643d88eee66959671a4bef" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "5b4db7c0d6873436b42bcda0ba7cd4efa9206745" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
-  "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
+  "mason.nvim": { "branch": "main", "commit": "197f6352c276bbc2d25541dfce00ec50d1a4e88f" },
-  "mini.align": { "branch": "main", "commit": "c5ab28809c630b65ffe069b564ce1d473bbcb332" },
+  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
-  "mini.bufremove": { "branch": "main", "commit": "f53c7f27e36009fe61563c11cde154b94a0e5b94" },
+  "neo-tree.nvim": { "branch": "main", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" },
-  "mini.indentscope": { "branch": "main", "commit": "c8fdafa7bf603d758986a27eb546c55a5c73b1a3" },
+  "neoconf.nvim": { "branch": "main", "commit": "907a1fe4e346aab2989af6848d7d697098506c5e" },
-  "neo-tree.nvim": { "branch": "main", "commit": "9298c1b7a52e63ed4fd977fd792a0d4afe9260d5" },
+  "neogit": { "branch": "master", "commit": "6617978288d58eb121754b5dd890e893d9a7e8d6" },
-  "neoconf.nvim": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" },
+  "none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" },
-  "neodev.nvim": { "branch": "main", "commit": "c4ce017bd4bacf60bf59330cec9e93c5d5e104a6" },
+  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
-  "none-ls.nvim": { "branch": "main", "commit": "45d0e8fa9094dcc3fabad9065a5822af9cf099c7" },
+  "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
-  "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" },
+  "nvim-dap": { "branch": "master", "commit": "14fe46ae16eb272629144a93f7738f5279665a4f" },
-  "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" },
+  "nvim-dap-repl-highlights": { "branch": "master", "commit": "4f4cdb9ccd567512fd4f602e411b8f7ab5f69002" },
-  "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
+  "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-dap": { "branch": "master", "commit": "bbe2c6f3438542a37cc2141a8e385f7dfe07d87d" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "b42a5ccec7457b44e89f7ed3b3afb1b375bb2093" },
-  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
+  "nvim-lspconfig": { "branch": "master", "commit": "fa2662510d30b06168b6e2e6915518decde6bbac" },
-  "nvim-lspconfig": { "branch": "master", "commit": "bd405e45c5fb122c16af8f87fa2dd7ab1981b243" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
+  "nvim-spider": { "branch": "main", "commit": "220efa63c20830a9bf0593a57366b96dd5790212" },
-  "nvim-treesitter": { "branch": "master", "commit": "b6b9ca448b7f236e2e60f8393a729902511f9db9" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
-  "nvim-ufo": { "branch": "main", "commit": "9fa77fb7e4365a053a5303b773aaf5eaf806d1f4" },
+  "nvim-ufo": { "branch": "main", "commit": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94" },
-  "nvim-web-devicons": { "branch": "master", "commit": "8b2e5ef9eb8a717221bd96cb8422686d65a09ed5" },
+  "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
-  "nvim-window-picker": { "branch": "main", "commit": "e7b6699fbd007bbe61dc444734b9bade445b2984" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
+  "refactoring.nvim": { "branch": "master", "commit": "74b608dfee827c2372250519d433cc21cb083407" },
-  "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" },
+  "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" },
-  "resession.nvim": { "branch": "master", "commit": "dc8825439c619030925543a444c4186a2487c200" },
+  "rustaceanvim": { "branch": "master", "commit": "12504405821c05874d2d1f6b5ec919f9808e2c99" },
-  "smart-splits.nvim": { "branch": "master", "commit": "c970c7a3cc7ba635fd73d43c81b40f04c00f5058" },
+  "schemastore.nvim": { "branch": "main", "commit": "05924b7383fa17f13f7a7e7ecc8ce83b3c340ce2" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "smart-splits.nvim": { "branch": "master", "commit": "ddb23c1a1cf1507bda487cda7f6e4690965ef9f5" },
-  "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" },
+  "snacks.nvim": { "branch": "main", "commit": "5eac729fa290248acfe10916d92a5ed5e5c0f9ed" },
-  "toggleterm.nvim": { "branch": "main", "commit": "cbd041d91b90cd3c02df03fe6133208888f8e008" },
+  "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
-  "vimwiki": { "branch": "dev", "commit": "0bb1b4945bb205a076a35b66174e5d66be8eaafe" },
+  "vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" },
-  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
+  "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
-}
+  "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/config/lazy.lua

@@ -1,45 +0,0 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-    vim.g.astronvim_first_install = true -- lets AstroNvim know that this is an initial installation
-    vim.fn.system {
-        "git",
-        "clone",
-        "--filter=blob:none",
-        "https://github.com/folke/lazy.nvim.git",
-        "--branch=stable",
-        lazypath,
-    }
-end
-vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
-
--- TODO: set to true on release
--- Whether or not to use stable releases of AstroNvim
-local USE_STABLE = false
-
-require("lazy").setup {
-    dev = {
-        path = "~/Workspace",
-        patterns = {},
-        fallback = true, -- Fallback to git when local plugin doesn't exist
-    },
-    spec = {
-        -- TODO: remove branch v4 on release
-        { "AstroNvim/AstroNvim",              branch = "v4",    version = USE_STABLE and "^4" or nil, import = "astronvim.plugins" },
-        -- pin plugins to known working versions
-        { import = "astronvim.lazy_snapshot", cond = USE_STABLE },
-        { import = "plugins" },
-    },
-    install = { colorscheme = { "astrodark", "habamax" } },
-    performance = {
-        rtp = {
-            -- disable some rtp plugins, add more to your liking
-            disabled_plugins = {
-                "gzip",
-                "netrwPlugin",
-                "tarPlugin",
-                "tohtml",
-                "zipPlugin",
-            },
-        },
-    },
-}

lua/config/options.lua

@@ -1,22 +0,0 @@
-vim.opt.background = "dark"
-vim.opt.clipboard = ""
-vim.opt.cmdheight = 1
-vim.opt.expandtab = true
-vim.opt.foldmethod = "syntax"
-vim.opt.foldnestmax = 150
-vim.opt.grepprg = vim.fn.executable("rg") and "rg --vimgrep" or nil
-vim.opt.guifont = { "VictorMono Nerd Font", "VictorMono NF", "Hack Nerd Font Mono", ":h10" }
-vim.opt.listchars = { tab = "> ", extends = ">", precedes = "<", space = "·" }
-vim.opt.number = true
-vim.opt.relativenumber = false
-vim.opt.shiftwidth = 4
-vim.opt.signcolumn = "auto"
-vim.opt.spell = false
-vim.opt.tabstop = 4
-vim.opt.textwidth = 120
-vim.opt.wrap = true
-
-vim.opt.path:append("**") -- recursive search for find
-
--- Globals
-vim.g.rust_recommended_style = 0

lua/lazy_setup.lua

@@ -0,0 +1,27 @@
+require("lazy").setup({
+    {
+        "AstroNvim/AstroNvim",
+        version = "^5",
+        import = "astronvim.plugins",
+    },
+    { import = "plugins" },
+} --[[@as LazySpec]], {
+    install = { colorscheme = { "astrodark", "habamax" } },
+    performance = {
+        rtp = {
+            -- disable some rtp plugins, add more to your liking
+            disabled_plugins = {
+                "gzip",
+                "netrwPlugin",
+                "tarPlugin",
+                "tohtml",
+                "zipPlugin",
+            },
+        },
+    },
+    dev = {
+        path = "~/Workspace",
+        patterns = {},
+        fallback = true, -- Fallback to git when local plugin doesn't exist
+    },
+}) --[[@as LazyConfig]]

lua/plugins/00-core.lua

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

lua/plugins/05-community.lua

@@ -1,26 +1,48 @@
 local home = vim.fn.hostname() == "comanche"
 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.cpp" },
-    { enabled = true,  import = "astrocommunity.pack.lua" },
+    { enabled = true, import = "astrocommunity.pack.json" },
-    { enabled = true,  import = "astrocommunity.pack.markdown" },
+    { enabled = true, import = "astrocommunity.pack.lua" },
-    { enabled = home,  import = "astrocommunity.pack.rust" },
+    { enabled = true, import = "astrocommunity.pack.markdown" },
-    { enabled = home,  import = "astrocommunity.pack.bash" },
+    { enabled = true, import = "astrocommunity.pack.rust" },
-    { enabled = work,  import = "astrocommunity.pack.cs" },
+
-    { enabled = work,  import = "astrocommunity.pack.ps1" },
+    { enabled = home, import = "astrocommunity.pack.bash" },
-    { enabled = false, import = "astrocommunity.pack.html-css" },
+    { 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.java" },
+    { enabled = false, import = "astrocommunity.pack.proto" },
     { enabled = false, import = "astrocommunity.pack.wgsl" }, -- WebGLShaderLanguage
 
     -- DAP
-    -- Figure out if needed when you finaly try to use the DAP
+    { enabled = true, import = "astrocommunity.debugging.telescope-dap-nvim" },
-    -- { import = "astrocommunity.debugging.telescope-dap-nvim" },
+    { enabled = true, import = "astrocommunity.debugging.nvim-dap-virtual-text" },
-    -- { import = "astrocommunity.debugging.nvim-dap-virtual-text" },
+    { enabled = true, import = "astrocommunity.debugging.nvim-dap-repl-highlights" },
-    -- { import = "astrocommunity.debugging.nvim-dap-repl-highlights" },
 
-    -- Others
+    -- Motions
-    -- { import = "astrocommunity.debugging.nvim-bqf" },
+    { import = "astrocommunity.syntax.vim-sandwich" }, -- Surround
+    { import = "astrocommunity.motion.nvim-spider" }, -- Move in subwords
+    -- Lsp
+    { 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
+    { import = "astrocommunity.git.neogit" }, -- Git
+    -- Tools
+    { import = "astrocommunity.editing-support.conform-nvim" },
+    { import = "astrocommunity.editing-support.refactoring-nvim" },
+    { import = "astrocommunity.syntax.vim-easy-align" },
 }

lua/plugins/10-colorscheme.lua

@@ -1,3 +1,4 @@
+---@type LazySpec
 return {
     {
         "AstroNvim/astroui",
@@ -8,10 +9,10 @@ return {
     },
     {
         name = "astrobox",
-        url = "https://git.niverton.tk/niverton/Astrobox.git",
+        url = "https://git.niverton.ovh/niverton/Astrobox.git",
         dev = true, -- Use local dir if available
         opts = {
-            contrast = "hard"
+            contrast = "hard",
-        }
+        },
     },
 }

lua/plugins/14-options.lua

@@ -0,0 +1,64 @@
+---@type LazySpec
+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 = 0,
+                diffopt = {
+                    -- default
+                    "internal",
+                    "closeoff",
+                    "filler",
+                    -- end default
+                    "iwhite",
+                    "algorithm:histogram",
+                    "indent-heuristic",
+                    "linematch:60",
+                },
+                expandtab = true,
+                grepprg = vim.fn.executable("rg") and "rg --vimgrep" or nil,
+                guifont = {
+                    "VictorMono Nerd Font",
+                    "Hack Nerd Font Mono",
+                    ":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 = 100,
+                winblend = 0,
+                wrap = true,
+            },
+            g = {
+                neovide_hide_mouse_when_typing = true,
+                neovide_theme = "auto",
+                neovide_floating_shadow = false,
+                rust_recommended_style = 0,
+            },
+        },
+    },
+}

lua/plugins/15-mappings.lua

@@ -1,16 +1,22 @@
--- return {
+---@type LazySpec
---     "AstroNvim/astrocore",
+return {
---     ---@type AstroCoreOpts
+    "AstroNvim/astrocore",
---     opts = {
+    ---@type AstroCoreOpts
---         mappings = {
+    opts = {
---             t = {
+        mappings = {
---                 ["<Esc>"] = [[<C-\><C-n>]],
+            n = {
---                 ["<A-h>"] = [[<C-\><C-N><C-w>h]],
+                ["<Leader>e"] = {
---                 ["<A-j>"] = [[<C-\><C-N><C-w>j]],
+                    "<Cmd>Neotree toggle reveal reveal_force_cwd<CR>",
---                 ["<A-k>"] = [[<C-\><C-N><C-w>k]],
+                    desc = "Toggle Explorer",
---                 ["<A-l>"] = [[<C-\><C-N><C-w>l]],
+                },
---             },
+            },
---         },
+            t = {
---     },
+                ["<Esc>"] = [[<C-\><C-n>]],
--- }
+                ["<A-h>"] = [[<C-\><C-N><C-w>h]],
-return {}
+                ["<A-j>"] = [[<C-\><C-N><C-w>j]],
+                ["<A-k>"] = [[<C-\><C-N><C-w>k]],
+                ["<A-l>"] = [[<C-\><C-N><C-w>l]],
+            },
+        },
+    },
+}

lua/plugins/16-commands.lua

@@ -1,14 +1,28 @@
+---@type LazySpec
 return {
     "AstroNvim/astrocore",
     ---@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,18 +1,49 @@
+---@type LazySpec
 return {
-    "AstroNvim/astrolsp",
+    {
-    ---@type AstroLSPOpts
+        "AstroNvim/astrolsp",
-    opts = {
+        optional = true,
-        features = {
+        ---@type AstroLSPOpts
-            autoformat = false,
+        opts = {
-            inlay_hints = true,
+            ---@diagnostic disable: missing-fields
-        },
+            config = {
-        formatting = {
+                clangd = {
-            format_on_save = {
+                    filetypes = { "c", "cpp", "objc", "objcpp", "cuda" },
-                enabled = false,
+                    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,
+            },
+        },
+    },
+    {
+        "zeioth/garbage-day.nvim",
+        optional = true,
+        opts = {
+            excluded_lsp_clients = {
+                "null-ls",
+                "jdtls",
+                "marksman",
+                "lua_ls",
+                "dev-tools",
             },
-            timeout_ms = 1000,
         },
-        -- mappings to be set up on attaching of a language server
-        mappings = {},
     },
 }

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

@@ -0,0 +1,4 @@
+---@type LazySpec
+return {
+    { "L3MON4D3/LuaSnip", enabled = false },
+}

lua/plugins/30-cvs.lua

@@ -1,12 +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

@@ -1,82 +1,107 @@
+---@type LazySpec
 return {
-    "rebelot/heirline.nvim",
+    {
-    optional = true,
+        "AstroNvim/astroui",
-    opts = function(_, opts)
+        opts = {
-        local status = require("astroui.status")
+            status = {
-
+                attributes = {
-        opts.statusline = {
+                    buffer_active = { bold = true, italic = false },
-            hl = { fg = "fg", bg = "bg" },
+                    tab_active = { bold = true },
-            status.component.mode { mode_text = { hl = { bold = true }, padding = { left = 1, right = 1 } } },
-            status.component.file_info {
-                filetype = false,
-                filename = {
-                    modify = ":~:.",
                 },
-                file_modified = {},
+                colors = require("astrobox.heirline").setup_colors,
             },
-            status.component.diagnostics(),
+        },
-            status.component.fill(),
+    },
-            status.component.cmd_info(),
+    {
-            status.component.fill(),
+        "rebelot/heirline.nvim",
-            status.component.lsp(),
+        optional = true,
-            status.component.treesitter { padding = { right = 1 } }, -- Extra space to separate from next component
+        opts = function(_, opts)
-            status.component.git_diff(),
+            local status = require("astroui.status")
-            status.component.git_branch(),
+            local comp = status.component
-            status.component.nav { scrollbar = false },
-        }
 
-        local get_file_path = status.provider.filename {
+            opts.statusline = {
-            modify = ":~:.:h", -- Relative path and cut filename
+                hl = "statusline",
-        }
+                comp.mode({
-        -- Fix path separation on windows
+                    mode_text = { hl = { bold = true }, padding = { left = 1, right = 1 } },
-        local path_func = get_file_path
+                }),
-        if vim.fn.has("win32") then
+                comp.file_info({
-            path_func = function(self)
+                    filetype = false,
-                local str = get_file_path(self)
+                    filename = {
-                return string.gsub(str, "\\", "/")
+                        modify = ":~:.",
+                    },
+                    file_modified = {},
+                }),
+                comp.diagnostics(),
+                comp.fill(),
+                comp.cmd_info(),
+                comp.fill(),
+                comp.lsp(),
+                comp.treesitter({ padding = { right = 1 } }), -- Extra space to separate from next component
+                comp.git_diff(),
+                comp.git_branch(),
+                comp.nav({ scrollbar = false, padding = { right = 1 } }),
+            }
+
+            local get_file_path = status.provider.filename({
+                modify = ":~:.:h", -- Relative path and cut filename
+            })
+            -- Fix path separation on windows
+            local path_func = get_file_path
+            if vim.fn.has("win32") then
+                path_func = function(self)
+                    local str = get_file_path(self)
+                    return string.gsub(str, "\\", "/")
+                end
             end
-        end
 
-        opts.winbar = {
+            opts.winbar = {
-            init = function(self) self.bufnr = vim.api.nvim_get_current_buf() end,
+                init = function(self)
-            fallthrough = false,
+                    self.bufnr = vim.api.nvim_get_current_buf()
-            {
+                end,
-                condition = function() return not status.condition.is_active() end,
+                fallthrough = false,
                 {
-                    -- Set display priority to hide when component is too big to fit
+                    -- Display file path when window is not active
-                    flexible = 1,
+                    condition = function()
-                    status.component.separated_path {
+                        return not status.condition.is_active()
-                        flexible = 2,
+                    end,
-                        max_depth = 5,
-                        path_func = path_func,
-                    },
-                    status.component.separated_path {
-                        flexible = 3,
-                        max_depth = 3,
-                        path_func = path_func,
-                    },
-                    status.component.separated_path {
-                        flexible = 4,
-                        max_depth = 1,
-                        path_func = path_func,
-                    },
                     {
-                        -- Hide
+                        -- Set display priority to hide when component is too big to fit
-                        provider = "",
+                        flexible = 1,
+                        comp.separated_path({
+                            flexible = 2,
+                            max_depth = 5,
+                            path_func = path_func,
+                        }),
+                        comp.separated_path({
+                            flexible = 3,
+                            max_depth = 3,
+                            path_func = path_func,
+                        }),
+                        comp.separated_path({
+                            flexible = 4,
+                            max_depth = 1,
+                            path_func = path_func,
+                        }),
+                        {
+                            -- Hide
+                            provider = "",
+                        },
                     },
+                    comp.file_info({
+                        file_icon = { hl = status.hl.file_icon("winbar"), padding = { left = 0 } },
+                        file_modified = {},
+                        file_read_only = {},
+                        filename = {},
+                        filetype = false,
+                        hl = status.hl.get_attributes("winbarnc", true),
+                        surround = false,
+                        update = { "BufEnter", "BufWrite" },
+                    }),
                 },
-                status.component.file_info {
+                comp.breadcrumbs(),
-                    file_icon = { hl = status.hl.file_icon("winbar"), padding = { left = 0 } },
+            }
-                    file_modified = false,
-                    file_read_only = false,
-                    hl = status.hl.get_attributes("winbarnc", true),
-                    surround = false,
-                    update = "BufEnter",
-                },
-            },
-            status.component.breadcrumbs(),
-        }
 
-        return opts
+            return opts
-    end,
+        end,
+    },
 }

lua/plugins/45-vimwiki.lua

@@ -1,3 +1,4 @@
+---@type LazySpec
 return {
     {
         "vimwiki/vimwiki",

lua/plugins/50-user.lua

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

neovim.yml

@@ -0,0 +1,6 @@
+---
+base: lua51
+
+globals:
+  vim:
+    any: true

selene.toml

@@ -0,0 +1,8 @@
+std = "neovim"
+
+[rules]
+global_usage = "allow"
+if_same_then_else = "allow"
+incorrect_standard_library_use = "allow"
+mixed_table = "allow"
+multiple_statements = "allow"

stylua.toml

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