chore: update config

README.md

@@ -25,7 +25,8 @@ You can find all plugin specifications within `lua/plugins`.
 
 ## Dependencies
 
-> NOTE: This configuration primarily targets Neovim nightly but aims to be
+> [!NOTE]
+> This configuration primarily targets Neovim nightly but aims to be
 > compatible with the latest stable release. Be sure the version provided by
 > your package manager is up-to-date, or see one of the other available methods
 > for installation: <https://github.com/neovim/neovim/wiki/Installing-Neovim>

lazy-lock.json

@@ -1,7 +1,7 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" },
-  "auto-session": { "branch": "main", "commit": "af2219b9fa99c1d7ac409bd9eac094c459d3f52d" },
+  "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
+  "auto-session": { "branch": "main", "commit": "08c279882d4117a3e6ade1a014f7cf4af7c34fec" },
   "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
@@ -10,67 +10,68 @@
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "dashboard-nvim": { "branch": "master", "commit": "b88c997f468a1bacb1e9b13ff3b567638caa06e6" },
-  "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
+  "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "flatten.nvim": { "branch": "main", "commit": "e420e531d2ab24aebcf7b3c9fca28e6c5c34964d" },
-  "friendly-snippets": { "branch": "main", "commit": "700c4a25caacbb4648c9a27972c2fe203948e0c2" },
+  "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
   "git-conflict.nvim": { "branch": "main", "commit": "bfd9fe6fba9a161fc199771d85996236a0d0faad" },
-  "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" },
-  "gruvbox.nvim": { "branch": "main", "commit": "d4cde3853a172485961b515c36d51d757728d6e6" },
-  "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" },
+  "gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" },
+  "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" },
   "hex.nvim": { "branch": "master", "commit": "cbffd2ce4b8be089360e3c95d5909cd511d8840c" },
   "hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
-  "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" },
-  "lazydev.nvim": { "branch": "main", "commit": "7cbb524c85f87017df9c1ea2377a1d840ad8ed51" },
-  "lsp-progress.nvim": { "branch": "main", "commit": "55a04895ea20c365b670051a3128265d43bdfa3d" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "2ec2ba23882329c1302dff773b0d3620371d634f" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
+  "lazy.nvim": { "branch": "main", "commit": "8f6225751138329da339eb6554d40158768d23ff" },
+  "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" },
+  "lsp-progress.nvim": { "branch": "main", "commit": "d5f4d28efe75ce636bfbe271eb45f39689765aab" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "a38da0a61c172bb59e34befc12efe48359884793" },
+  "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
+  "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "f5425eb1d0d794f0305d5eeebddabb74614683ff" },
-  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "mkdx": { "branch": "master", "commit": "ee667cad506954b706c3fa972fbaaad46b1bf028" },
-  "neogit": { "branch": "master", "commit": "4b9d1893bc303ba9c2a9fe7d42b59ba7eb70184a" },
-  "none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" },
+  "neogit": { "branch": "master", "commit": "af1d8d88f426a4da63c913f3b81a37350dbe8d02" },
+  "none-ls-extras.nvim": { "branch": "main", "commit": "059bb6561b8f5ff99a7acc9262b557ebbe5c34ec" },
   "none-ls-luacheck.nvim": { "branch": "main", "commit": "a1dfea0d4c40c4023829c8b9a7ab0a26135985ca" },
-  "none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" },
-  "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
-  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
-  "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
-  "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" },
-  "nvim-highlight-colors": { "branch": "main", "commit": "30f305d57d658615cd827146f5e56db8b6833475" },
-  "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" },
-  "nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" },
+  "none-ls.nvim": { "branch": "main", "commit": "8b5d4170a602d7b257704eef77b0539ddfd02589" },
+  "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" },
+  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
+  "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" },
+  "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "a8f6952cb1ff7bde864a34c502f1a42c360a6662" },
+  "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" },
+  "nvim-lspconfig": { "branch": "master", "commit": "df9c116cbcf0aa7e58f2b36b0296fa687e87f36f" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
-  "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
-  "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
-  "nvim-treesitter": { "branch": "master", "commit": "26171d8f105d97746371d1b6c07c8d88bf13fec2" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" },
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-tree.lua": { "branch": "master", "commit": "f9ff00bc06d7cb70548a3847d7a2a05e928bc988" },
+  "nvim-treesitter": { "branch": "master", "commit": "874b99065b4b00b84b0ca5fa63490c93728a45ab" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "06fe07d7523ba8c755fac7c913fceba43b1720ee" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" },
   "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
-  "one-small-step-for-vimkind": { "branch": "main", "commit": "e92abbce0b9b77fed1aaf6f122fb18b7045b15ec" },
+  "one-small-step-for-vimkind": { "branch": "main", "commit": "730189c92c6fd80eb92bb6c1886392a142dba273" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "073e45546acaff6b4248e3faea8e67b399d3e864" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "b29da4a6061a88270e875b38367d82c04c856128" },
   "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
   "sakura.nvim": { "branch": "master", "commit": "2fbf430890dd9466afc41a62a809c21871d126ef" },
   "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
-  "telescope.nvim": { "branch": "master", "commit": "f12b15e1b3a33524eb06a1ae7bc852fb1fd92197" },
-  "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" },
-  "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
-  "tokyonight.nvim": { "branch": "main", "commit": "771f7cd1e6a32ba435305e4576aa9094137568ea" },
-  "trouble.nvim": { "branch": "main", "commit": "3609bb9a82bbab1ef95cf2c27ce7e52267a7d40d" },
+  "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" },
+  "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" },
+  "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" },
+  "tokyonight.nvim": { "branch": "main", "commit": "1471dab694ad88351185758bb4275624d8b798ec" },
+  "trouble.nvim": { "branch": "main", "commit": "bf99ea71a39e322336b7f8be965f86dbf5c65540" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-dirtytalk": { "branch": "master", "commit": "aa57ba902b04341a04ff97214360f56856493583" },
-  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
-  "vscode.nvim": { "branch": "main", "commit": "ff3926901d4160886f707a8a70b5c2e82979a7c4" },
-  "which-key.nvim": { "branch": "main", "commit": "0539da005b98b02cf730c1d9da82b8e8edb1c2d2" },
-  "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" },
-  "zk-nvim": { "branch": "main", "commit": "1f331d994d90f1dc93d023508951be437d19813e" }
-}
+  "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" },
+  "vscode.nvim": { "branch": "main", "commit": "3ba16d763097cecc75eb93761f4a981467acfc23" },
+  "which-key.nvim": { "branch": "main", "commit": "439d1247cbfed8ee46d6c9a5edbfad6b4c968e06" },
+  "zen-mode.nvim": { "branch": "main", "commit": "a31cf7113db34646ca320f8c2df22cf1fbfc6f2a" },
+  "zk-nvim": { "branch": "main", "commit": "15e24e96cb90889ebd12b5dbe800a958c716f520" }
+}

lua/config/lazy.lua

@@ -3,7 +3,7 @@
 
 -- Bootstrap lazy.nvim
 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
   vim.fn.system({
     "git",
     "clone",

lua/plugins/colors/gruvbox.lua

@@ -4,7 +4,8 @@
 ---@type LazyPluginSpec
 return {
   "ellisonleao/gruvbox.nvim",
-  event = { "ColorSchemePre" },
+  lazy = false,
+  priority = 1000,
   opts = {
     contrast = "hard", -- can be "hard", "soft" or empty string
     inverse = false, -- invert background for search, diffs, statusline and errors

lua/plugins/colors/sakura.lua

@@ -4,7 +4,8 @@
 ---@type LazyPluginSpec
 return {
   "numtostr/sakura.nvim",
-  event = { "ColorSchemePre" },
+  lazy = false,
+  priority = 1000,
   opts = {
     transparent = true,
   },

lua/plugins/colors/tokyonight.lua

@@ -5,54 +5,46 @@
 ---@type LazyPluginSpec
 return {
   "folke/tokyonight.nvim",
-  event = { "ColorSchemePre" },
+  lazy = false,
+  priority = 1000,
   opts = {
-    style = "night",
-    day_brightness = 0.3,
-    transparent = true,
-    terminal_colors = true,
+    style = "night", -- The theme comes in three styles, `storm`, a darker variant `night` and `day`
+    transparent = true, -- Enable this to disable setting the background color
     styles = {
+      -- Style to be applied to different syntax groups
+      -- Value is any valid attr-list value for `:help nvim_set_hl`
       comments = { italic = false },
       keywords = { italic = false },
-      functions = {},
-      variables = {},
-      sidebars = "transparent",
-      floats = "transparent",
+      -- Background styles. Can be "dark", "transparent" or "normal"
+      floats = "transparent", -- style for floating windows
+      sidebars = "transparent", -- style for sidebars
     },
-    sidebars = {
-      "NvimTree",
-      "Touble",
-      "floaterm",
-      "help",
-      "neotree",
-      "nerdtree",
-      "packer",
-      "qf",
-      "terminal",
-      "toggleterm",
-      "vista_kind",
-    },
-    --- You can override specific color groups to use other groups or a hex color
-    --- function will be called with a ColorScheme table
+    ---You can override specific color groups to use other groups or a hex color
+    ---function will be called with a ColorScheme table
     ---@param c ColorScheme
     on_colors = function(c)
       c.hint = c.orange
-      c.gitSigns.change = "#7F6526"
     end,
-    --- You can override specific highlights to use other groups or a hex color
-    --- function will be called with a Highlights and ColorScheme table
-    ---@param hl Highlights
+    ---You can override specific highlights to use other groups or a hex color
+    ---function will be called with a Highlights and ColorScheme table
+    ---@param hl tokyonight.Highlights
     ---@param _c ColorScheme
     on_highlights = function(hl, _c)
-      hl.FoldColumn = { bg = "none" }
-      hl.String = { fg = "#cbaa73" }
-      hl.VertSplit = { fg = "#39394e" }
-      hl.WhichKeyFloat = { link = "StatusLineNC" }
       hl.NormalFloat = { link = "Normal" }
+      hl.WinSeparator = { fg = "#39394e" }
+      hl.VertSplit = { link = "WinSeparator" }
+
+      -- Telescope
+      hl.TelescopeSelection = { link = "PmenuSel" }
+      hl.TelescopePreviewBorder = { link = "WinSeparator" }
+      hl.TelescopePromptBorder = { link = "WinSeparator" }
+      hl.TelescopeResultsBorder = { link = "WinSeparator" }
 
-      hl.TelescopePreviewBorder = { link = "VertSplit" }
-      hl.TelescopePromptBorder = { link = "VertSplit" }
-      hl.TelescopeResultsBorder = { link = "VertSplit" }
+      -- Treesitter
+      hl.TreesitterContext = { bg = "none" }
+
+      -- Whichkey
+      hl.WhichKeyFloat = { link = "StatusLineNC" }
     end,
   },
 }

lua/plugins/colors/vscode.lua

@@ -4,7 +4,7 @@
 ---@type LazyPluginSpec
 return {
   "Mofiqul/vscode.nvim",
-  event = { "ColorSchemePre" },
+  lazy = false,
   priority = 1000,
   opts = function()
     local c = require("vscode.colors").get_colors()

lua/plugins/dap/adapters/lua.lua

@@ -1,7 +1,7 @@
 local dap = require("dap")
 local mason_packages = vim.fn.stdpath("data") .. "/mason/packages"
 local luadb_dir = mason_packages .. "/local-lua-debugger-vscode"
-local HOME = vim.loop.os_homedir()
+local HOME = vim.uv.os_homedir()
 
 dap.adapters["local-lua"] = {
   type = "executable",
@@ -43,7 +43,7 @@ dap.adapters.nlua = function(callback, config)
       detached = true,
     }
     local command = "/home/daephx/.local/share/cargo/bin/alacritty"
-    handle, pid_or_err = vim.loop.spawn(command, opts, function(code)
+    handle, pid_or_err = vim.uv.spawn(command, opts, function(code)
       if handle ~= nil then
         handle:close()
       end
@@ -52,7 +52,7 @@ dap.adapters.nlua = function(callback, config)
     if not handle then
       error(pid_or_err)
     end
-    local timer = vim.loop.new_timer()
+    local timer = vim.uv.new_timer()
     if timer ~= nil then
       timer:start(1000, 0, function()
         timer:stop()
@@ -68,7 +68,7 @@ dap.adapters.nlua = function(callback, config)
 end
 
 local function free_port()
-  local tcp = vim.loop.new_tcp()
+  local tcp = vim.uv.new_tcp()
   tcp:bind("127.0.0.1", 0)
   local port = tcp:getsockname().port
   tcp:shutdown()

lua/plugins/dashboard.lua

@@ -71,7 +71,7 @@ return {
         {
           icon = "",
           desc = "Exit",
-          keymap = "",
+          keymap = "SHFT z z",
           key = "q",
           action = "exit",
         },

lua/plugins/gitsigns.lua

@@ -13,7 +13,17 @@ return {
       delete = { text = "▎" },
       topdelete = { text = "▎" },
       changedelete = { text = "▎" },
+      untracked = { text = "▎" },
     },
+    signs_staged = {
+      add = { text = "▎" },
+      change = { text = "▎" },
+      delete = { text = "▎" },
+      topdelete = { text = "▎" },
+      changedelete = { text = "▎" },
+      untracked = { text = "▎" },
+    },
+    signs_staged_enable = false,
     current_line_blame = true,
     current_line_blame_formatter_opts = {
       relative_time = false,
@@ -27,19 +37,19 @@ return {
       end
 
       -- Navigation
-      map("n", "]c", function()
+      map("n", "]h", function()
         if vim.wo.diff then
-          return "]c"
+          return "]h"
         end
         vim.schedule(function()
           gitsigns.next_hunk()
         end)
         return "<Ignore>"
       end, { expr = true, desc = "Next hunk" })
 
-      map("n", "[c", function()
+      map("n", "[h", function()
         if vim.wo.diff then
-          return "[c"
+          return "[h"
         end
         vim.schedule(function()
           gitsigns.prev_hunk()

lua/plugins/lsp/init.lua

@@ -103,9 +103,14 @@ return {
     "folke/lazydev.nvim",
     ft = "lua",
     cmd = "LazyDev",
+    dependencies = {
+      -- NOTE: optional `vim.uv` typing
+      { "Bilal2453/luvit-meta", lazy = true },
+    },
     opts = {
       library = {
         { path = "lazy.nvim" },
+        { path = "luvit-meta/library", words = { "vim%.uv" } },
       },
     },
   },

lua/plugins/lsp/null-ls.lua

@@ -28,7 +28,6 @@ local hover = null_ls.builtins.hover
 return {
   sources = {
     -- General
-    diagnostics.write_good,
     hover.dictionary,
 
     -- Git Version Control

lua/plugins/lsp/settings/jdtls.lua

@@ -7,7 +7,7 @@ if not jdtls_ok then
 end
 
 local env = {
-  HOME = vim.loop.os_homedir(),
+  HOME = vim.uv.os_homedir(),
   XDG_CACHE_HOME = os.getenv("XDG_CACHE_HOME"),
   JDTLS_JVM_ARGS = os.getenv("JDTLS_JVM_ARGS"),
 }