chore: clean up and reformat

feat: remove unused bindings

lua/config/autocmds.lua

@@ -1,3 +1,4 @@
+-- Remove trailing whitespace on save
 -- vim.api.nvim_create_autocmd({"BufWritePre"}, {
 --     group = vim.api.nvim_create_augroup("Default", {}),
 --     pattern = "*",

lua/config/keymaps.lua

@@ -24,7 +24,3 @@ vim.keymap.set({"n", "v"}, "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>
 vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
-
--- Typing too fast...
-vim.keymap.set("n", "q:", ":q<CR>")
-

lua/config/options.lua

@@ -19,6 +19,8 @@ vim.opt.incsearch = true
 
 vim.opt.termguicolors = true
 
+vim.opt.guicursor = "n-v-i-c-ci-ve-sm:block,r-cr-o:hor20"
+
 vim.opt.scrolloff = 8
 vim.opt.sidescrolloff = 16
 

lua/plugins/coding.lua

@@ -50,10 +50,10 @@ return {
 		end,
 	},
 	-- Copilot
-    { 'github/copilot.vim' },
+	{ "github/copilot.vim" },
 	-- Comment
 	{
-        'numToStr/Comment.nvim',
+		"numToStr/Comment.nvim",
 		opts = {
 			-- add any options here
 		},
@@ -63,5 +63,5 @@ return {
 		end
 	},
 	-- Surround
-    { 'tpope/vim-surround', event = "BufRead", },
+	{ "tpope/vim-surround", event = "BufRead", },
 }

lua/plugins/editor.lua

@@ -12,22 +12,22 @@ return {
 		dependencies = { "nvim-tree/nvim-web-devicons" },
 		opts = {},
 		keys = {
-            { '<leader>xx', '<cmd>TroubleToggle workspace_diagnostics<CR>', desc = 'Trouble Workspace Diagnostics' },
-            { '<leader>xd', '<cmd>TroubleToggle document_diagnostics<CR>', desc = 'Trouble Document Diagnostics' },
-            { '<leader>xl', '<cmd>TroubleToggle loclist<CR>', desc = 'Trouble Loclist' },
-            { '<leader>xq', '<cmd>TroubleToggle quickfix<CR>', desc = 'Trouble Quickfix' },
-            { '<leader>xt', '<cmd>TroubleToggle lsp_references<CR>', desc = 'Trouble LSP References' },
-            { '<leader>xj', function() require("trouble").next({skip_groups = true, jump = true}) end, desc = 'Trouble Next' },
-            { '<leader>xk', function() require("trouble").previous({skip_groups = true, jump = true}) end, desc = 'Trouble Previous' },
+			{ "<leader>xx", "<cmd>TroubleToggle workspace_diagnostics<CR>",                                  desc = "Trouble Workspace Diagnostics" },
+			{ "<leader>xd", "<cmd>TroubleToggle document_diagnostics<CR>",                                   desc = "Trouble Document Diagnostics" },
+			{ "<leader>xl", "<cmd>TroubleToggle loclist<CR>",                                                desc = "Trouble Loclist" },
+			{ "<leader>xq", "<cmd>TroubleToggle quickfix<CR>",                                               desc = "Trouble Quickfix" },
+			{ "<leader>xt", "<cmd>TroubleToggle lsp_references<CR>",                                         desc = "Trouble LSP References" },
+			{ "<leader>xj", function() require("trouble").next({ skip_groups = true, jump = true }) end,     desc = "Trouble Next" },
+			{ "<leader>xk", function() require("trouble").previous({ skip_groups = true, jump = true }) end, desc = "Trouble Previous" },
 		},
 	},
-    { 'wsdjeg/vim-fetch', event = "VeryLazy" },
-    { 'nvim-tree/nvim-web-devicons' },
+	{ "wsdjeg/vim-fetch",           event = "VeryLazy" },
+	{ "nvim-tree/nvim-web-devicons" },
 	{
-        'eandrju/cellular-automaton.nvim',
+		"eandrju/cellular-automaton.nvim",
 		event = "VeryLazy",
 		keys = {
-            { '<leader>mr', '<cmd>CellularAutomaton make_it_rain<CR>', desc = 'Make it rain' },
+			{ "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>", desc = "Make it rain" },
 		},
 	},
 }

lua/plugins/git.lua

@@ -8,13 +8,10 @@ return {
 				vim.keymap.set(mode, l, r, { silent = true, noremap = true, desc = desc })
 			end
 
-            map("n", "<leader>gs", "<cmd>Git<CR>", "Git Status")
 			map("n", "<leader>gd", "<cmd>Gvdiffsplit!<CR>", "Git Diff")
-            map("n", "<leader>gbl", "<cmd>Git blame<CR>", "Git Blame")
-            map("n", "<leader>gc", "<cmd>Git commit<CR>", "Git Commit")
-            map("n", "<leader>gC", "<cmd>Git commit --amend<CR>", "Git Commit Amend")
-            map("n", "<leader>gp", "<cmd>Git push<CR>", "Git Push")
-            map("n", "<leader>gS", "<cmd>Git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)<CR>", "Git Push Set Upstream")
+			map("n", "<leader>gl", "<cmd>Git blame -w -C -C -C<CR>", "Git Blame")
+			map("n", "<leader>gS", "<cmd>Git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)<CR>",
+				"Git Push Set Upstream")
 			map("n", "<leader>gbs", "<cmd>Git bisect start<CR>", "Git Bisect Start")
 			map("n", "<leader>gbg", "<cmd>Git bisect good<CR>", "Git Bisect Good")
 			map("n", "<leader>gbb", "<cmd>Git bisect bad<CR>", "Git Bisect Bad")
@@ -43,16 +40,10 @@ return {
 
 				map("n", "]h", gs.next_hunk, "Next Hunk")
 				map("n", "[h", gs.prev_hunk, "Prev Hunk")
-                map({ "n", "v" }, "<leader>ghs", "<cmd>Gitsigns stage_hunk<CR>", "Stage Hunk")
 				map({ "n", "v" }, "<leader>ghr", "<cmd>Gitsigns reset_hunk<CR>", "Reset Hunk")
-                map("n", "<leader>ghS", gs.stage_buffer, "Stage Buffer")
-                map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo Stage Hunk")
 				map("n", "<leader>ghR", gs.reset_buffer, "Reset Buffer")
 				map("n", "<leader>ghp", gs.preview_hunk, "Preview Hunk")
 				map("n", "<leader>ghb", function() gs.blame_line({ full = true }) end, "Blame Line")
-                map("n", "<leader>ghd", gs.diffthis, "Diff This")
-                map("n", "<leader>ghD", function() gs.diffthis("~") end, "Diff This ~")
-                map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "GitSigns Select Hunk")
 			end,
 		},
 	},

lua/plugins/lsp/config.lua

@@ -1,32 +1,42 @@
-local lsp_zero = require('lsp-zero')
-local lspconfig = require('lspconfig')
+local lsp_zero = require("lsp-zero")
+local lspconfig = require("lspconfig")
 
 lspconfig.lua_ls.setup({
 	settings = {
 		Lua = {
 			diagnostics = {
-                globals = { 'vim' },
+				globals = { "vim" },
 			},
 		},
 	},
 })
 
+lspconfig.eslint.setup({
+	on_attach = function(_, bufnr)
+		vim.api.nvim_create_autocmd("BufWritePre", {
+			buffer = bufnr,
+			command = "EslintFixAll",
+		})
+	end,
+})
+
+
 lsp_zero.set_sign_icons({
-  error = '✘',
-  warn = '▲',
-  hint = '⚑',
-  info = ''
+	error = "✘",
+	warn = "▲",
+	hint = "⚑",
+	info = ""
 })
 
 vim.diagnostic.config({
 	virtual_text = true,
 	severity_sort = true,
 	float = {
-    style = 'minimal',
-    border = 'none',
-    source = 'always',
-    header = '',
-    prefix = '',
+		style = "minimal",
+		border = "none",
+		source = "always",
+		header = "",
+		prefix = "",
 	},
 })
 
@@ -34,36 +44,26 @@ lsp_zero.on_attach(function(_, bufnr)
 	local opts = { buffer = bufnr, remap = false }
 	lsp_zero.default_keymaps({ buffer = bufnr })
 
-    vim.api.nvim_create_autocmd('BufWritePre', {
-        pattern = { '*.tsx', '*.ts', '*.jsx', '*.js', '*.vue', '*.cjs', '*.mjs', '*.json', '*.css', '*.scss', '*.less', '*.yml', '*.svelte' },
-        command = 'silent! EslintFixAll',
-        group = vim.api.nvim_create_augroup('EslintAutocmdsFormatting', {}),
-    })
-
 	vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
 	vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
-    vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
-    vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
 	vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
 	vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
 	vim.keymap.set("n", "<leader>ca", function() vim.lsp.buf.code_action() end, opts)
 	vim.keymap.set("n", "<leader>rr", function() vim.lsp.buf.references() end, opts)
 	vim.keymap.set("n", "<leader>rn", function() vim.lsp.buf.rename() end, opts)
-    vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
-    vim.keymap.set("n", "<leader>ls", function() vim.lsp.buf.signature_help() end, opts)
 	vim.keymap.set("n", "<leader>D", function() vim.lsp.buf.type_definition() end, opts)
 end)
 
-require('mason-lspconfig').setup({
+require("mason-lspconfig").setup({
 	handlers = {
 		lsp_zero.default_setup,
 	},
 	ensure_installed = {
-        'lua_ls',
-        'html',
-        'eslint',
-        'gopls',
-        'rust_analyzer',
-        'zls',
+		"lua_ls",
+		"html",
+		"eslint",
+		"gopls",
+		"rust_analyzer",
+		"zls",
 	},
 })

lua/plugins/telescope.lua

@@ -1,10 +1,10 @@
 return {
-    'nvim-telescope/telescope.nvim',
+	"nvim-telescope/telescope.nvim",
 	cmd = "Telescope",
 	version = false,
 	dependencies = {
-        { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' },
-        { 'nvim-lua/plenary.nvim' },
+		{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
+		{ "nvim-lua/plenary.nvim" },
 	},
 	extensions = {
 		fzf = {
@@ -15,16 +15,14 @@ return {
 		}
 	},
 	keys = {
-        { '<C-p>', "<cmd>Telescope find_files<CR>", desc = 'Find files' },
-        { '<leader>ps', "<cmd>Telescope live_grep<CR>", desc = 'Live Grep' },
-        { '<leader>vh', "<cmd>Telescope help_tags<CR>", desc = 'Help Tags' },
+		{ "<C-p>",      "<cmd>Telescope find_files<CR>", desc = "Find files" },
+		{ "<leader>ps", "<cmd>Telescope live_grep<CR>",  desc = "Live Grep" },
 		{
-            '<leader>fa',
+			"<leader>fa",
 			function() require("telescope.builtin").find_files({ follow = true, no_ignore = true, hidden = true }) end,
-            desc = 'Find all files'
+			desc = "Find all files"
 		},
-        { '<leader>fb', "<cmd>Telescope buffers<CR>", desc = 'Find buffer' },
-        { '<leader>fc', "<cmd>Telescope git_commits<CR>", desc = 'Find commits' },
-        { '<leader>fg', "<cmd>Telescope git_status<CR>", desc = 'Find git status' },
+		{ "<leader>fb", "<cmd>Telescope buffers<CR>",     desc = "Find buffer" },
+		{ "<leader>fc", "<cmd>Telescope git_commits<CR>", desc = "Find commits" },
 	},
 }