lolidk

config/.config/nvim/lazy-lock.json

@@ -29,7 +29,6 @@
   "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
   "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" },
   "debugprint.nvim": { "branch": "main", "commit": "661eea1d6f8237097ae372578fbe7458d690a3ac" },
-  "diagflow.nvim": { "branch": "main", "commit": "6882a91ec0473fbc4a04881c9bf7eaeb08185cac" },
   "fidget.nvim": { "branch": "main", "commit": "3a93300c076109d86c7ce35ec67a8034ae6ba9db" },
   "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" },
   "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" },
@@ -84,6 +83,7 @@
   "rustaceanvim": { "branch": "master", "commit": "d03f72788b81cb311250d9fe0692f3435d609b5a" },
   "scope.nvim": { "branch": "main", "commit": "cd27af77ad61a7199af5c28d27013fb956eb0e3e" },
   "scss-syntax.vim": { "branch": "master", "commit": "bda22a93d1dcfcb8ee13be1988560d9bb5bd0fef" },
+  "sonokai": { "branch": "master", "commit": "bdce098fc9e7202d3c555e2dc98c755ca1c23835" },
   "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
   "tagalong.vim": { "branch": "main", "commit": "5a2bbf2b1d5b657685a49d48d98a4aa921c1fde3" },
   "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },

vim/.vim/lua/plugins/diagnostics.lua

@@ -1,4 +1,28 @@
 return {
+	{
+		"luozhiya/lsp-virtual-improved.nvim",
+		event = { "LspAttach" },
+		config = function()
+			require("lsp-virtual-improved").setup()
+		end,
+	},
+	{
+		"folke/trouble.nvim",
+		event = { "LspAttach" },
+		config = function()
+			-- Diagnostics
+			require("trouble").setup({
+				use_diagnostic_signs = true, -- enabling this will use the signs defined in your lsp client
+			})
+		end,
+		keys = {
+			{ "<leader>xt", "<cmd>:Telescope diagnostics<CR>" },
+			{ "<leader>xw", "<cmd>:Trouble workspace_diagnostics<CR>" },
+			{ "<leader>xd", "<cmd>:Trouble document_diagnostics<CR>" },
+			{ "[g", "<cmd>lua vim.diagnostic.goto_prev()<CR>" },
+			{ "]g", "<cmd>lua vim.diagnostic.goto_next()<CR>" },
+		},
+	},
 	{
 		"Maan2003/lsp_lines.nvim",
 		event = { "LspAttach" },
@@ -7,15 +31,31 @@ return {
 			local signs = {
 				Error = " ",
 				Warning = " ",
-				Hint = " ",
+				Hint = "",
 				Info = " ",
-				Other = " ",
+				Other = "",
 			}
 			for type, icon in pairs(signs) do
 				local hl = "DiagnosticSign" .. type
 				vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
 			end
 
+			-- local colors = {
+			-- 	Error = { primary = "#f28b82", secondary = "#ab0101", invert = true },
+			-- 	Warning = { primary = "#f2b066", secondary = "#ab7a00", invert = false },
+			-- 	Hint = { primary = "#b4f9f8", secondary = "#008080", invert = true },
+			-- 	Info = { primary = "#abf2b0", secondary = "#008080", invert = true },
+			-- 	Other = { primary = "#abf2b0", secondary = "#008080", invert = true },
+			-- }
+			-- for type, colorpair in pairs(colors) do
+			-- 	local hl = "DiagnosticVirtualText" .. type
+			-- 	if not colorpair.invert then
+			-- 		vim.api.nvim_set_hl(0, hl, { fg = colorpair.primary, bg = colorpair.secondary })
+			-- 	else
+			-- 		vim.api.nvim_set_hl(0, hl, { fg = colorpair.secondary, bg = colorpair.primary })
+			-- 	end
+			-- end
+
 			require("lsp_lines").setup()
 
 			vim.schedule(function()
@@ -46,36 +86,4 @@ return {
 			},
 		},
 	},
-	{
-		"luozhiya/lsp-virtual-improved.nvim",
-		event = { "LspAttach" },
-		config = function()
-			require("lsp-virtual-improved").setup()
-		end,
-	},
-	{
-		"folke/trouble.nvim",
-		event = { "LspAttach" },
-		config = function()
-			-- Diagnostics
-			require("trouble").setup({
-				signs = {
-					-- icons / text used for a diagnostic
-					error = " ",
-					warning = " ",
-					hint = " ",
-					information = " ",
-					other = " ",
-				},
-				use_diagnostic_signs = false, -- enabling this will use the signs defined in your lsp client
-			})
-		end,
-		keys = {
-			{ "<leader>xt", "<cmd>:Telescope diagnostics<CR>" },
-			{ "<leader>xw", "<cmd>:Trouble workspace_diagnostics<CR>" },
-			{ "<leader>xd", "<cmd>:Trouble document_diagnostics<CR>" },
-			{ "[g", "<cmd>lua vim.diagnostic.goto_prev()<CR>" },
-			{ "]g", "<cmd>lua vim.diagnostic.goto_next()<CR>" },
-		},
-	},
 }

vim/.vim/lua/plugins/mason.lua

@@ -9,7 +9,7 @@ return {
 		local use_google = require("utils").use_google
 
 		local lsps = {
-			-- "lua_ls",
+			"lua_ls",
 			"html",
 			"marksman",
 			"sqlls",
@@ -23,7 +23,6 @@ return {
 				"pyright",
 				"omnisharp_mono",
 				"tsserver",
-				"gopls",
 				"docker_compose_language_service",
 				"dockerls",
 				"graphql",

vim/.vim/lua/plugins/nvim-treesitter.lua

@@ -1,46 +1,38 @@
 return {
 	"PrestonKnopp/tree-sitter-gdscript",
-	-- {
-	-- 	"nvim-treesitter/nvim-treesitter-context",
-	-- 	config = function()
-	-- 		require("treesitter-context").setup({
-	-- 			enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
-	-- 			max_lines = 7, -- How many lines the window should span. Values <= 0 mean no limit.
-	-- 			min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
-	-- 			line_numbers = true,
-	-- 			multiline_threshold = 7, -- Maximum number of lines to show for a single context
-	-- 			trim_scope = "outer", -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
-	-- 			mode = "cursor", -- Line used to calculate context. Choices: 'cursor', 'topline'
-	-- 			-- Separator between context and content. Should be a single character string, like '-'.
-	-- 			-- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
-	-- 			separator = nil,
-	-- 			zindex = 20, -- The Z-index of the context window
-	-- 			on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching
-	-- 		})
-	-- 	end,
-	-- },
 	{
 		"nvim-treesitter/nvim-treesitter",
 		build = ":TSUpdate",
 		config = function()
 			require("nvim-treesitter.configs").setup({
 				-- A list of parser names, or "all" (the five listed parsers should always be installed)
-				ensure_installed = "all",
+				ensure_installed = {
+					"c",
+					"lua",
+					"vim",
+					"vimdoc",
+					"query",
+					"java",
+					"kotlin",
+					"python",
+					"gdscript",
+					"rust",
+					"bash",
+					"go",
+					"java",
+					"json",
+					"markdown",
+				},
 
 				-- Install parsers synchronously (only applied to `ensure_installed`)
 				sync_install = false,
 
 				-- Automatically install missing parsers when entering buffer
 				-- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
-				auto_install = false,
+				auto_install = true,
 
-				indent = { enable = true },
 				-- List of parsers to ignore installing (or "all")
-				-- ignore_install = { "" },
-
-				---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
-				-- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
-
+				-- ignore_install = { "smali" },
 				highlight = {
 					enable = true,
 

vim/.vim/lua/plugins/themes-personal.lua

@@ -1,11 +1,21 @@
 local use_google = require("utils").use_google
 
 return {
+	{
+		"sainnhe/sonokai",
+		cond = false,
+		config = function()
+			vim.g.sonokai_diagnostic_virtual_text = "highlighted"
+			vim.g.sonokai_style = "andromeda"
+			vim.g.sonokai_dim_inactive_windows = 1
+			vim.cmd("colorscheme sonokai")
+		end,
+	},
 	{
 		"rebelot/kanagawa.nvim",
 		lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
 		priority = 1000, -- make sure to load this before all the other start plugins
-		-- cond = not use_google(),
+		cond = not use_google(),
 		config = function()
 			vim.cmd("colorscheme kanagawa-wave")
 		end,
@@ -14,9 +24,9 @@ return {
 		"nyoom-engineering/oxocarbon.nvim",
 		lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
 		priority = 1000, -- make sure to load this before all the other start plugins
-		cond = not use_google(),
+		cond = false,
 		config = function()
-			-- vim.cmd("colorscheme oxocarbon")
+			vim.cmd("colorscheme oxocarbon")
 		end,
 	},
 	{
@@ -24,9 +34,9 @@ return {
 		dependencies = { "rktjmp/lush.nvim" },
 		lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
 		priority = 1000, -- make sure to load this before all the other start plugins
-		cond = not use_google(),
+		cond = false,
 		config = function()
-			-- vim.cmd("colorscheme bluloco")
+			vim.cmd("colorscheme bluloco")
 		end,
 	},
 }