Adjusted git keymaps to be easier to use

alacritty/dot-config/alacritty/alacritty.toml

@@ -6,7 +6,7 @@ TERM = "xterm-256color"
 size = 9.8
 
 [font.normal]
-family = "Hack Nerd Font Mono"
+family = "Hack Nerd Font"
 
 [window]
 decorations = "none"

nvim/dot-config/nvim/lua/autocmds.lua

@@ -1,5 +1,3 @@
-local window = require("symbols.window")
-
 -- Highlight on yank
 vim.api.nvim_create_autocmd("TextYankPost", {
 	callback = function()
@@ -27,63 +25,58 @@ vim.api.nvim_create_autocmd({ "InsertEnter", "WinLeave" }, {
 	end,
 })
 
+local group = vim.api.nvim_create_augroup("lsp-attach", { clear = true })
 -- Setup lsp keybindings
 vim.api.nvim_create_autocmd("LspAttach", {
+	group = group,
 	callback = function(event)
-		-- Symbols
+		local map = function(keys, func, desc, mode)
-		vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Goto definition" })
+			mode = mode or "n"
-		vim.keymap.set("n", "gD", vim.lsp.buf.declaration, { desc = "Goto declaration" })
+			vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = desc })
-		vim.keymap.set("n", "<leader>D", vim.lsp.buf.type_definition, { desc = "Type definition" })
+		end
 
-		if pcall(require, "telescope") then
+		-- Symbols
-			vim.keymap.set("n", "gr", require("telescope.builtin").lsp_references, { desc = "Goto references" })
+		map("grD", vim.lsp.buf.declaration, "Goto declaration")
-			vim.keymap.set(
+
-				"n",
+		local has_telescope, telescope = pcall(require, "telescope.builtin")
-				"gI",
+		if has_telescope then
-				require("telescope.builtin").lsp_implementations,
+			map("grd", telescope.lsp_definitions, "Goto definition")
-				{ desc = "Goto implementation" }
+
-			)
+			map("grt", telescope.lsp_type_definitions, "Type definition")
-			vim.keymap.set(
+
-				"n",
+			map("grr", telescope.lsp_references, "Goto references")
-				"<leader>ds",
+			map("gri", telescope.lsp_implementations, "Goto implementation")
-				require("telescope.builtin").lsp_document_symbols,
+			map("gO", telescope.lsp_document_symbols, "Document symbols")
-				{ desc = "Document symbols" }
+			map("gW", telescope.lsp_dynamic_workspace_symbols, "Workspace symbols")
-			)
-			vim.keymap.set(
-				"n",
-				"<leader>ws",
-				require("telescope.builtin").lsp_dynamic_workspace_symbols,
-				{ desc = "Workspace symbols" }
-			)
 		end
 
 		-- Diagnostics
-		vim.keymap.set("n", "[d", function()
+		map("[d", function()
 			vim.diagnostic.jump({ count = -1 })
-		end, { desc = "Go to previous diagnostic message" })
+		end, "Go to previous diagnostic message")
-		vim.keymap.set("n", "]d", function()
+		map("]d", function()
 			vim.diagnostic.jump({ count = 1 })
-		end, { desc = "Go to next diagnostic message" })
+		end, "Go to next diagnostic message")
-		vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
+		map("<leader>e", vim.diagnostic.open_float, "Open floating diagnostic message")
 
 		-- Helpers
-		vim.keymap.set("n", "<leader>rn", function()
+		vim.keymap.set("n", "grn", function()
 			return ":IncRename " .. vim.fn.expand("<cword>")
 		end, { buffer = event.buf, expr = true, desc = "Rename" })
-		vim.keymap.set(
+		map("gra", vim.lsp.buf.code_action, "Code actions", { "n", "x" })
-			"n",
-			"<leader>ca",
-			vim.lsp.buf.code_action,
-			{ buffer = event.buf, desc = "Code actions", remap = true }
-		)
 
-		-- Documentation
+		local client = vim.lsp.get_client_by_id(event.data.client_id)
-		-- vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, { desc = "Signature Documentation" })
+		if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
+			map("<leader>th", function()
+				vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = event.buf }))
+			end, "Inlay hints")
+		end
 	end,
 })
 
 -- Setup cursor hover symbol highlight
 vim.api.nvim_create_autocmd("LspAttach", {
+	group = group,
 	callback = function(event)
 		local client = vim.lsp.get_client_by_id(event.data.client_id)
 		if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
@@ -113,6 +106,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
 
 -- Disable lsp based syntax highlighting
 vim.api.nvim_create_autocmd("LspAttach", {
+	group = group,
 	callback = function(event)
 		local client = vim.lsp.get_client_by_id(event.data.client_id)
 		if client and client.server_capabilities.semanticTokensProvider then

nvim/dot-config/nvim/lua/options.lua

@@ -66,6 +66,8 @@ vim.o.listchars = "trail:~,tab:¦⁃,nbsp:␣"
 vim.o.list = true
 
 -- Fold settings
+vim.wo.foldmethod = "expr"
+vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
 vim.o.foldlevelstart = 99
 
 -- Windows borders
@@ -75,11 +77,17 @@ vim.o.winborder = window.border
 vim.diagnostic.config({
 	severity_sort = true,
 	signs = {
+		numhl = {
+			[vim.diagnostic.severity.ERROR] = "DiagnosticNumError",
+			[vim.diagnostic.severity.WARN] = "DiagnosticNumWarn",
+			[vim.diagnostic.severity.HINT] = "DiagnosticNumHint",
+			[vim.diagnostic.severity.INFO] = "DiagnosticNumInfo",
+		},
 		text = {
-			[vim.diagnostic.severity.ERROR] = diagnostic.error,
+			[vim.diagnostic.severity.ERROR] = "",
-			[vim.diagnostic.severity.WARN] = diagnostic.warn,
+			[vim.diagnostic.severity.WARN] = "",
-			[vim.diagnostic.severity.HINT] = diagnostic.hint,
+			[vim.diagnostic.severity.HINT] = "",
-			[vim.diagnostic.severity.INFO] = diagnostic.info,
+			[vim.diagnostic.severity.INFO] = "",
 		},
 	},
 	float = {
@@ -93,7 +101,7 @@ vim.diagnostic.config({
 	},
 	virtual_text = {
 		prefix = function(d)
-			return vim.diagnostic.config().signs.text[d.severity]
+			return diagnostic[d.severity]
 		end,
 		virt_text_pos = "eol_right_align",
 	},

nvim/dot-config/nvim/lua/plugins/comment.lua

@@ -1,6 +1,13 @@
 -- https://github.com/numToStr/Comment.nvim
 return {
-	'numToStr/Comment.nvim',
+	"numToStr/Comment.nvim",
 	event = "VeryLazy",
-	opts = {},
+	opts = {
+		toggler = {
+			block = "gBc",
+		},
+		opleader = {
+			block = "gB",
+		},
+	},
 }

nvim/dot-config/nvim/lua/plugins/gitsigns.lua

@@ -1,3 +1,4 @@
+-- https://github.com/lewis6991/gitsigns.nvim
 return {
 	-- Adds git related signs to the gutter, as well as utilities for managing changes
 	"lewis6991/gitsigns.nvim",
@@ -20,33 +21,33 @@ return {
 		},
 		attach_to_untracked = true,
 		current_line_blame_opts = {
-			virt_text_pos = "right_align",
+			virt_text_pos = "eol",
+			virt_text_priority = 1,
 			delay = 200,
-			priority = 9999,
 		},
 	},
 	init = function()
-		vim.keymap.set("n", "<leader>gs", require("gitsigns.actions").stage_hunk, { desc = "Stage hunk" })
+		local ga = require("gitsigns.actions")
-		vim.keymap.set("v", "<leader>gs", function()
+		vim.keymap.set("n", "gs", ga.stage_hunk, { desc = "(Un)stage hunk" })
-			require("gitsigns.actions").stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
+		vim.keymap.set("v", "gs", function()
-		end, { desc = "Stage selection" })
+			ga.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
+		end, { desc = "(Un)stage selection" })
 
-		vim.keymap.set("n", "<leader>gS", require("gitsigns.actions").undo_stage_hunk, { desc = "Undo stage hunk" })
+		vim.keymap.set("n", "gd", ga.preview_hunk, { desc = "Diff hunk" })
 
-		vim.keymap.set("n", "<leader>gd", require("gitsigns.actions").preview_hunk, { desc = "Diff hunk" })
+		vim.keymap.set("n", "<leader>tb", ga.toggle_current_line_blame, { desc = "Line blame" })
+		vim.keymap.set("n", "gb", ga.blame_line, { desc = "View blame" })
 
-		vim.keymap.set("n", "<leader>gb", require("gitsigns.actions").toggle_current_line_blame, { desc = "Blame" })
+		vim.keymap.set("n", "<leader>gr", ga.reset_hunk, { desc = "Reset hunk" })
-
-		vim.keymap.set("n", "<leader>gr", require("gitsigns.actions").reset_hunk, { desc = "Reset hunk" })
 		vim.keymap.set("v", "<leader>gr", function()
-			require("gitsigns.actions").reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
+			ga.reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
 		end, { desc = "Reset selection" })
 
 		vim.keymap.set("n", "]g", function()
-			require("gitsigns.actions").nav_hunk("next")
+			ga.nav_hunk("next")
 		end, { desc = "Next hunk" })
 		vim.keymap.set("n", "[g", function()
-			require("gitsigns.actions").nav_hunk("prev")
+			ga.nav_hunk("prev")
 		end, { desc = "Previous hunk" })
 	end,
 }

nvim/dot-config/nvim/lua/plugins/lazydev.lua

@@ -5,9 +5,10 @@ return {
 		ft = "lua",
 		opts = {
 			library = {
-				{ path = "luvit-meta/library", words = { "vim%.uv" } },
+				-- See the configuration section for more details
+				-- Load luvit types when the `vim.uv` word is found
+				{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
 			},
 		},
 	},
-	{ "Bilal2453/luvit-meta", lazy = true }, -- optional `vim.uv` typings
 }

nvim/dot-config/nvim/lua/plugins/todo-comments.lua

@@ -35,7 +35,7 @@ return {
 				-- HACK: Hack
 				HACK = { icon = diagnostic.hack },
 				-- WARN: Warn
-				WARN = { icon = diagnostic.warning },
+				WARN = { icon = diagnostic.warn },
 				-- PERF: Perf
 				PERF = { icon = diagnostic.performance },
 				-- NOTE: Note

nvim/dot-config/nvim/lua/plugins/treesitter.lua

@@ -18,10 +18,9 @@ return {
 			incremental_selection = {
 				enable = true,
 				keymaps = {
-					init_selection = "<c-space>",
+					init_selection = "<M-o>",
-					node_incremental = "<c-space>",
+					node_incremental = "<M-o>",
-					scope_incremental = "<c-s>",
+					node_decremental = "<M-i>",
-					node_decremental = "<M-space>",
 				},
 			},
 			textobjects = {

nvim/dot-config/nvim/lua/plugins/which-key.lua

@@ -49,8 +49,9 @@ return {
 		require("which-key").add({
 			{ "<leader>b", group = "Buffer" },
 			{ "<leader>d", group = "Document" },
-			{ "<leader>g", group = "Git" },
+			{ "<leader>t", group = "Toggle" },
 			{ "<leader>s", group = "Search" },
+			{ "gr", group = "LSP" },
 		})
 	end,
 }

nvim/dot-config/nvim/lua/symbols/diagnostic.lua

@@ -1,6 +1,10 @@
 -- Symbols to use for diagnostics
 return {
 	-- LSP Status symbols
+	[vim.diagnostic.severity.ERROR] = " ",
+	[vim.diagnostic.severity.WARN] = " ",
+	[vim.diagnostic.severity.INFO] = " ",
+	[vim.diagnostic.severity.HINT] = "󰌵",
 	error = " ",
 	warn = " ",
 	info = " ",

nvim/dot-config/nvim/lua/themes/gruvbox.lua

@@ -11,6 +11,7 @@ return {
 				strings = false,
 			},
 			overrides = {
+				CursorLineNr = { fg = palette.light4, bg = palette.dark1, bold = true },
 				YankHighlight = { fg = palette.bright_blue, bg = palette.dark0, reverse = true },
 				Search = { fg = palette.bright_aqua },
 				IncSearch = { link = "Search" },
@@ -43,12 +44,12 @@ return {
 				TodoCommentHint = { fg = palette.bright_aqua },
 				TodoCommentTest = { fg = palette.bright_purple },
 				TodoCommentDefault = { fg = palette.bright_blue },
-				GitSignsAdd = { link = "GruvboxGreenSign" },
+				GitSignsAdd = { fg = palette.bright_green, bold = true },
-				GitSignsStagedAdd = { fg = palette.dark_green, bg = palette.dark1 },
+				GitSignsStagedAdd = { fg = palette.dark_green, bold = true },
-				GitSignsChange = { link = "GruvboxAquaSign" },
+				GitSignsChange = { fg = palette.bright_aqua, bold = true },
-				GitSignsStagedChange = { fg = palette.dark_aqua, bg = palette.dark1 },
+				GitSignsStagedChange = { fg = palette.dark_aqua, bold = true },
-				GitSignsDelete = { link = "GruvboxRedSign" },
+				GitSignsDelete = { fg = palette.bright_red, bold = true },
-				GitSignsStagedDelete = { fg = palette.dark_red, bg = palette.dark1 },
+				GitSignsStagedDelete = { fg = palette.dark_red, bold = true },
 				GitSignsCurrentLineBlame = { link = "GruvboxFg4" },
 				NeoTreeGitAdded = { link = "GruboxGreen" },
 				NeoTreeGitModified = { link = "GruvboxAqua" },
@@ -68,6 +69,10 @@ return {
 				NeoTreeFileIcon = { fg = palette.light1 },
 				NeoTreeFilterTerm = { fg = palette.bright_aqua, bold = true },
 				NeoTreeSymbolicLinkTarget = { fg = palette.bright_aqua, bold = true },
+				DiagnosticNumError = { fg = palette.dark0, bg = palette.bright_red, bold = true },
+				DiagnosticNumWarn = { fg = palette.dark0, bg = palette.bright_yellow, bold = true },
+				DiagnosticNumHint = { fg = palette.dark0, bg = palette.bright_aqua, bold = true },
+				DiagnosticNumInfo = { fg = palette.dark0, bg = palette.bright_blue, bold = true },
 			},
 		})