Merge pull request #7 from 1virgola5/main

Merge back

cli/pkgs.nix

@@ -17,7 +17,6 @@ with pkgs;
   wget
   rsync
   yq
-  delta
 
   # Rust utils
   bat
@@ -30,6 +29,7 @@ with pkgs;
   dust
   yazi
   starship
+  difftastic
 
   # Dev
   lazydocker

common/home.nix

@@ -22,7 +22,6 @@
     wget
     rsync
     yq
-    delta
     kubectl
     croc
     asciinema_3
@@ -41,6 +40,7 @@
     yazi
     starship
     ouch
+    difftastic
 
     # TUI
     lazydocker

files/git/gitconfig

@@ -4,12 +4,9 @@
 	process = git-lfs filter-process
 	required = true
 [core]
-    pager = delta
 	excludesfile = ~/.gitignore_global
 	autocrlf = input
 	ignorecase=false
-[interactive]
-    diffFilter = delta --color-only
 
 [pull]
 	rebase = false
@@ -31,5 +28,5 @@
 [include]
     path = ~/.gitconfig.local
 
-[delta]
-    navigate = true
+[diff]
+    external = difft

files/lazygit/config.yaml

@@ -0,0 +1,5 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/jesseduffield/lazygit/master/schema/config.json
+
+git:
+  pagers:
+    - externalDiffCommand: difft --color=always

files/nvim/lazyvim.json

@@ -24,8 +24,9 @@
     "lazyvim.plugins.extras.util.dot",
     "lazyvim.plugins.extras.util.startuptime"
   ],
+  "install_version": 7,
   "news": {
-    "NEWS.md": "7429"
+    "NEWS.md": "11866"
   },
-  "version": 7
+  "version": 8
 }

home/home.nix

@@ -33,8 +33,8 @@ let
         ".gitconfig".source = ../files/git/gitconfig;
         ".gitignore_global".source = ../files/git/gitignore_global;
         ".gitconfig.local".source = ../secrets/git/config.${host.hostName};
-        ".config/nvim".source = ../files/nvim;
-        "Library/Application Support/lazydocker/config.yml".source = ../files/lazydocker/config.yml;
+        ".config/lazygit/config.yml".source = ../files/lazygit/config.yaml;
+        ".config/lazydocker/config.yml".source = ../files/lazydocker/config.yml;
 
         # Secrets
         ".ssh/config".text = builtins.replaceStrings [ "@SSH_KEY@" ] [ host.sshKey ] (
@@ -51,6 +51,10 @@ let
         vai = "sudo darwin-rebuild switch --flake ~/.config/dotfiles#${host.hostName}";
         clean = "nix-collect-garbage -d";
       };
+
+      sessionVariables = {
+        XDG_CONFIG_HOME = "$HOME/.config";
+      };
     };
   };
 

hosts/1k5.nix

@@ -7,10 +7,20 @@
   extras = {
     casks = [
       "notion"
+      "linear-linear"
+      "miro"
+      "loom"
       "cursor"
     ];
     pkgs =
       pkgs: with pkgs; [
+        docker-client
+        colima
+        google-cloud-sdk
+        gemini-cli
+        terramate
+        ffmpeg-full
+        stripe-cli
       ];
   };
 }