From 66885ab02e2135372234c7736cc0dea53761d835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Fri, 5 Dec 2025 23:38:40 +0100
Subject: [PATCH] 25.11: Remaining small things

---
 flake.nix             | 4 ++--
 hm/gaming/default.nix | 3 +--
 hm/git/default.nix    | 2 +-
 os/geoffrey.nix       | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7e1c19b..ab1d435 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,8 +64,8 @@
             # Cherry-pick packages from other places
             self: super:
             let
-              upkgs = import unixpkgs { inherit (super) system; };
-              opkgs = import onixpkgs { inherit (super) system; };
+              upkgs = import unixpkgs { inherit (super.stdenv.hostPlatform) system; };
+              opkgs = import onixpkgs { inherit (super.stdenv.hostPlatform) system; };
             in
             {
               # inherit (upkgs) hello; # Take package and dependencies: heavier
diff --git a/hm/gaming/default.nix b/hm/gaming/default.nix
index 27ce0c7..4915ce7 100644
--- a/hm/gaming/default.nix
+++ b/hm/gaming/default.nix
@@ -11,10 +11,9 @@
     home = {
       packages = with pkgs; [
         # gaming
-        # dolphin-emu # 25.11 Put back? Removed because mbedtls 2 is insecure
+        dolphin-emu
         ryubing
         prismlauncher
-        # TODO factorio
 
         steam # Common pitfall: https://github.com/NixOS/nixpkgs/issues/86506#issuecomment-623746883
         # itch # butler-15.21.0 is broken
diff --git a/hm/git/default.nix b/hm/git/default.nix
index 90841ac..eb95eb6 100644
--- a/hm/git/default.nix
+++ b/hm/git/default.nix
@@ -100,7 +100,7 @@ in
           };
           ui = {
             pager = "delta";
-            diff.format = "git";
+            diff-formatter = ":git";
             diff-editor = "meld-3";
             merge-editor = "meld";
           };
diff --git a/os/geoffrey.nix b/os/geoffrey.nix
index b1cdf66..89a39c3 100644
--- a/os/geoffrey.nix
+++ b/os/geoffrey.nix
@@ -5,7 +5,7 @@
   home-manager,
   ...
 }:
-# 25.11 Consider using home-manager.minimal to reduce evaluation
+# home-manager.minimal is not viable since there's no similar thing for stylix
 {
   config = {
     users.users.root.initialHashedPassword = "$y$j9T$e64bjL7iyVlniEKwKbM9g0$cCn74za0r6L9QMO20Fdxz3/SX0yvhz3Xd6.2BhtbRL1"; # Not a real password