Gitsigns config

.config/nvim/lua/other.lua

@@ -38,8 +38,7 @@ M.nvimtree = function ()
       { key = "q",                            cb = tree_cb("close") },
       { key = "g?",                           cb = tree_cb("toggle_help") },
    }
-end
+end -- <<<
--- <<<
 
 -- toggleterm >>>
 M.toggleterm = function()
@@ -80,10 +79,78 @@ M.toggleterm = function()
          }
       }
    }
-end
+end -- <<<
--- <<<
 
-M.autosession = function() -- Automatic session loading and saving >>>
+-- gitsigns >>>
+M.gitsigns = function()
+   require('gitsigns').setup {
+      signs = {
+         add          = {hl = 'GitSignsAdd'   , text = '│', numhl='GitSignsAddNr'   , linehl='GitSignsAddLn'},
+         change       = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
+         delete       = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
+         topdelete    = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
+         changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
+      },
+      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`
+      keymaps = {
+         -- Default keymap options
+         noremap = true,
+
+         ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns.actions\".next_hunk()<CR>'"},
+         ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns.actions\".prev_hunk()<CR>'"},
+
+         ['n <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
+         ['v <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
+         ['n <leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
+         ['n <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
+         ['v <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
+         ['n <leader>hR'] = '<cmd>lua require"gitsigns".reset_buffer()<CR>',
+         ['n <leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
+         ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line(true)<CR>',
+         ['n <leader>hS'] = '<cmd>lua require"gitsigns".stage_buffer()<CR>',
+         ['n <leader>hU'] = '<cmd>lua require"gitsigns".reset_buffer_index()<CR>',
+
+         -- Text objects
+         ['o ih'] = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>',
+         ['x ih'] = ':<C-U>lua require"gitsigns.actions".select_hunk()<CR>'
+      },
+      watch_index = {
+         interval = 1000,
+         follow_files = true
+      },
+      attach_to_untracked = true,
+      current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
+      current_line_blame_opts = {
+         virt_text = true,
+         virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
+         delay = 1000,
+      },
+      current_line_blame_formatter_opts = {
+         relative_time = false
+      },
+      sign_priority = 6,
+      update_debounce = 100,
+      status_formatter = nil, -- Use default
+      max_file_length = 40000,
+      preview_config = {
+         -- Options passed to nvim_open_win
+         border = 'single',
+         style = 'minimal',
+         relative = 'cursor',
+         row = 0,
+         col = 1
+      },
+      yadm = {
+         enable = false
+      },
+   }
+end -- <<<
+
+-- Autosession >>>
+M.autosession = function()
    local opts = {
       log_level = 'info',
       auto_session_enable_last_session = true,
@@ -94,8 +161,8 @@ M.autosession = function() -- Automatic session loading and saving >>>
       auto_session_suppress_dirs = nil
    }
    require('auto-session').setup(opts)
-end
+   vim.cmd 'command! SessionSave SaveSession'
--- <<<
+end -- <<<
 
 return M