From ea5ed13d1c4e0a47f7120e1497a396ecfa830a1b Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Wed, 3 Dec 2025 11:36:01 +0100
Subject: [PATCH 1/4] nix settings: temporarily use regular store optimisation
 instead of integrated one

---
 common/nix-settings.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/nix-settings.nix b/common/nix-settings.nix
index eb32daf..beb5ca0 100644
--- a/common/nix-settings.nix
+++ b/common/nix-settings.nix
@@ -29,8 +29,9 @@ in
     ];
     # use all cores for building
     cores = 0;
-    auto-optimise-store = true;
+    #auto-optimise-store = true;
   };
+  nix.optimise.automatic = true;  # temporary workaround until Lix/ Nix bug is fixed https://github.com/nix-darwin/nix-darwin/blob/e95de00a471d07435e0527ff4db092c84998698e/modules/nix/default.nix#L817C39-L817C78
   # TODO: manage access token with sops instead of manual deployment
   # permissions: needs to be readable by the user invoking nix and root (for nix daemon)
   nix.extraOptions = ''

From 1c4d30b542824bb97fc1322bc1420940782b8556 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Wed, 3 Dec 2025 11:36:57 +0100
Subject: [PATCH 2/4] home/workmac/packages: make darktable linux-only

long compile times, and I have not really used it on workmac
---
 home/modules/packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 6f5b756..731decc 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -14,7 +14,6 @@ let
 
   graphicsApps = [
     inkscape
-    darktable
     exiftool
   ]
   ++ (with gimp3Plugins; [
@@ -22,6 +21,7 @@ let
     #lqrPlugin  # broken
   ])
   ++ lib.optionals pkgs.stdenv.isLinux [
+    darktable
     gimp3
     hugin
     #luminanceHDR  # FIXME, build failure

From e4a9502d07d6242260806c57c1debb3f35f2ae87 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Wed, 3 Dec 2025 11:37:27 +0100
Subject: [PATCH 3/4] hom/workmac/packages: gimp2 is not gimp anymore

---
 home/modules/packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 731decc..0bade9a 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -28,7 +28,7 @@ let
     xournalpp
   ]
   ++ lib.optionals pkgs.stdenv.isDarwin [
-    gimp
+    gimp2
   ];
 
   multimediaApps = [

From 17e34212a3ae1667095f2074ceba8559f24d8e1e Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Wed, 3 Dec 2025 11:37:48 +0100
Subject: [PATCH 4/4] home/packages: drop gitui

broken under darwin, and not really used anymore
---
 home/modules/packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 0bade9a..6ff5bed 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -103,7 +103,6 @@ let
     mtr
     ripgrep
     fd
-    gitui
     pre-commit
     (scriv.overridePythonAttrs (old: {
       patches = old.patches or [ ] ++ [