Merge branch 'master' of github.com:RingOfStorms/nvim

cspell.json

@@ -1 +1 @@
-{"version":"0.2","language":"en","words":["nvim","builtins","stylua","rustfmt","pendo","tanstack","ripgrep","Typeahead","overscan","autorun","mediatype","BIOINF","Transitioner","pkce","ilike","arrayify","arrayified","komodo","wezterm","gcloud","pbpaste","Hasher","semvers","upserted","dtos","Yeatts","Mahon","Beaubier","Taussing","chakra","langchain","openai","getattr","llms","docstore","kwargs","svgr","healthcheck","venv","virtualenv","ringofstorms","nestjs","oneshot","templating","tiktoken","pydantic","NCCN","clsx","reactflow","Convo","DSAB","pgvector","postprocess","stylelua","sqlx","genemichaels","williamboman","substr","findfile","Hammerspoon","eventtap","OSTYPE","sccache","binstall","elif","autofocus","colours","Resizer","esac","pannable","zoomable","elkjs","Arrayible","Falsey","xyflow","leftnav","topnav","nodrag","nowheel","janky","draghandle","Sandboxed","Dismissable","dashdraw","chrono","serde","rustls","schemars","webserver","concats","deepmerge","Customizer","reqwest","brotli","peekable","PDEPO","dotenv","taskserver","walkdir","uuidgen","tolower","nzzzv","tabprevious","tabnext","vsplit","tabclose","tabnew","Neotree","noequalalways","equalalways","bufdo","winnr","keymap","mapleader","maplocalleader","keymaps","setloclist","itertools","ollama","ainvoke","Floaterm","Diffview","nocombine","gitsigns","endfor","primereact","reactiveness","toggleable","unconnectable","Prereq","autocmd","lualine","codedark","filesize","searchcount","selectioncount","statusline","winbar","newfile","pyright","bufnr"],"flagWords":[]}
+{"version":"0.2","words":["nvim","builtins","stylua","rustfmt","pendo","tanstack","ripgrep","Typeahead","overscan","autorun","mediatype","BIOINF","Transitioner","pkce","ilike","arrayify","arrayified","komodo","wezterm","gcloud","pbpaste","Hasher","semvers","upserted","dtos","Yeatts","Mahon","Beaubier","Taussing","chakra","langchain","openai","getattr","llms","docstore","kwargs","svgr","healthcheck","venv","virtualenv","ringofstorms","nestjs","oneshot","templating","tiktoken","pydantic","NCCN","clsx","reactflow","Convo","DSAB","pgvector","postprocess","stylelua","sqlx","genemichaels","williamboman","substr","findfile","Hammerspoon","eventtap","OSTYPE","sccache","binstall","elif","autofocus","colours","Resizer","esac","pannable","zoomable","elkjs","Arrayible","Falsey","xyflow","leftnav","topnav","nodrag","nowheel","janky","draghandle","Sandboxed","Dismissable","dashdraw","chrono","serde","rustls","schemars","webserver","concats","deepmerge","Customizer","reqwest","brotli","peekable","PDEPO","dotenv","taskserver","walkdir","uuidgen","tolower","nzzzv","tabprevious","tabnext","vsplit","tabclose","tabnew","Neotree","noequalalways","equalalways","bufdo","winnr","keymap","mapleader","maplocalleader","keymaps","setloclist","itertools","ollama","ainvoke","Floaterm","Diffview","nocombine","gitsigns","endfor","primereact","reactiveness","toggleable","unconnectable","Prereq","autocmd","lualine","codedark","filesize","searchcount","selectioncount","statusline","winbar","newfile","pyright","bufnr","dotenvy","depo","Timestamptz","Insertable","Decryptor","Encryptor","deadpool","thiserror"],"flagWords":[],"language":"en"}

lua/plugins/git.lua

@@ -1,35 +1,40 @@
-local highlight = require("util").highlight
--- Dull Version
-highlight("GitGutterUntracked", { fg = "#688066", gui = "nocombine" })
-
 return {
   {
     "lewis6991/gitsigns.nvim",
     dependencies = { "nvim-lua/plenary.nvim" },
-    opts = {
+    opts = function()
-      watch_gitdir = {
+      local highlight = require("util").highlight
-        interval = 100,
+      highlight("GitGutterAdd", { fg = "#688066", gui = "nocombine" })
-      },
+      highlight("GitGutterUntracked", { fg = "#688066", gui = "nocombine" })
-      signs = {
+      highlight("GitGutterChange", { fg = "#666f80", gui = "nocombine" })
-        add = { hl = "GitGutterAdd" },
+      highlight("GitGutterDelete", { fg = "#806666", gui = "nocombine" })
-        change = { hl = "GitGutterChange" },
+      highlight("GitGutterChangeDelete", { fg = "#806666", gui = "nocombine" })
-        delete = { hl = "GitGutterDelete" },
+
-        topdelete = { hl = "GitGutterDelete" },
+      return {
-        changedelete = { hl = "GitGutterChangeDelete" },
+        watch_gitdir = {
-        untracked = { hl = "GitGutterUntracked" },
+          interval = 100,
-      },
+        },
-      current_line_blame_opts = {
+        signs = {
-        virt_text = true,
+          add = { hl = "GitGutterAdd" },
-        virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
+          change = { hl = "GitGutterChange" },
-        delay = 0,
+          delete = { hl = "GitGutterDelete" },
-        ignore_whitespace = false,
+          topdelete = { hl = "GitGutterDelete" },
-      },
+          changedelete = { hl = "GitGutterChangeDelete" },
-      on_attach = function()
+          untracked = { hl = "GitGutterUntracked" },
-        vim.keymap.set("n", "<leader>gb", function()
+        },
-          package.loaded.gitsigns.toggle_current_line_blame()
+        current_line_blame_opts = {
-        end, { desc = "Toggle git blame on current line" })
+          virt_text = true,
-      end,
+          virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align'
-    },
+          delay = 0,
+          ignore_whitespace = false,
+        },
+        on_attach = function()
+          vim.keymap.set("n", "<leader>gb", function()
+            package.loaded.gitsigns.toggle_current_line_blame()
+          end, { desc = "Toggle git blame on current line" })
+        end,
+      }
+    end,
   },
   {
     "Neogitorg/neogit",