chore: update plugins

lazy-lock.json

@@ -1,61 +1,57 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
+  "LuaSnip": { "branch": "master", "commit": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a" },
-  "avante.nvim": { "branch": "main", "commit": "70a73d4f981c1e4e09fba2ed96da5244cf9d1897" },
+  "adwaita.nvim": { "branch": "main", "commit": "334d918d5241262816624e8c80410574ccdb25dc" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" },
+  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "evergarden": { "branch": "main", "commit": "d93798f679c914c635d6a5a9b16a8a481b7c0779" },
-  "fleet-theme-nvim": { "branch": "master", "commit": "45c300c31485def326db00d9c857760d50e5c728" },
   "format-ts-errors.nvim": { "branch": "main", "commit": "4b7418d6689bc0fd3c1db0500c67133422522384" },
   "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" },
-  "gitsigns.nvim": { "branch": "main", "commit": "736f51d2bb684c06f39a2032f064d7244f549981" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
-  "go.nvim": { "branch": "master", "commit": "3279d15d146ab2eae6ad9bc930f3c8fc62a3697b" },
+  "go.nvim": { "branch": "master", "commit": "2f7cd3a20a2940320d5cad338722601ffa3ce31b" },
   "gruvbox": { "branch": "master", "commit": "697c00291db857ca0af00ec154e5bd514a79191f" },
-  "iceberg.nvim": { "branch": "main", "commit": "15070f77066fce582f5fae09ce4faa080c33aefd" },
+  "hybrid.nvim": { "branch": "master", "commit": "74dfee0d5084a3db5e2ad0a78a67ee45e93a64bf" },
-  "img-clip.nvim": { "branch": "main", "commit": "d8b6b030672f9f551a0e3526347699985a779d93" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lackluster.nvim": { "branch": "main", "commit": "b247a6f51cb43e49f3f753f4a59553b698bf5438" },
+  "kanagawa-paper.nvim": { "branch": "master", "commit": "9161cb185fd7f45d3e9d26118d2ce274c690d5fe" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
   "lsp-zero.nvim": { "branch": "v4.x", "commit": "d388e2b71834c826e61a3eba48caec53d7602510" },
   "lsp_signature.nvim": { "branch": "master", "commit": "62cadce83aaceed677ffe7a2d6a57141af7131ea" },
   "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
-  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
+  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "lush.nvim": { "branch": "main", "commit": "1be16d9002f8b2e8973a19ceac199ad394dea76a" },
+  "lush.nvim": { "branch": "main", "commit": "9c60ec2279d62487d942ce095e49006af28eed6e" },
   "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "844d247d998c2f9a6a3baad8bb9748edc55ce69f" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "7f9a39fcd2ac6e979001f857727d606888f5909c" },
-  "mason.nvim": { "branch": "main", "commit": "9e25c98d4826998460926f8c5c2284848d80ae89" },
+  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
-  "mellow.nvim": { "branch": "main", "commit": "3894d0d3238a8941f242b88baf3d1cbdb447282e" },
+  "mellow.nvim": { "branch": "main", "commit": "5cd188489bcc7eb512f0a30581ad972070f8e5cd" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
+  "neovim-ayu": { "branch": "master", "commit": "cc78e880cce5dfc1187d144ed7251c746feff259" },
   "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
+  "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
+  "nordic.nvim": { "branch": "main", "commit": "6afe957722fb1b0ec7ca5fbea5a651bcca55f3e1" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-lint": { "branch": "master", "commit": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594" },
+  "nvim-lint": { "branch": "master", "commit": "0864f81c681e15d9bdc1156fe3a17bd07db5a3ed" },
-  "nvim-lspconfig": { "branch": "master", "commit": "63a38440989c58e1f100373ab603fd24665bdc9a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d9879110d0422a566fa01d732556f4d5515e1738" },
-  "nvim-tree.lua": { "branch": "master", "commit": "dd2364d6802f7f57a98acb8b545ed484c6697626" },
+  "nvim-tree.lua": { "branch": "master", "commit": "e179ad2f83b5955ab0af653069a493a1828c2697" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "6853ecb2cd8b062365da1cdd1a2e6f934ad55ed6" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
-  "nvim-web-devicons": { "branch": "master", "commit": "3362099de3368aa620a8105b19ed04c2053e38c0" },
+  "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
-  "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" },
+  "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" },
-  "oldbook-theme": { "branch": "main", "commit": "750f124e25be9a9031691ceffeb2868cb08d6910" },
-  "oxocarbon.nvim": { "branch": "main", "commit": "b1aca1d6843b3eed1c4500ad5b106646375bd726" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "rasmus.nvim": { "branch": "main", "commit": "49f7ee7bf3eb00db52c77f84b15bc69f318bafc1" },
-  "render-markdown.nvim": { "branch": "main", "commit": "5df2eab599e06c48d04ea7e89cbaa3cdb4e09538" },
   "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "typescript-tools.nvim": { "branch": "master", "commit": "3c501d7c7f79457932a8750a2a1476a004c5c1a9" },
+  "typescript-tools.nvim": { "branch": "master", "commit": "bf11d98ad5736e1cbc1082ca9a03196d45c701f1" },
+  "vague.nvim": { "branch": "main", "commit": "e3d316dc1b84bc759b4cf31619595a9ed7b3ee19" },
   "vim-bujo": { "branch": "master", "commit": "ee3fecb5b3206b8073ac3fe4153391f320c99197" },
   "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
-  "zenbones.nvim": { "branch": "main", "commit": "510819be60a7e470f244488bc705c1fbcd88c4fc" }
+  "zenbones.nvim": { "branch": "main", "commit": "a934bc07d2ed4a98b74526c172d7f043736d8935" }
 }

lua/config/options.lua

@@ -3,6 +3,7 @@ local opt = vim.opt
 -- Better line number display
 opt.number = true
 opt.relativenumber = true
+opt.signcolumn = 'yes'
 
 -- Use tabs
 opt.tabstop = 4
@@ -11,9 +12,12 @@ opt.shiftwidth = 4
 opt.expandtab = false
 opt.smartindent = true
 
+-- Diagnostic borders
+opt.winborder = "rounded"
+
 -- Highlight cursor line
 opt.cursorline = true
-vim.api.nvim_set_hl(0, "CursorLine", { bg = "#ede7da" })
+-- vim.api.nvim_set_hl(0, "CursorLine", { bg = "#ede7da" })
 
 -- Use line wrapping
 opt.wrap = true
@@ -37,9 +41,6 @@ opt.splitright = true
 -- prevent comment insertion when pressing 'o' on a commented line
 opt.formatoptions:remove "o"
 
--- Prevent pause on long listing that don't fit inside the buffer
-opt.more = false
-
 -- Undo settings
 opt.swapfile = false
 opt.backup = false

lua/custom/lsp/config.lua

@@ -1,17 +1,17 @@
 local lsp_zero = require("lsp-zero")
 
 -- Configure Vim diagnostic
-vim.diagnostic.config({
+-- vim.diagnostic.config({
-	virtual_text = true,
+-- 	virtual_text = true,
-	severity_sort = true,
+-- 	severity_sort = true,
-	float = {
+-- 	float = {
-		style = "minimal",
+-- 		style = "minimal",
-		border = "none",
+-- 		border = "none",
-		source = "if_many",
+-- 		source = "if_many",
-		header = "",
+-- 		header = "",
-		prefix = "",
+-- 		prefix = "",
-	},
+-- 	},
-})
+-- })
 
 -- Lsp icons
 lsp_zero.set_sign_icons({

lua/custom/lsp/config/lua_ls.lua

@@ -1,9 +1,10 @@
 return {
 	settings = {
 		Lua = {
-			diagnostics = {
+			workspace = {
-				globals = { "vim" },
+				checkThirdParty = false,
-			},
+				library = { vim.env.VIMRUNTIME },
+			}
 		},
 	},
 }

lua/custom/lualine.lua

@@ -22,9 +22,9 @@ require("lualine").setup({
 		lualine_a = { "mode" },
 		lualine_b = { { 'branch', icon = { '', align = 'right' } }, "diff", "diagnostics" },
 		lualine_c = { { "filename", path = 1 } },
-		lualine_x = { { "filetype", color = { bg = 'none' } } },
+		lualine_x = { { "filetype" } },
 		lualine_y = {},
-		lualine_z = { { "location", color = { bg = 'none' } } },
+		lualine_z = { { "location" } },
 	},
 	inactive_sections = {
 		lualine_a = {},
@@ -39,5 +39,3 @@ require("lualine").setup({
 	inactive_winbar = {},
 	extensions = {}
 })
-
-vim.cmd("hi lualine_c_normal guibg=none")

lua/custom/plugins/avante.lua

@@ -1,83 +0,0 @@
-return {
-	"yetone/avante.nvim",
-	lazy = false,
-	priority = 10,
-	keys = {
-		{ "<leader>an", "<cmd>AvanteChatNew<cr>", desc = "Avante New Chat" },
-	},
-	opts = {
-		providers = {
-			openai = {
-				endpoint = "https://api.openai.com/v1",
-				model = "gpt-4o",
-				timeout = 60000,
-				extra_request_body = {
-					temperature = 0,
-				},
-				max_tokens = 8192,
-			},
-		},
-		hints = { enabled = false },
-		mappings = {
-			submit = {
-				insert = "<C-s>"
-			}
-		},
-		behaviour = {
-			auto_suggestions = false,
-		},
-		highlights = {
-			diff = {
-				current = "DiffText",
-				incoming = "DiffAdd",
-			},
-		},
-		windows = {
-			width = 45,
-			sidebar_header = {
-				enabled = false,
-			},
-			input = {
-				prefix = "",
-				height = 5,
-			},
-			ask = {
-				floating = false,
-				start_insert = true,
-				border = "rounded",
-				focus_on_apply = "ours",
-			},
-			edit = {
-				border = "rounded",
-				start_insert = true,
-			},
-		},
-	},
-	build = "make",
-	dependencies = {
-		"stevearc/dressing.nvim",
-		"nvim-lua/plenary.nvim",
-		"MunifTanjim/nui.nvim",
-		"nvim-tree/nvim-web-devicons",
-		{
-			"HakonHarnes/img-clip.nvim",
-			event = "VeryLazy",
-			opts = {
-				default = {
-					embed_image_as_base64 = false,
-					prompt_for_file_name = false,
-					drag_and_drop = {
-						insert_mode = true,
-					},
-				},
-			},
-		},
-		{
-			"MeanderingProgrammer/render-markdown.nvim",
-			opts = {
-				file_types = { "markdown", "Avante" },
-			},
-			ft = { "markdown", "Avante" },
-		},
-	},
-}

lua/custom/plugins/colorscheme.lua

@@ -5,7 +5,7 @@ return {
 		lazy = false,
 		priority = 1000,
 		config = function()
-			-- vim.cmd.colorscheme('zenwritten')
+			-- vim.cmd.colorscheme("zenwritten")
 		end
 	},
 	{
@@ -16,45 +16,6 @@ return {
 			-- vim.cmd("colorscheme mellow")
 		end
 	},
-	{
-		"kvrohit/rasmus.nvim",
-		priority = 1000,
-		init = function()
-			-- vim.cmd("colorscheme rasmus")
-		end
-	},
-	{
-		"slugbyte/lackluster.nvim",
-		lazy = false,
-		priority = 1000,
-		opts = {
-			tweak_syntax = {
-				comment = "#5a5a5a",
-			},
-		},
-		init = function()
-			-- vim.cmd("colorscheme lackluster-mint")
-		end
-	},
-	{
-		"comfysage/evergarden",
-		opts = {},
-		lazy = false,
-		priority = 1000,
-		init = function()
-			-- vim.cmd("colorscheme evergarden-winter")
-			-- vim.cmd("hi Normal guibg=NONE")
-		end
-	},
-	{
-		"felipeagc/fleet-theme-nvim",
-		opts = {},
-		lazy = false,
-		priority = 1000,
-		init = function()
-			-- vim.cmd("colorscheme fleet")
-		end
-	},
 	{
 		"projekt0n/github-nvim-theme",
 		lazy = false,
@@ -83,39 +44,72 @@ return {
 		end
 	},
 	{
-		"nyoom-engineering/oxocarbon.nvim",
+		"shaunsingh/nord.nvim",
-		lazy = false,
-		priority = 1000,
-		init = function()
-			-- vim.cmd("colorscheme oxocarbon")
-		end
-	},
-	{
-		"gko/oldbook-theme",
-		lazy = false,
-		priority = 1000,
-		init = function()
-			vim.o.background = "light"
-			vim.cmd("colorscheme oldbook-lsp")
-		end
-	},
-	{
-		"folke/tokyonight.nvim",
-		dependencies = "rktjmp/lush.nvim",
 		lazy = false,
 		priority = 1000,
+		opts = {},
 		config = function()
-			-- vim.cmd.colorscheme('tokyonight-night')
+			-- vim.o.background = "dark"
+			-- vim.cmd("colorscheme nord")
 		end
 	},
 	{
-		"oahlen/iceberg.nvim",
+		"AlexvZyl/nordic.nvim",
-		dependencies = "rktjmp/lush.nvim",
+		lazy = false,
+		priority = 1000,
+		opts = {},
+		config = function()
+			-- vim.o.background = "dark"
+			-- vim.cmd("colorscheme nordic")
+		end
+	},
+	{
+		"thesimonho/kanagawa-paper.nvim",
 		lazy = false,
 		priority = 1000,
 		config = function()
 			-- vim.o.background = "dark"
-			-- vim.cmd.colorscheme('iceberg')
+			-- vim.cmd.colorscheme("kanagawa-paper")
+		end
+	},
+	{
+		"Mofiqul/adwaita.nvim",
+		lazy = false,
+		priority = 1000,
+		config = function()
+			-- vim.o.background = "dark"
+			-- vim.cmd.colorscheme("adwaita")
+		end
+	},
+	{
+		"HoNamDuong/hybrid.nvim",
+		lazy = false,
+		priority = 1000,
+		config = function()
+			-- vim.o.background = "dark"
+			-- vim.cmd.colorscheme("hybrid")
+		end
+	},
+	{
+		"vague2k/vague.nvim",
+		lazy = false,
+		priority = 1000,
+		config = function()
+			vim.o.background = "dark"
+			vim.cmd.colorscheme("vague")
+			-- set IblScope highlighting to #1C1C1C
+			vim.api.nvim_set_hl(0, "IblScope", { fg = "#3f3f42" })
+			vim.api.nvim_set_hl(0, "IblIndent", { fg = "#2a2a2b" })
+			vim.o.cursorline = false
+		end
+	},
+	{
+		"Shatur/neovim-ayu",
+		lazy = false,
+		priority = 1000,
+		config = function()
+			-- vim.o.background = "dark"
+			-- vim.cmd.colorscheme("ayu")
 		end
 	}
 }

lua/custom/plugins/fugitive.lua

@@ -3,11 +3,6 @@ return {
 	event = { "BufReadPost", "BufNewFile", "BufWritePre", "VeryLazy" },
 	keys = {
 		{ "<leader>gd", "<cmd>Gvdiffsplit!<CR>" },
-		{ "<leader>gl", "<cmd>Git blame -w -C -C -C<CR>" },
 		{ "<leader>gS", "<cmd>Git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD),<CR>"},
-		{ "<leader>gbs", "<cmd>Git bisect start<CR>" },
-		{ "<leader>gbg", "<cmd>Git bisect good<CR>" },
-		{ "<leader>gbb", "<cmd>Git bisect bad<CR>" },
-		{ "<leader>gbr", "<cmd>Git bisect reset<CR>" },
 	},
 }

lua/custom/plugins/gitsigns.lua

@@ -4,7 +4,7 @@ return {
 	opts = {
 		current_line_blame = true,
 		current_line_blame_opts = {
-			virt_text = true,
+			virt_text = false,
 			virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
 			delay = 0,
 			ignore_whitespace = true,

lua/custom/plugins/indent-blankline.lua

@@ -7,11 +7,13 @@ return {
 			indent = {
 				char = "▏",
 				tab_char = "▏",
+				highlight = { "IblIndent" },
 			},
 			scope = {
 				enabled = true,
 				show_start = false,
 				show_end = false,
+				highlight = { "IblScope" },
 			},
 		})
 	end,

lua/custom/plugins/treesitter.lua

@@ -20,7 +20,6 @@ return {
 			},
 			auto_install = true,
 			indent = { enable = true },
-			ensure_installed = { "lua", "vim", "vimdoc", "typescript", "javascript", "go", "c", "cpp", "rust", "zig", "html", "css" },
 			incremental_selection = {
 				enable = true,
 				keymaps = {

lua/custom/typescript-tools.lua

@@ -7,7 +7,7 @@ require("typescript-tools").setup {
 			-- run the current go file in a vertical split terminal pane
 			vim.keymap.set("n", "<leader><CR>", "<cmd>vsplit term://npx tsx %<CR>")
 			-- open the Go scratchpad
-			vim.keymap.set("n", "<leader>q", "<cmd>e ~/personal/Node/test/main.ts<CR>")
+			vim.keymap.set("n", "<leader>q", "<cmd>e ~/personal/Node/test/src/index.ts<CR>")
 		end,
 	settings = {
 		jsx_close_tag = {