update flake

Merge back

cli/flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759853171,
+        "lastModified": 1774715571,
-        "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=",
+        "narHash": "sha256-MMjHif46sc/iLF9JqxBhFaueSPRcjPeP9AiujERH6N0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d",
+        "rev": "557f5e38ce94ef0f02f05de7ae65057d4b2a89a6",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759831965,
+        "lastModified": 1774386573,
-        "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c9b6fb798541223bbb396d287d16f43520250518",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {

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]
+[diff]
-    navigate = true
+    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
 }

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772380461,
+        "lastModified": 1775360939,
-        "narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=",
+        "narHash": "sha256-XUBlSgUFdvTh6+K5LcI5mJu5F5L8scmJDMRiZM484TM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961",
+        "rev": "2097a5c82bdc099c6135eae4b111b78124604554",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772379624,
+        "lastModified": 1775037210,
-        "narHash": "sha256-NG9LLTWlz4YiaTAiRGChbrzbVxBfX+Auq4Ab/SWmk4A=",
+        "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "52d061516108769656a8bd9c6e811c677ec5b462",
+        "rev": "06648f4902343228ce2de79f291dd5a58ee12146",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772419343,
+        "lastModified": 1775126147,
-        "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=",
+        "narHash": "sha256-J0dZU4atgcfo4QvM9D92uQ0Oe1eLTxBVXjJzdEMQpD0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9",
+        "rev": "8d8c1fa5b412c223ffa47410867813290cdedfef",
         "type": "github"
       },
       "original": {

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;
+        ".config/lazygit/config.yml".source = ../files/lazygit/config.yaml;
-        "Library/Application Support/lazydocker/config.yml".source = ../files/lazydocker/config.yml;
+        ".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
       ];
   };
 }