From 98f9134cd1f249ec38aba626ec9842cefbe651bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= Date: Thu, 18 Jan 2024 15:45:11 +0100 Subject: [PATCH] nvim: sync --- dot_config/nvim/lua/configs/packages/colors.lua | 4 ++++ dot_config/nvim/lua/configs/packages/fterm.lua | 15 +++++++++++++++ dot_config/nvim/lua/configs/packages/misc.lua | 1 + dot_config/nvim/lua/configs/packages/neotree.lua | 1 + 4 files changed, 21 insertions(+) diff --git a/dot_config/nvim/lua/configs/packages/colors.lua b/dot_config/nvim/lua/configs/packages/colors.lua index 5b0add5..d5ce7f8 100644 --- a/dot_config/nvim/lua/configs/packages/colors.lua +++ b/dot_config/nvim/lua/configs/packages/colors.lua @@ -162,6 +162,8 @@ function M.config() -- link('@tag.html', 'htmlTagName') -- link('@tag.attribute.html', 'htmlArg') + link('WinBar', 'StatusLine') + link('WinBarNC', 'StatusLineNC') gr:hl('LineNr', 'gray', 'dark0_hard', linenr_style) gr:hl('LspCodeLens', 'gray', nil, { 'italic' }) @@ -177,6 +179,8 @@ function M.config() gr:hl('Function', 'light1', nil, {}) gr:hl('Operator', 'light1', nil, {}) + link('Identifier', 'GruvboxBlue') + link('Punctuation', 'GruvboxOrange') gr:hl('Bold', nil, nil, { 'bold' }, {}) gr:hl('Strikethrough', nil, nil, { 'strikethrough' }, {}) diff --git a/dot_config/nvim/lua/configs/packages/fterm.lua b/dot_config/nvim/lua/configs/packages/fterm.lua index 46c8b87..092eccc 100644 --- a/dot_config/nvim/lua/configs/packages/fterm.lua +++ b/dot_config/nvim/lua/configs/packages/fterm.lua @@ -3,6 +3,7 @@ local M = { keys = { { 'gg', 'Lazygit', desc = 'Lazygit' }, { 'gh', 'GitHistory', desc = 'Git history' }, + { 'gB', 'GitBlame', desc = 'Git Blame' }, }, lazy = true, } @@ -32,8 +33,22 @@ function M.config() }) end + local git_blame = function() + local file = vim.api.nvim_buf_get_name(0) + local cmd = 'git blame ' .. file + fterm.scratch({ + -- ft = 'git_history', -- You can also override the default filetype, if you want + cmd = cmd, + dimensions = { + height = 0.9, + width = 0.9, + }, + }) + end + vim.keymap.set('n', 'Lazygit', function() lazygit:toggle() end, { desc = 'Toggle lazygit' }) vim.keymap.set('n', 'GitHistory', git_history, { desc = 'Show git history' }) + vim.keymap.set('n', 'GitBlame', git_blame, { desc = 'Show git blame' }) end return M diff --git a/dot_config/nvim/lua/configs/packages/misc.lua b/dot_config/nvim/lua/configs/packages/misc.lua index 3b9adad..3812ca7 100644 --- a/dot_config/nvim/lua/configs/packages/misc.lua +++ b/dot_config/nvim/lua/configs/packages/misc.lua @@ -241,6 +241,7 @@ return { { 'ziglang/zig.vim', ft = 'zig' }, { 'chrisbra/csv.vim', ft = 'csv' }, { 'NoahTheDuke/vim-just' }, + { 'towolf/vim-helm' }, { 'williamboman/mason.nvim', cmd = 'Mason', config = true }, diff --git a/dot_config/nvim/lua/configs/packages/neotree.lua b/dot_config/nvim/lua/configs/packages/neotree.lua index bcf5890..9cfd9a0 100644 --- a/dot_config/nvim/lua/configs/packages/neotree.lua +++ b/dot_config/nvim/lua/configs/packages/neotree.lua @@ -2,6 +2,7 @@ local M = { 'nvim-neo-tree/neo-tree.nvim', branch = 'v2.x', lazy = false, + enabled = false, keys = { { 'ft', [[Neotree toggle]], desc = 'Toggle Neotree' }, { 'fr', [[Neotree reveal]], desc = 'Reveal current file in Neotree' },