misc

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

@@ -1,3 +1,6 @@
+-- disable underline
+vim.diagnostic.handlers.underline.show = function() end
+
 return {
 	{
 		"folke/trouble.nvim",

vim/.vim/lua/plugins/google.lua

@@ -36,9 +36,9 @@ return {
 	veryLazy(glug("logmsgs")),
 	veryLazy(glug("googler")),
 	-- Add support for google filetypes
-	glug("google-filetypes", {
+	veryLazy(glug("google-filetypes", {
 		event = "BufReadPre",
-	}),
+	})),
 	-- Set up syntax, indent, and core settings for various filetypes
 	veryLazy(glug("ft-cel")),
 	veryLazy(glug("ft-clif")),
@@ -237,7 +237,7 @@ return {
 		end,
 	}),
 	-- Imports
-	glug("imp-google", {
+	veryLazy(glug("imp-google", {
 		dependencies = {
 			glugOpts("vim-imp", {
 				"flwyd/vim-imp",
@@ -254,7 +254,7 @@ return {
 		keys = {
 			{ "<leader>i", ":ImpSuggest <C-r><C-w><cr>" },
 		},
-	}),
+	})),
 	{
 		name = "ai.nvim",
 		url = "sso://googler@user/vvvv/ai.nvim",

vim/.vim/lua/plugins/lsp.lua

@@ -1,13 +1,5 @@
 local use_google = require("utils").use_google
 
-local deps = {
-	"hrsh7th/nvim-cmp",
-	"nvim-lua/lsp-status.nvim",
-	"VonHeikemen/lsp-zero.nvim",
-	"ray-x/go.nvim",
-	"ray-x/guihua.lua",
-}
-
 return {
 	{
 		"luozhiya/lsp-virtual-improved.nvim",
@@ -18,6 +10,7 @@ return {
 	},
 	{
 		"kosayoda/nvim-lightbulb",
+		event = { "LspAttach" },
 		opts = {
 			autocmd = { enabled = true },
 			virtual_text = {
@@ -38,6 +31,7 @@ return {
 	},
 	{
 		"hinell/lsp-timeout.nvim",
+		event = { "LspAttach" },
 		dependencies = { "neovim/nvim-lspconfig" },
 		cond = not use_google(),
 		config = function()
@@ -53,7 +47,13 @@ return {
 	},
 	{
 		"neovim/nvim-lspconfig",
-		dependencies = deps,
+		dependencies = {
+			"hrsh7th/nvim-cmp",
+			"nvim-lua/lsp-status.nvim",
+			"VonHeikemen/lsp-zero.nvim",
+			"ray-x/go.nvim",
+			"ray-x/guihua.lua",
+		},
 		keys = {
 			{ "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>" },
 			-- { "?", "<cmd>lua vim.lsp.buf.code_action()<CR>" },

vim/.vim/lua/plugins/telescope.lua

@@ -36,20 +36,20 @@ local function get_visual_selection()
 end
 
 local keys = {
-	{ "<leader>ts", "<cmd>lua live_grep()<CR>", desc = "Search in CWD" },
-	{ "<leader>tk", "<cmd>Telescope Keymaps<CR>", desc = "Search Keymaps" },
-	{ "<C-P>", "<cmd>lua find_files()<CR>", desc = "Find Files in CWD" },
-	{ "<leader>tf", "<cmd>lua find_files()<CR>", desc = "Find Files in CWD" },
-	{ "<leader>td", "<cmd>lua find_dotfiles()<CR>", desc = "Find Dotfiles" },
-	{ "<leader>tn", ":Telescope notify<CR>", desc = "Notifications" },
-	{ "<leader>tk", ":Telescope keymaps<CR>", desc = "Keymaps" },
-	{ "<leader>tf.", "<cmd>lua vim.error('use <leader>e')<CR>", desc = "Find Files in Buffer Directory" },
-	{ "<leader>e", "<cmd>lua search_cwd()<CR>", desc = "Find Files in Buffer Directory" },
+	{ "<C-P>", ":lua find_files()<CR>", desc = "Find Files in CWD" },
+	{ "<leader>e", ":lua search_cwd()<CR>", desc = "Find Files in Buffer Directory" },
+	{ "<leader>tc", ":Telescope textcase<CR>", desc = "Text case" },
+	{ "<leader>td", ":lua find_dotfiles()<CR>", desc = "Find Dotfiles" },
+	{ "<leader>tf", ":lua find_files()<CR>", desc = "Find Files in CWD" },
+	{ "<leader>tf.", ":lua vim.error('use <leader>e')<CR>", desc = "Find Files in Buffer Directory" },
 	{ "<leader>tg", ":Telescope git_files<CR>", desc = "Git Files" },
-	{ "<leader>tr", ":Telescope resume<CR>", desc = "Telescope Resume" },
+	{ "<leader>th", ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
+	{ "<leader>tk", ":Telescope keymaps<CR>", desc = "Keymaps" },
+	{ "<leader>tk", ":Telescope Keymaps<CR>", desc = "Search Keymaps" },
+	{ "<leader>tn", ":Telescope notify<CR>", desc = "Notifications" },
 	{ "<leader>to", ":Telescope oldfiles<CR>", desc = "Recent(oldfiles) Files" },
-	{ "<leader>th", "<cmd>lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
-	{ "<leader>tns", [[<cmd>lua require("neoscopes").select()<CR>]], desc = "NeoScopes" },
+	{ "<leader>tr", ":Telescope resume<CR>", desc = "Telescope Resume" },
+	{ "<leader>ts", ":lua live_grep()<CR>", desc = "Search in CWD" },
 }
 
 if use_google() then
@@ -105,9 +105,13 @@ return {
 		config = function()
 			require("telescope").load_extension("import")
 		end,
-		keys = {
-			{ "<leader>i", ":Telescope import<CR>" },
-		},
+		keys = function()
+			if not use_google() then
+				return {
+					{ "<leader>i", ":Telescope import<CR>" },
+				}
+			end
+		end,
 	},
 	{
 		"nvim-telescope/telescope.nvim",

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

@@ -3,21 +3,21 @@ local use_google = require("utils").use_google
 return {
 	{
 		"sainnhe/sonokai",
-		cond = false,
+		-- 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")
+			-- 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")
+			-- vim.cmd("colorscheme kanagawa-wave")
 		end,
 	},
 	{