diff options
| author | Squibid <me@zacharyscheiman.com> | 2023-08-02 02:22:04 -0400 |
|---|---|---|
| committer | Squibid <me@zacharyscheiman.com> | 2023-08-02 02:22:04 -0400 |
| commit | 1f975ad0750e011be2337d12dd22f32682cd824a (patch) | |
| tree | 6f3885f5e49ae3a3d293b69910aa8d216e8340aa | |
| parent | 772c55afb0081030a72bb8e066e7c6aad6cdda36 (diff) | |
| download | nvim-1f975ad0750e011be2337d12dd22f32682cd824a.tar.gz nvim-1f975ad0750e011be2337d12dd22f32682cd824a.tar.bz2 nvim-1f975ad0750e011be2337d12dd22f32682cd824a.zip | |
improve git integration
| -rw-r--r-- | after/plugin/gitsigns.lua | 8 | ||||
| -rw-r--r-- | after/plugin/scrollbar.lua | 5 | ||||
| -rw-r--r-- | lua/core/binds.lua | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/after/plugin/gitsigns.lua b/after/plugin/gitsigns.lua index b5436ae..440b0ca 100644 --- a/after/plugin/gitsigns.lua +++ b/after/plugin/gitsigns.lua @@ -12,10 +12,10 @@ gitsigns.setup { changedelete = { text = '~' }, untracked = { text = '┆' }, }, - signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` - numhl = false, -- Toggle with `:Gitsigns toggle_numhl` - linehl = false, -- Toggle with `:Gitsigns toggle_linehl` - word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + signcolumn = true, + numhl = false, + linehl = false, + word_diff = false, watch_gitdir = { interval = 1000, follow_files = true diff --git a/after/plugin/scrollbar.lua b/after/plugin/scrollbar.lua index 7421536..cc98537 100644 --- a/after/plugin/scrollbar.lua +++ b/after/plugin/scrollbar.lua @@ -11,7 +11,10 @@ scrollbar.setup({ marks = { Cursor = { text = "*", - } + }, + GitAdd = { text = "|" }, + GitChange = { text = "|" }, + GitDelete = { text = "-" }, }, handlers = { cursor = true, diff --git a/lua/core/binds.lua b/lua/core/binds.lua index e495bff..4afc57c 100644 --- a/lua/core/binds.lua +++ b/lua/core/binds.lua @@ -98,5 +98,10 @@ map('n', '<leader>zf', '<cmd>lua require("true-zen.focus").toggle()<CR>') map('n', '<leader>zm', '<cmd>lua require("true-zen.minimalist").toggle()<CR>') map('n', '<leader>za', '<cmd>lua require("true-zen.ataraxis").toggle()<CR>') +-- Git +map('n', '<leader>gph', '<cmd>Gitsigns preview_hunk_inline<CR>') +map('n', '<leader>gsh', '<cmd>Gitsigns stage_hunk<CR>') +map('n', '<leader>gb', '<cmd>Gitsigns blame_line<CR>') + -- neogen map('n', '<leader>df', '<cmd>lua require("neogen").generate()<CR>') |