pager and git diff and merge setup

common.nix

@@ -339,9 +339,8 @@ in
   config = {
 
     home.sessionVariables = {
-      EDITOR = "nvim";
+      PAGER = "less -RFX --tabs=4";
-      PAGER = "nvim -R";
+      MANPAGER = "nvim +'setl filetype=terminal' +'Man!'";
-      MANPAGER = "nvim -R +Man!";
     };
 
     xdg.mimeApps = {
@@ -517,13 +516,14 @@ in
           p = "push";
           cl = "clone";
         };
-        delta = {
+        diff-so-fancy = {
           enable = true;
         };
         extraConfig = {
           push = {
             autoSetupRemote = true;
           };
+          merge.tool = "nvimdiff2";
           commit = {
             gpgsign = true;
           };
@@ -566,6 +566,7 @@ in
         defaultEditor = true;
         vimAlias = true;
         viAlias = true;
+        vimdiffAlias = true;
         extraConfig = ''
                     " General
                     set number
@@ -575,6 +576,7 @@ in
                     set softtabstop=0 noexpandtab
                     set shiftwidth=4
                     colorscheme catppuccin-mocha
+          		  hi Normal guibg=NONE ctermbg=NONE
 
                     " VimTex
                     filetype plugin indent on
@@ -583,11 +585,14 @@ in
 
                     " Vim-LaTeX-live-preview
                     let g:livepreview_previewer = 'zathura'
+
+          		  lua require'terminal'.setup()
         '';
         plugins = with pkgs.vimPlugins; [
           vimtex
           vim-latex-live-preview
           catppuccin-nvim
+          nvim-terminal-lua
         ];
       };