feat(fugitive): add gj and g; mappings for three way diffsplit merging

home/neovim.nix

@@ -313,7 +313,9 @@ in
       nnoremap <leader>gpf :Git! push --force-with-lease<CR>
       nnoremap <leader>gpl :Git! pull<CR>
       nnoremap <leader>gpn :Git! push -u origin HEAD<CR>
-
+      nnoremap gj :diffget //2<CR>   
+      nnoremap g; :diffget //3<CR>   
+        
       " Git-gutter
       " Use fontawesome icons as signs - stolen from https://github.com/JakobGM/dotfiles/blob/2fdc40ece4b36cf1f5143b5778c171c0859e119f/config/nvim/init.vim#L574-L579
       let g:gitgutter_sign_added = ''
@@ -353,6 +355,22 @@ in
 
       " Overseer
       lua require('overseer').setup()
+
+      " Treesitter Context
+      lua require("treesitter-context").setup({
+        enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
+        max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
+        min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
+        line_numbers = true,
+        multiline_threshold = 20, -- Maximum number of lines to show for a single context
+        trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
+        mode = 'cursor',  -- Line used to calculate context. Choices: 'cursor', 'topline'
+        -- Separator between context and content. Should be a single character string, like '-'.
+        -- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
+        separator = nil,
+        zindex = 20, -- The Z-index of the context window
+        on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching
+      })
     '';
 
     plugins = with pkgs.vimPlugins; [
@@ -411,6 +429,9 @@ in
       vim-test
       vim-textobj-entire
       vim-toml
+
+      nvim-treesitter-context
+
       vim-unimpaired
       vim-visual-multi
     ];