From 4d66bfe32be943bebaba57027c2836116c88223b Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Thu, 4 Jan 2024 23:41:11 +0000 Subject: [PATCH] argh --- config/.config/nvim/lazy-lock.json | 4 ++-- vim/.vim/lua/plugins/base.lua | 7 +++++++ vim/.vim/lua/plugins/signify.lua | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json index 92cc8ab..28c24bf 100644 --- a/config/.config/nvim/lazy-lock.json +++ b/config/.config/nvim/lazy-lock.json @@ -34,7 +34,6 @@ "fzf": { "branch": "master", "commit": "20240101197348a78db5a1dac945a2dff6a4e654" }, "fzf.vim": { "branch": "master", "commit": "1e054c1d075d87903647db9320116d360eb8b024" }, "git-conflict.nvim": { "branch": "main", "commit": "4e0191c9a0ae05d7fbdcdc7f15cd358f56d23bfb" }, - "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" }, "go.nvim": { "branch": "master", "commit": "24d2fa373d55d9900cd4b502a88214dc17e6fab6" }, "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" }, "hg": { "branch": "main", "commit": "1c4bdf80174ec840ba76c4dc7032c4313db62199" }, @@ -61,10 +60,11 @@ "neoscopes": { "branch": "main", "commit": "470dff042004b93c10d262e8b0ad7bf6f703f86f" }, "neovim-ayu": { "branch": "master", "commit": "76dbf939b38e03ac5f9bd711ab3e434999f715c8" }, "neovim-throttle-debounce": { "branch": "main", "commit": "5247b097df15016ab31db672b77ec4938bb9cbfd" }, - "nui.nvim": { "branch": "main", "commit": "80445d015d2b5f9af0d9e8bce63d303bc86eda8a" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, "nvgoog": { "branch": "main", "commit": "c07300e18e81c0341967b8a5ba9afbf7388ca533" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-cmp-buffer-lines": { "branch": "master", "commit": "924ccc04dc5c919b6baa05d45818025baa82699a" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, "nvim-hlslens": { "branch": "main", "commit": "8ffc64bb6b624612cf762982b92633f283f7a715" }, diff --git a/vim/.vim/lua/plugins/base.lua b/vim/.vim/lua/plugins/base.lua index b87938e..d5d0e75 100644 --- a/vim/.vim/lua/plugins/base.lua +++ b/vim/.vim/lua/plugins/base.lua @@ -7,6 +7,13 @@ return { { "squk/java-syntax.vim", ft = "java" }, { "squk/gdrama-syntax.vim", dir = vim.fn.expand("$HOME/dev/gdrama-syntax.vim") }, { "echasnovski/mini.splitjoin", version = "*" }, + { + "NvChad/nvim-colorizer.lua", + ft = "lua", + config = function() + require("colorizer").setup() + end, + }, { "andweeb/presence.nvim", cond = not use_google(), diff --git a/vim/.vim/lua/plugins/signify.lua b/vim/.vim/lua/plugins/signify.lua index 7a94210..288f949 100644 --- a/vim/.vim/lua/plugins/signify.lua +++ b/vim/.vim/lua/plugins/signify.lua @@ -43,7 +43,6 @@ _G.signify_dtex = function() setup_mercurial('-r "exported(.)" %f') vim.cmd([[:SignifyRefresh]]) end - return { "mhinz/vim-signify", event = "VimEnter", @@ -58,17 +57,18 @@ return { }, config = function() vim.g.signify_vcs_list = { "hg", "git" } - -- vim.g.signify_sign_change = "*" - -- vim.g.signify_sign_delete = "-" - -- vim.g.signify_line_highlight = 0 - vim.g.signify_sign_add = "┃" - vim.g.signify_sign_delete = "┃" - vim.g.signify_sign_change = "┃" - vim.api.nvim_set_hl(0, "SignifySignAdd", { ctermfg = "green", fg = "#79b7a5" }) - vim.api.nvim_set_hl(0, "SignifySignChange", { ctermfg = "yellow", fg = "#ffffcc" }) - vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { ctermfg = "red", fg = "#ff7b72" }) - vim.api.nvim_set_hl(0, "SignifySignDelete", { ctermfg = "red", fg = "#ff7b72" }) - vim.api.nvim_set_hl(0, "SignifySignDeleteDeleteFirstLine", { ctermfg = "red", fg = "#ff7b72" }) + local one_eighth = "▏" + local one_quarter = "▎" + local three_eighths = "▍" + vim.g.signify_sign_add = one_quarter + vim.g.signify_sign_delete = one_quarter + vim.g.signify_sign_change = one_quarter + local red = "#f8a6a0" + vim.api.nvim_set_hl(0, "SignifySignAdd", { fg = "#9cc99f" }) + vim.api.nvim_set_hl(0, "SignifySignChange", { fg = "#84cee3" }) + vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { fg = red }) + vim.api.nvim_set_hl(0, "SignifySignDelete", { fg = red }) + vim.api.nvim_set_hl(0, "SignifySignDeleteDeleteFirstLine", { fg = red }) -- vim.cmd("highlight SignColumn ctermbg=NONE cterm=NONE guibg=NONE gui=NONE") end, }