From d6589d437b95c06c21e7fe65563933a325550ac8 Mon Sep 17 00:00:00 2001
From: Leon Wilzer <git@komu.boo>
Date: Fri, 29 Nov 2024 00:39:33 +0100
Subject: [PATCH] pager and git diff and merge setup

---
 common.nix | 41 +++++++++++++++++++++++------------------
 flake.nix  |  2 +-
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/common.nix b/common.nix
index a145c14..a9ca31b 100644
--- a/common.nix
+++ b/common.nix
@@ -339,9 +339,8 @@ in
   config = {
 
     home.sessionVariables = {
-      EDITOR = "nvim";
-      PAGER = "nvim -R";
-      MANPAGER = "nvim -R +Man!";
+      PAGER = "less -RFX --tabs=4";
+      MANPAGER = "nvim +'setl filetype=terminal' +'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,28 +566,33 @@ in
         defaultEditor = true;
         vimAlias = true;
         viAlias = true;
+        vimdiffAlias = true;
         extraConfig = ''
-          " General
-          set number
-          set relativenumber
-          set cc=120
-          set tabstop=4
-          set softtabstop=0 noexpandtab
-          set shiftwidth=4
-          colorscheme catppuccin-mocha
+                    " General
+                    set number
+                    set relativenumber
+                    set cc=120
+                    set tabstop=4
+                    set softtabstop=0 noexpandtab
+                    set shiftwidth=4
+                    colorscheme catppuccin-mocha
+          		  hi Normal guibg=NONE ctermbg=NONE
 
-          " VimTex
-          filetype plugin indent on
-          syntax enable
-          let g:vimtex_view_method = 'zathura'
+                    " VimTex
+                    filetype plugin indent on
+                    syntax enable
+                    let g:vimtex_view_method = 'zathura'
 
-          " Vim-LaTeX-live-preview
-          let g:livepreview_previewer = 'zathura'
+                    " 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
         ];
       };
 
diff --git a/flake.nix b/flake.nix
index 2314448..81b3a26 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,7 +62,7 @@
 
       homeConfigurations."leon" = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
-		
+
         modules = [
           ./home.nix
         ];