From 23549aeea8c6020d5d435024dfd5ca1a20e84d63 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 1 Jan 2024 21:24:56 -0600 Subject: [PATCH] set more gutter colors to be more dull --- cspell.json | 2 +- lua/plugins/git.lua | 61 ++++++++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/cspell.json b/cspell.json index ab7558d..9684bda 100644 --- a/cspell.json +++ b/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"} diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua index d2cd97c..ffa158f 100644 --- a/lua/plugins/git.lua +++ b/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 = { - watch_gitdir = { - interval = 100, - }, - signs = { - add = { hl = "GitGutterAdd" }, - change = { hl = "GitGutterChange" }, - delete = { hl = "GitGutterDelete" }, - topdelete = { hl = "GitGutterDelete" }, - changedelete = { hl = "GitGutterChangeDelete" }, - untracked = { hl = "GitGutterUntracked" }, - }, - current_line_blame_opts = { - virt_text = true, - virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align' - delay = 0, - ignore_whitespace = false, - }, - on_attach = function() - vim.keymap.set("n", "gb", function() - package.loaded.gitsigns.toggle_current_line_blame() - end, { desc = "Toggle git blame on current line" }) - end, - }, + opts = function() + local highlight = require("util").highlight + highlight("GitGutterAdd", { fg = "#688066", gui = "nocombine" }) + highlight("GitGutterUntracked", { fg = "#688066", gui = "nocombine" }) + highlight("GitGutterChange", { fg = "#666f80", gui = "nocombine" }) + highlight("GitGutterDelete", { fg = "#806666", gui = "nocombine" }) + highlight("GitGutterChangeDelete", { fg = "#806666", gui = "nocombine" }) + + return { + watch_gitdir = { + interval = 100, + }, + signs = { + add = { hl = "GitGutterAdd" }, + change = { hl = "GitGutterChange" }, + delete = { hl = "GitGutterDelete" }, + topdelete = { hl = "GitGutterDelete" }, + changedelete = { hl = "GitGutterChangeDelete" }, + untracked = { hl = "GitGutterUntracked" }, + }, + current_line_blame_opts = { + virt_text = true, + virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align' + delay = 0, + ignore_whitespace = false, + }, + on_attach = function() + vim.keymap.set("n", "gb", function() + package.loaded.gitsigns.toggle_current_line_blame() + end, { desc = "Toggle git blame on current line" }) + end, + } + end, }, { "Neogitorg/neogit",