Sync lazy-lock.json

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

.gitignore

@@ -1 +0,0 @@
-plugin/packer_compiled.lua

.luarc.json

@@ -1,198 +0,0 @@
-{
-    "workspace.library": [
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/neodev.nvim/types/nightly",
-        "/home/linuxbrew/.linuxbrew/Cellar/neovim/HEAD-b2e8c0d/share/nvim/runtime/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/opt/copilot.lua/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/opt/crates.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/opt/nvim-code-action-menu/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/Comment.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/alpha-nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/auto-session/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/bufferline.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cellular-automaton.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-buffer/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-cmdline/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-git/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-path/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-vsnip/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/copilot-cmp/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/diffview.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/fidget.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/git-conflict.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/gitsigns.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/goto-preview/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/gruvbox.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/gui-font-resize.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/impatient.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/kanagawa.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/leap.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/lspkind.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/lualine.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/mason.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/neoai.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/neodev.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/neotest/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/neotest-rust/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nui.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/null-ls.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/numb.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-autopairs/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-cmp/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-dap/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-dap-ui/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-dap-virtual-text/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-lastplace/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-lightbulb/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-lspconfig/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-pqf/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-surround/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-treesitter/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-treesitter-context/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-treesitter-pairs/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-treesitter-refactor/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-treesitter-textobjects/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-ts-autotag/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-ts-context-commentstring/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-web-devicons/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/octo.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/oil.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/oxocarbon.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/packer.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/plenary.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/rest.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/rust-tools.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/session-lens/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-emoji.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-env.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-fzf-native.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-github.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-project.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-ui-select.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/toggleterm.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/tokyonight.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/treesj/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/trouble.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/true-zen.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/typescript.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/vim-startuptime/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/which-key.nvim/lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/winshift.nvim/lua",
-        "/home/thallada/.config/nvim",
-        "/home/thallada/.local/share/nvim/site",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/Comment.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/FixCursorHold.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/alpha-nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/auto-session",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/bufferline.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cellular-automaton.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-buffer",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-cmdline",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-git",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-path",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-vsnip",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/copilot-cmp",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/diffview.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/fidget.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/friendly-snippets",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/git-conflict.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/goto-preview",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/gruvbox.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/gui-font-resize.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/impatient.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/kanagawa.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/leap.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/lspkind.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/lualine.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/mason.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/neoai.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/neodev.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/neotest",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/neotest-rust",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nui.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/numb.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-cmp",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-dap",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-dap-ui",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-dap-virtual-text",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-lastplace",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-lightbulb",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-pqf",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-surround",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-treesitter-context",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-treesitter-pairs",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-treesitter-refactor",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-treesitter-textobjects",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-ts-autotag",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-ts-context-commentstring",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/octo.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/oil.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/oxocarbon.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/packer.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/papercolor-theme",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/plenary.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/rest.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/rust-tools.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/session-lens",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-emoji.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-env.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-fzf-native.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-github.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-project.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-symbols.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope-ui-select.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/telescope.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/toggleterm.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/tokyonight.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/treesj",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/trouble.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/true-zen.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/typescript.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/vim-eunuch",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/vim-fugitive",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/vim-just",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/vim-mundo",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/vim-repeat",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/vim-rhubarb",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/vim-sleuth",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/vim-startuptime",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/vim-unimpaired",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/vim-vsnip",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/which-key.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/winshift.nvim",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/zig.vim",
-        "/home/linuxbrew/.linuxbrew/Cellar/neovim/HEAD-b2e8c0d/share/nvim/runtime",
-        "/home/linuxbrew/.linuxbrew/Cellar/neovim/HEAD-b2e8c0d/share/nvim/runtime/pack/dist/opt/matchit",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-buffer/after",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-cmdline/after",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp/after",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help/after",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-path/after",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/cmp-vsnip/after",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/octo.nvim/after",
-        "/home/thallada/.local/share/nvim/site/pack/packer/start/rest.nvim/after",
-        "/home/thallada/.config/nvim/after",
-        "/home/thallada/.config/nvim/lua",
-        "${3rd}/luassert/library",
-        "${3rd}/luv/library"
-    ],
-    "diagnostics.globals": [
-        "vim"
-    ]
-}

.stylua.toml

@@ -1,6 +0,0 @@
-column_width = 160
-line_endings = "Unix"
-indent_type = "Spaces"
-indent_width = 2
-quote_style = "AutoPreferSingle"
-no_call_parentheses = true

lazy-lock.json

@@ -1,134 +1,122 @@
 {
-  "LazyVim": { "branch": "main", "commit": "83d90f339defdb109a6ede333865a66ffc7ef6aa" },
+  "LazyVim": { "branch": "main", "commit": "c10948c50b18fae7f256433afdef09e432410480" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "7127911cc824a1d2f600492edd9667b476cf3eda" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "19e40cef03a380bfb578793a08222826118664dd" },
-  "blink-cmp-avante": { "branch": "master", "commit": "4f494c6e124acbe31a8f5d58effa0c14aa38a6d5" },
   "blink-copilot": { "branch": "main", "commit": "7ad8209b2f880a2840c94cdcd80ab4dc511d4f39" },
   "blink-emoji.nvim": { "branch": "master", "commit": "dff709139ad5389fb55ebab026e75278a12b325a" },
   "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" },
+  "catppuccin": { "branch": "main", "commit": "79e2049a0fdf7ec840f8463fe1d962c94493196b" },
   "clangd_extensions.nvim": { "branch": "main", "commit": "78c2ecd659d54972be17aa6ba2deac3c53223b80" },
-  "cmake-tools.nvim": { "branch": "master", "commit": "f9a3eb2be0b8148df470244e5c25aede3a3a28a5" },
+  "cmake-tools.nvim": { "branch": "master", "commit": "22859d754b5de738cfe9945e0910729f63deefd0" },
-  "codesnap.nvim": { "branch": "main", "commit": "0a0941340376439a25d6cd8a4d1d2b372edbfdbd" },
+  "codesnap.nvim": { "branch": "main", "commit": "21b7561c95cc452c65ddf2fc4dfeb280f8471d45" },
-  "conform.nvim": { "branch": "master", "commit": "dca1a190aa85f9065979ef35802fb77131911106" },
+  "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
-  "copilot.lua": { "branch": "master", "commit": "b57ee71bc6671aae055ef1911b3f72771219bb2d" },
+  "copilot.lua": { "branch": "master", "commit": "eac6eff78e4a864daa0a5ef431d5c729e7d18a50" },
-  "cord.nvim": { "branch": "master", "commit": "0be090969e978f7442870ef227e09eff7bf3480d" },
+  "cord.nvim": { "branch": "master", "commit": "8f081613c1314a0d6f38839c2788216621efb4d9" },
   "crates.nvim": { "branch": "main", "commit": "694357861ec9ebf12475ddcdd04ea45a0923c32d" },
-  "darkearth-nvim": { "branch": "main", "commit": "668968e81ce125544a3e25f21419c08bec9a3cc4" },
+  "darkearth-nvim": { "branch": "main", "commit": "d894924296162bfb50c6ab753c30c479c100f0e6" },
   "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
   "eyeliner.nvim": { "branch": "main", "commit": "8f197eb30cecdf4c2cc9988a5eecc6bc34c0c7d6" },
   "farout.nvim": { "branch": "main", "commit": "ebfcb874c3ebdb86fff8f22de4ae0944c3fa2bbc" },
-  "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
+  "flash.nvim": { "branch": "main", "commit": "b6346946d10d07998efee029fb0f7a593806d0cd" },
-  "fold-preview.nvim": { "branch": "main", "commit": "b7920cb0aba2b48a6b679bff45f98c3ebc0f0b89" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "fzf": { "branch": "master", "commit": "263eb4732fc6268f9fb35cffb634903ea8e2a26b" },
+  "fzf": { "branch": "master", "commit": "e36576429dbdcb447b05b999f266e1c2913b543b" },
-  "fzf-lua": { "branch": "main", "commit": "44816af2465bb0a17ae0f1f2d8a4f9c3df524fcd" },
   "gh.nvim": { "branch": "main", "commit": "6f367b2ab8f9d4a0a23df2b703a3f91137618387" },
-  "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "31d6fb2d618bca1482b9f274751ead5f03461408" },
   "goto-preview": { "branch": "main", "commit": "d2d6923c9b9e0e43f0b9b566f261a8b1ae016540" },
-  "grug-far.nvim": { "branch": "main", "commit": "21790e59dd0109a92a70cb874dd002af186314f5" },
+  "grug-far.nvim": { "branch": "main", "commit": "6e05398cf6cad05b3fb46569db96b1ccfcbbd402" },
   "gruvbox.nvim": { "branch": "main", "commit": "154eb5ff5b96d0641307113fa385eaf0d36d9796" },
   "gui-font-resize.nvim": { "branch": "main", "commit": "8b3c7d632c798a93fa7321162a3e018ecdd733a7" },
   "hybrid.nvim": { "branch": "master", "commit": "0eafd5f0e1223073bdc7c02aedfd85bff029aa5c" },
-  "inc-rename.nvim": { "branch": "main", "commit": "0074b551a17338ccdcd299bd86687cc651bcb33d" },
+  "inc-rename.nvim": { "branch": "main", "commit": "ddff8bd3eccedf043bd73f5bf89cf90d2d6d8105" },
-  "kanagawa.nvim": { "branch": "master", "commit": "8ad3b4cdcc804b332c32db8f9743667e1bb82b99" },
+  "kanagawa.nvim": { "branch": "master", "commit": "bb85e4bfc8d89b0e62c8fa53ccdd13d12e2f77b3" },
   "key-analyzer.nvim": { "branch": "main", "commit": "4e4bef34498e821bcbd5203f44db8b67e4f10e04" },
-  "keymap-amend.nvim": { "branch": "master", "commit": "b8bf9d820878d5497fdd11d6de55dea82872d98e" },
+  "kulala.nvim": { "branch": "main", "commit": "e4e8615dc07d9423f3dd52ad5af962db09d26a52" },
-  "kulala.nvim": { "branch": "main", "commit": "6656c9d332735ca6a27725e0fb45a1715c4372d9" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
   "linear-nvim": { "branch": "master", "commit": "3832e5146f52e7b2663fec312588dbf91edfcf8b" },
   "litee.nvim": { "branch": "main", "commit": "4efaf373322d9e71eaff31164abb393417cc6f6a" },
-  "lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" },
+  "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
   "lush.nvim": { "branch": "main", "commit": "9c60ec2279d62487d942ce095e49006af28eed6e" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "51feb0ada33d18f3c5c71ffb46005dbf8b33bef4" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "67029ccdac1ef8941e13b826417bc0ffac24cc86" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" },
-  "mason.nvim": { "branch": "main", "commit": "e54f5bf5f12c560da31c17eee5b3e1bd369f3ff9" },
+  "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
   "miasma.nvim": { "branch": "main", "commit": "627f2e1cac91de0d1d4dd7472b506a30f41b2b7d" },
-  "mini.ai": { "branch": "main", "commit": "7e10ce8468c0fce4f527ae2c0e5c484f7667f73d" },
+  "mini.ai": { "branch": "main", "commit": "25248c6aa002391936a6200f12d1466015987133" },
-  "mini.files": { "branch": "main", "commit": "3e247eb12ca8c05622ceb8745f9004f761b22ef8" },
+  "mini.files": { "branch": "main", "commit": "f6d1367483b6c0695b5084c04f7cd83bf2353a3e" },
-  "mini.hipatterns": { "branch": "main", "commit": "9eff319bbe66adfaf781a0d0e174baa08ba94909" },
+  "mini.hipatterns": { "branch": "main", "commit": "7c840c71d6a91f53d734cab2b6fe2290d285ec3b" },
-  "mini.icons": { "branch": "main", "commit": "bac6317300e205335df425296570d84322730067" },
+  "mini.icons": { "branch": "main", "commit": "98faae31e9be1cc054ae63485e58ceb185efcad0" },
-  "mini.indentscope": { "branch": "main", "commit": "e0601f75aa5137a5a13bb92a988c9a300f5bd3de" },
+  "mini.pairs": { "branch": "main", "commit": "b1c5a726921b7a8c9321e9a7a208aa0571de5810" },
-  "mini.pairs": { "branch": "main", "commit": "42387c7fe68fc0b6e95eaf37f1bb76e7bffaa0d9" },
+  "mini.surround": { "branch": "main", "commit": "8d5d0c5aa92449368ac251e85451d79d8f69d296" },
-  "mini.surround": { "branch": "main", "commit": "2715e04bea3ec9244f15b421dc5b18c0fe326210" },
-  "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" },
   "moonbow.nvim": { "branch": "master", "commit": "baf62d035785910c5a368cbde5872190a56afb30" },
-  "neo-tree.nvim": { "branch": "main", "commit": "ff84e6e1608b24773f1b73cd4182e0bcf2b3d637" },
+  "neo-tree.nvim": { "branch": "main", "commit": "2b9e60152b606152467441b0a74879f41707fd96" },
-  "neoconf.nvim": { "branch": "main", "commit": "b55be3e04e288654edc8f9b400c494e4110f7dd3" },
+  "neoconf.nvim": { "branch": "main", "commit": "413ca3ee8f59d8e9d89f5cfca06ee8746ae237a8" },
   "neogen": { "branch": "main", "commit": "23e7e9f883d01289ebd90e98025acc860ea26366" },
-  "neotest": { "branch": "master", "commit": "ad991822b7076b1d940b33a9d6d0d30416d5df81" },
+  "neotest": { "branch": "master", "commit": "1c529a1ef9c82e8131e872368415cecc2bb86ea2" },
   "neotest-mocha": { "branch": "main", "commit": "e28317a93e48ed7901d8ddb1bd252b64220b2e2c" },
-  "neotest-python": { "branch": "master", "commit": "e6df4f1892f6137f58135917db24d1655937d831" },
+  "neotest-python": { "branch": "master", "commit": "1b56ca4ba51c6014f986d6548ee629bdc95589d1" },
-  "neotest-rspec": { "branch": "main", "commit": "e7dc67c1167a9e593c804a6be6808ba9a5920d43" },
+  "neotest-rspec": { "branch": "main", "commit": "7629f8c2837becb72090fbafce58506bb56a00f0" },
   "neotest-zig": { "branch": "main", "commit": "de63f3b9a182d374d2e71cf44385326682ec90e7" },
-  "nightfox.nvim": { "branch": "main", "commit": "26b61b1f856ec37cae3cb64f5690adb955f246a1" },
+  "nightfox.nvim": { "branch": "main", "commit": "4dacd3f0185a2227bdf3b6c0975a8f0bf87cac9a" },
   "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "numb.nvim": { "branch": "master", "commit": "12ef3913dea8727d4632c6f2ed47957a993de627" },
+  "numb.nvim": { "branch": "master", "commit": "167fbbb8de5529eac4f66ef054c260636cd9af51" },
   "nvim-bqf": { "branch": "main", "commit": "c282a62bec6c0621a1ef5132aa3f4c9fc4dcc2c7" },
-  "nvim-cmp": { "branch": "main", "commit": "85bbfad83f804f11688d1ab9486b459e699292d6" },
+  "nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" },
-  "nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" },
   "nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
-  "nvim-dap-ruby": { "branch": "main", "commit": "ba36f9905ca9c6d89e5af5467a52fceeb2bbbf6d" },
+  "nvim-dap-ruby": { "branch": "main", "commit": "fa73da2f5124d10a4cd09ce589441b5901df706a" },
-  "nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" },
+  "nvim-dap-ui": { "branch": "master", "commit": "cc9dd33aade7f20bae414d0cba163bc60d4d4b43" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-jdtls": { "branch": "master", "commit": "77ccaeb422f8c81b647605da5ddb4a7f725cda90" },
+  "nvim-jdtls": { "branch": "master", "commit": "6e9d953f0b82bccdb834cfde0e893f3119c22592" },
-  "nvim-lint": { "branch": "master", "commit": "eab58b48eb11d7745c11c505e0f3057165902461" },
+  "nvim-lint": { "branch": "master", "commit": "a219b2c9e5b4765e5c845aba119dad55806fcaf1" },
-  "nvim-lspconfig": { "branch": "master", "commit": "451d4ef9abd4f0f08e379ef0d55d1c391b6125a7" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9ae2b3b63b924b1329724dae76e9d2c5c40b389c" },
-  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "nvim-nio": { "branch": "master", "commit": "edcc181a875301dd21840189aa2f2f9ad69fc172" },
-  "nvim-pqf": { "branch": "main", "commit": "148ee2ca8b06d83fd9bf6f9b9497724ad39a07d6" },
+  "nvim-treesitter": { "branch": "main", "commit": "0f32dff7f19476629c77467f887b95e5e2d33509" },
-  "nvim-treesitter": { "branch": "main", "commit": "7caec274fd19c12b55902a5b795100d21531391f" },
   "nvim-treesitter-context": { "branch": "master", "commit": "b311b30818951d01f7b4bf650521b868b3fece16" },
-  "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "898ee307df58f854d11cd7edd06472574d48014e" },
   "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" },
-  "nvim-ufo": { "branch": "main", "commit": "ab3eb124062422d276fae49e0dd63b3ad1062cfc" },
+  "nvim-web-devicons": { "branch": "master", "commit": "2ae6958df7ced50baac5035cec0c15799eedfbf7" },
-  "nvim-web-devicons": { "branch": "master", "commit": "2795c26c916bb3c57dde308b82be51971fa92747" },
+  "obsidian.nvim": { "branch": "main", "commit": "69fe7c6bf61a5222b5061a9a9dfc5023f2ec0fdc" },
-  "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
+  "octo.nvim": { "branch": "master", "commit": "205f024d3ea4a3d81aac751b6bf8e2d01e0c204f" },
-  "octo.nvim": { "branch": "master", "commit": "bbd903ce905c301ac516d64c33b2511a05f6b59b" },
+  "oil.nvim": { "branch": "master", "commit": "b73018b75affd13fa38e2fc94ef753b465f770d7" },
-  "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" },
+  "overseer.nvim": { "branch": "master", "commit": "a93d9f6d6defdac4bcd6d2c8ba988650e42e0a0e" },
-  "onedarker.nvim": { "branch": "master", "commit": "b4f92f073ed7cdf0358ad005cee0484411232b1b" },
+  "oxocarbon.nvim": { "branch": "main", "commit": "488dca6e3ff01acd88a648b83244073037261e64" },
-  "overseer.nvim": { "branch": "master", "commit": "f818eefff81f4b12fb7cf236f1b6c16768a2fcbc" },
-  "oxocarbon.nvim": { "branch": "main", "commit": "a7ba74849a00546a311f8c146320b433900393e7" },
   "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
   "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
   "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
-  "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
+  "render-markdown.nvim": { "branch": "main", "commit": "f422cb5c6855f150e2ddcfaf44e7157b98b34f6a" },
-  "render-markdown.nvim": { "branch": "main", "commit": "629eb9533ec989d9d5c6cab8f3ad5372422c24e0" },
   "rustaceanvim": { "branch": "master", "commit": "f2f0c1231a5b019dbc1fd6dafac1751c878925a3" },
   "sidekick.nvim": { "branch": "main", "commit": "208e1c5b8170c01fd1d07df0139322a76479b235" },
-  "smart-splits.nvim": { "branch": "master", "commit": "80be31a3d2e37d32bd37794da72a4f69fce7a85f" },
+  "smart-splits.nvim": { "branch": "master", "commit": "32f67888ac71942442fdab3819864a10449dfc41" },
-  "smartcolumn.nvim": { "branch": "main", "commit": "b9cdbdf42f7ac5a659204cd5926017c7ff724a19" },
+  "smartcolumn.nvim": { "branch": "main", "commit": "5351ae24e992a397d2abac48b7774dc8ef0acf40" },
-  "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
+  "snacks.nvim": { "branch": "main", "commit": "882c996cf28183f4d63640de0b4c02ec886d01f2" },
   "ssr.nvim": { "branch": "main", "commit": "7839acf6f940dc1c9210823a7c8b378df122765b" },
   "telescope-terraform-doc.nvim": { "branch": "main", "commit": "66987fac94d12704fdfd90b857f4f648e31251c9" },
   "telescope-terraform.nvim": { "branch": "main", "commit": "072c97023797ca1a874668aaa6ae0b74425335df" },
-  "telescope.nvim": { "branch": "master", "commit": "f04ab730b8f9c6bf3f54a206d0dcddfd70c52d59" },
+  "telescope.nvim": { "branch": "master", "commit": "427b576c16792edad01a92b89721d923c19ad60f" },
   "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
-  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
   "tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" },
-  "treesj": { "branch": "main", "commit": "5fa4e7ba3517f8fe743bb4488f9e9c7ce83330fc" },
+  "treesj": { "branch": "main", "commit": "79aedb401bbdc7e4202f7881eab5f6feb2105b0a" },
   "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
-  "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },
+  "ts-comments.nvim": { "branch": "main", "commit": "a59d6092213447450191122c9346f309161504cb" },
-  "typst-preview.nvim": { "branch": "master", "commit": "87db18b8d19c8b0eed399f52e4c527ce5afe4817" },
+  "typst-preview.nvim": { "branch": "master", "commit": "1c2e19486397be1c580b560fc50ee36abe329c46" },
-  "venv-selector.nvim": { "branch": "main", "commit": "bcb2f58533c59b01565285eba49693f00bc460f5" },
+  "venv-selector.nvim": { "branch": "main", "commit": "cc4bb3975de8835291f9bb45889e96c6b2795fc4" },
   "vim-dadbod": { "branch": "master", "commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770" },
   "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "07e92e22114cc5b1ba4938d99897d85b58e20475" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "afd07819d8efcefc3317205b855ad4e3513b0011" },
   "vim-eunuch": { "branch": "master", "commit": "e86bb794a1c10a2edac130feb0ea590a00d03f1e" },
   "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
   "vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
-  "vim-startuptime": { "branch": "master", "commit": "f10474b400c197787a0434548d842a2db583c333" },
+  "vim-startuptime": { "branch": "master", "commit": "5f33e50f1e2e2a80370c9094e4c303ea54cd2aea" },
   "vim-unimpaired": { "branch": "master", "commit": "db65482581a28e4ccf355be297f1864a4e66985c" },
-  "vimtex": { "branch": "master", "commit": "97e11bd4f56d46a87f8593d6ccb27820e19c4ab0" },
+  "vimtex": { "branch": "master", "commit": "853eb587873a7061a083655578be56dd8027b834" },
-  "wezterm-types": { "branch": "main", "commit": "3d66a8377f27af81d247c1961bc617c02fe80ebb" },
+  "wezterm-types": { "branch": "main", "commit": "ad5d3319a9b3358a7953db34677a554a4268ae58" },
   "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" },
   "yank-path.nvim": { "branch": "main", "commit": "e660248de1e4c91a760f510fc165c172a19cc1d5" },
-  "yanky.nvim": { "branch": "main", "commit": "784188e0a7363e762e53140f39124d786aec0832" },
+  "yanky.nvim": { "branch": "main", "commit": "dd6689fdda85f66cab7d9b1a1664625f3be0920d" },
-  "zenbones.nvim": { "branch": "main", "commit": "321543e581cd73d0ee43327d8a7c02a420f640cf" }
+  "zenbones.nvim": { "branch": "main", "commit": "8304d8df9b823ff11e103afa62f38c39f534abe6" }
 }

lazyvim.json

@@ -35,7 +35,6 @@
     "lazyvim.plugins.extras.lang.zig",
     "lazyvim.plugins.extras.lsp.neoconf",
     "lazyvim.plugins.extras.test.core",
-    "lazyvim.plugins.extras.ui.mini-indentscope",
     "lazyvim.plugins.extras.ui.treesitter-context",
     "lazyvim.plugins.extras.util.dot",
     "lazyvim.plugins.extras.util.gh",

lua/config/keymaps.lua

@@ -14,6 +14,13 @@ vim.keymap.set("n", "<leader>B", function()
   Snacks.terminal({ "btop" }, { esc_esc = false, ctrl_hjkl = false })
 end, { desc = "Toggle btop (improved console top monitor) floating terminal" })
 
+local function toggle_split_terminal()
+  Snacks.terminal.toggle(nil, { win = { position = "bottom" } })
+end
+
+vim.keymap.set({ "n", "t" }, [[<C-\>]], toggle_split_terminal, { desc = "Toggle terminal split" })
+vim.keymap.set({ "n", "t" }, "<F12>", toggle_split_terminal, { desc = "Toggle terminal split" })
+
 -- Toggle zoom/maximize current window (<C-w> is the vim window prefix, m for maximize)
 vim.keymap.set({ "n", "t" }, "<C-w>m", function()
   Snacks.toggle.zoom():toggle()

lua/config/lazy.lua

@@ -1,5 +1,5 @@
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
+if not vim.uv.fs_stat(lazypath) then
   -- bootstrap lazy.nvim
   -- stylua: ignore
   vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
@@ -28,8 +28,9 @@ require("lazy").setup({
     version = false, -- always use the latest git commit
     -- version = "*", -- try installing the latest stable version for plugins that support semver
   },
-  install = { colorscheme = { "tokyonight", "habamax" } },
+  install = { colorscheme = { "kanagawa-dragon", "habamax" } },
   checker = { enabled = true }, -- automatically check for plugin updates
+  rocks = { enabled = false },
   git = {
     concurrency = 3, -- reduce concurrent git operations (default is higher)
   },

lua/config/options.lua

@@ -10,7 +10,6 @@ else
   vim.opt.guifont = "Berkeley Mono Variable:h13"
 end
 
--- idk if it does anything cause I have to set it in the nvim-cmp settings too
 vim.opt.completeopt = "menu,menuone,noinsert,noselect"
 
 -- Window decorations

lua/custom/yank.lua

@@ -40,7 +40,7 @@ M.simulate_yank_highlight = function()
   local bounds = M.get_visual_bounds()
 
   local ns = vim.api.nvim_create_namespace("simulate_yank_highlight")
-  vim.highlight.range(
+  vim.hl.range(
     0,
     ns,
     "IncSearch",

lua/plugins/blink.lua

@@ -1,8 +1,6 @@
 return {
   "saghen/blink.cmp",
   dependencies = {
-    -- For auto-completion in the avante window
-    "Kaiser-Yang/blink-cmp-avante",
     -- For emoji selection
     "moyiz/blink-emoji.nvim",
   },
@@ -12,26 +10,10 @@ return {
         show_in_snippet = false,
       },
     },
-    -- use preset again once this is merged: https://github.com/LazyVim/LazyVim/pull/6183
+    keymap = { preset = "super-tab" },
-    -- keymap = { preset = "super-tab" },
-    keymap = {
-      ["<Tab>"] = {
-        require("blink.cmp.keymap.presets").get("super-tab")["<Tab>"][1],
-        require("lazyvim.util").cmp.map({ "snippet_forward", "ai_accept" }),
-        "fallback",
-      },
-    },
     sources = {
-      -- Add 'avante' to the list
+      default = { "lsp", "path", "snippets", "buffer", "emoji" },
-      default = { "avante", "lsp", "path", "snippets", "buffer", "emoji" },
       providers = {
-        avante = {
-          module = "blink-cmp-avante",
-          name = "Avante",
-          opts = {
-            -- options for blink-cmp-avante
-          },
-        },
         emoji = {
           module = "blink-emoji",
           name = "Emoji",

lua/plugins/colorschemes.lua

@@ -7,6 +7,7 @@ return {
   },
   {
     "ellisonleao/gruvbox.nvim",
+    lazy = true,
     opts = {
       contrast = "hard",
       palette_overrides = {
@@ -29,12 +30,14 @@ return {
   },
   {
     "arturgoms/moonbow.nvim",
+    lazy = true,
     opts = {
       dim_inactive = true,
     },
   },
   {
     "rebelot/kanagawa.nvim",
+    lazy = true,
     opts = {
       dimInactive = true,
       colors = {
@@ -62,9 +65,9 @@ return {
       },
     },
   },
-  { "kdheepak/monochrome.nvim" },
   {
     "folke/tokyonight.nvim",
+    lazy = true,
     opts = {
       style = "night",
       dim_inactive = true,
@@ -73,6 +76,7 @@ return {
   {
     "catppuccin/nvim",
     name = "catppuccin",
+    lazy = true,
     opts = {
       flavour = "mocha",
       dim_inactive = {
@@ -80,15 +84,16 @@ return {
       },
     },
   },
-  { "LunarVim/onedarker.nvim" },
   {
     "EdenEast/nightfox.nvim",
+    lazy = true,
     opts = {
       dim_inactive = true,
     },
   },
   {
     "mcchrish/zenbones.nvim",
+    lazy = true,
     dependencies = { "rktjmp/lush.nvim" },
     config = function()
       local opts = {
@@ -106,26 +111,27 @@ return {
   },
   {
     "HoNamDuong/hybrid.nvim",
-    lazy = false,
+    lazy = true,
     opts = {},
   },
   {
     -- My own colorscheme, aka. thallada/farout.nvim
     "thallada/farout.nvim",
+    lazy = true,
     opts = {
       dim_inactive = true,
     },
   },
   {
     "xero/miasma.nvim",
-    lazy = false,
+    lazy = true,
-    priority = 1000,
   },
   {
     "ptdewey/darkearth-nvim",
-    priority = 1000,
+    lazy = true,
   },
   {
     "nyoom-engineering/oxocarbon.nvim",
+    lazy = true,
   },
 }

lua/plugins/dial.lua

@@ -1,35 +0,0 @@
--- better increase/descrease
-return {
-  "monaqa/dial.nvim",
-  keys = {
-    {
-      "<C-a>",
-      function()
-        return require("dial.map").inc_normal()
-      end,
-      expr = true,
-      desc = "Increment",
-    },
-    {
-      "<C-x>",
-      function()
-        return require("dial.map").dec_normal()
-      end,
-      expr = true,
-      desc = "Decrement",
-    },
-  },
-  config = function()
-    local augend = require("dial.augend")
-    require("dial.config").augends:register_group({
-      default = {
-        augend.integer.alias.decimal,
-        augend.integer.alias.hex,
-        augend.date.alias["%Y/%m/%d"],
-        augend.constant.alias.bool,
-        augend.semver.alias.semver,
-        augend.constant.new({ elements = { "let", "const" } }),
-      },
-    })
-  end,
-}

lua/plugins/disabled.lua

@@ -1 +0,0 @@
-return {}

lua/plugins/folding.lua

@@ -1,68 +0,0 @@
-return {
-  -- add folding range to capabilities
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        ["*"] = {
-          capabilities = {
-            textDocument = {
-              foldingRange = {
-                dynamicRegistration = false,
-                lineFoldingOnly = true,
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-  -- add nvim-ufo
-  {
-    "kevinhwang91/nvim-ufo",
-    dependencies = {
-      "kevinhwang91/promise-async",
-      -- This looks awful, so leaving it disabled
-      -- {
-      --   "luukvbaal/statuscol.nvim",
-      --   config = function()
-      --     local builtin = require("statuscol.builtin")
-      --     require("statuscol").setup({
-      --       relculright = true,
-      --       segments = {
-      --         { text = { builtin.foldfunc }, click = "v:lua.ScFa" },
-      --         { text = { "%s" }, click = "v:lua.ScSa" },
-      --         { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
-      --       },
-      --     })
-      --   end,
-      -- },
-    },
-    event = "BufReadPost",
-    opts = {
-      provider_selector = function()
-        return { "treesitter", "indent" }
-      end,
-    },
-    init = function()
-      vim.o.foldcolumn = "1" -- '0' is not bad
-      vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
-      vim.o.foldlevelstart = 99
-      vim.o.foldenable = true
-      -- disabling since LazyVim already sets this nicely and it was overriding my diff fillchar
-      -- vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
-      -- Using ufo provider need remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself
-      vim.keymap.set("n", "zR", function()
-        require("ufo").openAllFolds()
-      end)
-      vim.keymap.set("n", "zM", function()
-        require("ufo").closeAllFolds()
-      end)
-    end,
-  },
-  -- Folding preview, by default h and l keys are used.
-  -- On first press of h key, when cursor is on a closed fold, the preview will be shown.
-  -- On second press the preview will be closed and fold will be opened.
-  -- When preview is opened, the l key will close it and open fold. In all other cases these keys will work as usual.
-  { "anuvyklack/fold-preview.nvim", dependencies = "anuvyklack/keymap-amend.nvim", config = true },
-}

lua/plugins/fugitive.lua

@@ -14,7 +14,7 @@ return {
     { "<leader>gc", [[<Cmd>Git commit<CR>]], desc = "[G]it [C]ommit" },
     { "<leader>gb", [[<Cmd>Git blame -C<CR>]], desc = "[G]it [B]lame" },
     { "<leader>gp", [[<Cmd>Git push<CR>]], desc = "[G]it [P]ush" },
-    { "<leader>gf", [[<Cmd>Git push --force<CR>]], desc = "[G]it [F]orce push" },
+    { "<leader>gF", [[<Cmd>Git push --force<CR>]], desc = "[G]it [F]orce push" },
     { "<leader>gu", [[<Cmd>Git pull<CR>]], desc = "[G]it p[U]ll" },
     {
       "<leader>gh",

lua/plugins/java.lua

@@ -1,15 +1,50 @@
+local function first_jdk(candidates)
+  for _, path in ipairs(candidates) do
+    if vim.fn.executable(path .. "/bin/java") == 1 then
+      return path
+    end
+  end
+end
+
+local function find_jdk(patterns)
+  local roots = {
+    "/Library/Java/JavaVirtualMachines/%s/Contents/Home",
+    "/usr/lib/jvm/%s",
+    vim.fn.expand("~") .. "/.sdkman/candidates/java/%s",
+  }
+  local candidates = {}
+  for _, pattern in ipairs(patterns) do
+    for _, root in ipairs(roots) do
+      for _, path in ipairs(vim.fn.glob(root:format(pattern), true, true)) do
+        candidates[#candidates + 1] = path
+      end
+    end
+  end
+  return first_jdk(candidates)
+end
+
 return {
   {
     "mfussenegger/nvim-jdtls",
     opts = function(_, opts)
-      local corretto8 = "/Library/Java/JavaVirtualMachines/amazon-corretto-8.jdk/Contents/Home"
+      local jdk8 = find_jdk({ "*corretto-8*", "*corretto*1.8*", "*-8-*", "*java-8*", "*1.8*" })
-      local temurin21 = "/Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home"
+      local jdk21 = find_jdk({ "*temurin-21*", "*-21-*", "*java-21*", "*21*" })
 
+      if jdk21 then
         opts.cmd = opts.cmd or {}
         table.insert(opts.cmd, "--java-executable")
-      table.insert(opts.cmd, temurin21 .. "/bin/java")
+        table.insert(opts.cmd, jdk21 .. "/bin/java")
+      end
 
-      local project_jdk = vim.env.JAVA_HOME or temurin21
+      local runtimes = {}
+      if jdk8 then
+        table.insert(runtimes, { name = "JavaSE-1.8", path = jdk8 })
+      end
+      if jdk21 then
+        table.insert(runtimes, { name = "JavaSE-21", path = jdk21 })
+      end
+
+      local project_jdk = vim.env.JAVA_HOME or jdk21
 
       opts.settings = vim.tbl_deep_extend("force", opts.settings or {}, {
         java = {
@@ -19,10 +54,7 @@ return {
             },
           },
           configuration = {
-            runtimes = {
+            runtimes = runtimes,
-              { name = "JavaSE-1.8", path = corretto8 },
-              { name = "JavaSE-21", path = temurin21 },
-            },
           },
         },
       })

lua/plugins/key-analyzer.lua

@@ -1,4 +1,5 @@
 return {
   "meznaric/key-analyzer.nvim",
+  cmd = "KeyAnalyzer",
   opts = {},
 }

lua/plugins/lspconfig.lua

@@ -2,7 +2,7 @@ return {
   "neovim/nvim-lspconfig",
   opts = {
     diagnostics = {
-      virtual_text = true,
+      virtual_text = false,
       virtual_lines = { current_line = true },
     },
     servers = {

lua/plugins/mini-indentscope.lua

@@ -1,12 +0,0 @@
-return {
-  "nvim-mini/mini.indentscope",
-  enabled = true,
-  opts = {
-    draw = {
-      -- Speed up distracting animation
-      animation = function()
-        return 1
-      end,
-    },
-  },
-}

lua/plugins/neotest.lua

@@ -7,7 +7,7 @@ return {
     return {
       adapters = {
         ["neotest-mocha"] = {
-          command = "docker exec -it api-sandbox npm run test:integration",
+          command = "docker exec " .. (vim.env.NEOTEST_MOCHA_CONTAINER or "api-sandbox") .. " npm run test:integration",
           command_args = function(context)
             -- The context contains:
             --   results_path: The file that json results are written to

lua/plugins/obsidian.lua

@@ -1,5 +1,5 @@
 return {
-  "epwalsh/obsidian.nvim",
+  "obsidian-nvim/obsidian.nvim",
   version = "*", -- recommended, use latest release instead of latest commit
   lazy = true,
   event = {
@@ -13,8 +13,6 @@ return {
   },
   dependencies = {
     "nvim-lua/plenary.nvim",
-    "hrsh7th/nvim-cmp",
-    "ibhagwan/fzf-lua",
   },
   opts = {
     workspaces = {
@@ -23,5 +21,8 @@ return {
         path = "~/notes",
       },
     },
+    picker = {
+      name = "snacks.pick",
+    },
   },
 }

lua/plugins/octo.lua

@@ -1,15 +1,6 @@
 return {
   "pwntester/octo.nvim",
-  dependencies = {
+  opts = {
-    "nvim-lua/plenary.nvim",
-    "nvim-telescope/telescope.nvim",
-    -- OR 'ibhagwan/fzf-lua',
-    "nvim-tree/nvim-web-devicons",
-  },
-  cmd = {
-    "Octo",
-  },
-  opt = {
     mappings = {
       pull_request = {
         next_comment = { lhs = "<space>]c", desc = "go to next comment" },

lua/plugins/oil.lua

@@ -25,6 +25,6 @@ return {
   },
   dependencies = { "nvim-tree/nvim-web-devicons" },
   keys = {
-    { "-", "<cmd>Oil<cr>", { desc = "Open parent directory in current buffer" } },
+    { "-", "<cmd>Oil<cr>", desc = "Open parent directory in current buffer" },
   },
 }

lua/plugins/pqf.lua

@@ -1,6 +0,0 @@
-return {
-  "yorickpeterse/nvim-pqf",
-  config = function()
-    require("pqf").setup()
-  end,
-}

lua/plugins/toggleterm.lua

@@ -1,44 +0,0 @@
-return {
-  "akinsho/toggleterm.nvim",
-  version = "*",
-  opts = {
-    direction = "horizontal",
-    open_mapping = [[<C-\>]],
-    hide_numbers = true,
-  },
-  cmd = {
-    "ToggleTerm",
-    "TermExec",
-    "ToggleTermSendCurrentLine",
-    "ToggleTermSendVisualLines",
-    "ToggleTermSendVisualSelection",
-    "ToggleTermOpenAll",
-    "ToggleTermCloseAll",
-    "ToggleTermToggleAll",
-  },
-  keys = {
-    [[<C-\>]],
-    { "<M-=>", [[<Cmd>ToggleTerm direction=float<CR>]], desc = "Toggle terminal in floating window" },
-    {
-      "<M->",
-      [[<Cmd>ToggleTerm direction=horizontal<CR>]],
-      desc = "Toggle terminal in horizontal bottom window",
-    },
-    -- tmux muscle-memory for fullscreening nvim window
-    -- replaced with true-zen.nvim
-    -- vim.keymap.set('n', [[<C-a>z]], [[<Cmd>ToggleTermToggleAll<CR>]])
-    -- vim.keymap.set('t', [[<C-a>z]], [[<Cmd>tab split<CR>]])
-    { "<Esc>", [[<C-\><C-n>]], mode = "t", desc = "Escape terminal mode" },
-    { "<Esc><Esc>", [[<Esc>]], mode = "t", desc = "Escape inside terminal" },
-    -- These were replaced by smart-splits
-    -- { "<C-j>", [[<Cmd>wincmd h<CR>]], mode = "t", desc = "Move focus down one window" },
-    -- { "<C-h>", [[<Cmd>wincmd h<CR>]], mode = "t", desc = "Move focus left one window" },
-    -- { "<C-k>", [[<Cmd>wincmd k<CR>]], mode = "t", desc = "Move focus up one window" },
-    -- { "<C-l>", [[<Cmd>wincmd l<CR>]], mode = "t", desc = "Move focus right one window" },
-    { [[<C-\>]], [[<Cmd>ToggleTerm<CR>]] },
-    { "<F12>", [[<Cmd>ToggleTerm<CR>]] },
-    { "<F12>", [[<Cmd>ToggleTerm<CR>]], mode = "t" },
-    -- { "<leader>H", "<cmd>lua _clx_toggle()<CR>", { desc = "Toggle clx (console HackerNews) floating terminal" } },
-    -- { "<leader>G", "<cmd>lua _gitui_toggle()<CR>", { desc = "Toggle gitui floating terminal" } },
-  },
-}

lua/plugins/wezterm-types.lua

@@ -1 +1,14 @@
-return { "justinsgithub/wezterm-types" }
+return {
+  {
+    "justinsgithub/wezterm-types",
+    lazy = true,
+  },
+  {
+    "folke/lazydev.nvim",
+    opts = {
+      library = {
+        { path = "wezterm-types", mods = { "wezterm" } },
+      },
+    },
+  },
+}