git stuff and tab helpers

lua/keymaps.lua

@@ -22,6 +22,8 @@ require("util").keymaps({
     ["<leader>w"] = { "<cmd>w<cr>", desc = "Save" },
     ["<leader>q"] = { "<cmd>confirm q<cr>", desc = "Quit" },
     ["<leader>cq"] = { "<cmd>bd<cr>", desc = "Close current buffer" },
+    ["<leader>tn"] = { "<cmd>tabnew<cr>", desc = "" },
+    ["<leader>tq"] = { "<cmd>tabclose<cr>", desc = "Close current tab" },
     ["|"] = { "<cmd>vsplit<cr>", desc = "Vertical Split" },
     ["\\"] = { "<cmd>split<cr>", desc = "Horizontal Split" },
     ["<C-d>"] = { "<C-d>zz", desc = "Vertical half page down and center cursor" },
@@ -35,6 +37,9 @@ require("util").keymaps({
     ["<C-j>"] = { "<C-w>j", desc = "Move window below current" },
     ["<C-k>"] = { "<C-w>k", desc = "Move window above current" },
     ["<C-l>"] = { "<C-w>l", desc = "Move window right current" },
+    -- tab navigation
+    ["<C-y>"] = { "<cmd>tabprevious<cr>", desc = "Move to previous tab" },
+    ["<C-o>"] = { "<cmd>tabnext<cr>", desc = "Move to next tab" },
     -- reformat LSP
     ["<leader>lf"] = {
       function()

lua/options.lua

@@ -49,3 +49,6 @@ vim.o.completeopt = "menuone,noselect"
 vim.diagnostic.config({
 	float = { border = "single" },
 })
+
+-- Turn on new diff
+vim.opt.diffopt:append("linematch:20")

lua/plugins/git.lua

@@ -19,10 +19,11 @@ return {
         delay = 0,
         ignore_whitespace = false,
       },
-      -- on_attach = function()
+      on_attach = function()
-      --   local gs = package.loaded.gitsigns
+        vim.keymap.set("n", "<leader>gb", function()
-      --   set_nmap('<leader>tb', gs.toggle_current_line_blame)
+          package.loaded.gitsigns.toggle_current_line_blame()
-      -- end
+        end, { desc = "Toggle git blame on current line" })
+      end
     }
   },
   {
@@ -93,6 +94,9 @@ return {
           height = 16,
         },
       },
-    }
+    },
+    keys = {
+      { "<leader>gd", "<cmd>DiffviewOpen<cr>", desc = "Opens git diff view." },
+    },
   }
 }

lua/plugins/lazygit.lua

@@ -1,4 +1,4 @@
-function prereqs()
+local function prereqs()
 	local output = vim.fn.system({
 		"which",
 		"lazygit",

lua/plugins/lsp.lua

@@ -1,4 +1,4 @@
-function prereqs()
+local function prereqs()
   local output = vim.fn.system({
     "which",
     "rust-analyzer",
@@ -172,7 +172,7 @@ return {
     dependencies = { "nvim-telescope/telescope.nvim" },
     config = function()
       local config = require("lspconfig")
-      local util = require("lspconfig/util")
+      -- local util = require("lspconfig/util")
       local mason_lspconfig = require("mason-lspconfig")
       local cmp = require("cmp")
       local luasnip = require("luasnip")

lua/plugins/null-ls.lua

@@ -1,4 +1,4 @@
-function prereqs()
+local function prereqs()
   local output_cspell = vim.fn.system({
     "which",
     "cspell",