fix(nixosProfiles): load.transformer

tao3k · Oct 11, 2023 · 83ece62 · 83ece62
1 parent bdd1274
commit 83ece62
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/lib/exporter/pops.nix b/lib/exporter/pops.nix
@@ -35,10 +35,12 @@ in
       type = "nixosProfiles";
     };
   };
+
   loadNixOSProfiles = self.loadNixOSModules.addLoadExtender {
     load = {
       src = inputs.self.outPath + "/nixos/nixosProfiles";
       type = "nixosProfiles";
+      transformer = [ (_: _: _) ];
     };
   };
 

diff --git a/nixos/darwinProfiles/presets/homebrew.nix b/nixos/darwinProfiles/presets/homebrew.nix
@@ -14,13 +14,13 @@ in
   homebrew = {
     enable = true;
     # onActivation.cleanup = "zap";
-    onActivation.upgrade = true;
+    onActivation.upgrade = lib.mkDefault true;
     # Use the nix-darwin brewfile when invoking `brew bundle` imperatively.
-    global.brewfile = true;
-    global.lockfiles = false;
+    global.brewfile = lib.mkDefault true;
+    global.lockfiles = lib.mkDefault false;
     __profiles__ = {
-      readers = true;
-      shell = true;
+      readers = lib.mkDefault true;
+      shell = lib.mkDefault true;
       casks.removePackagesFromProfiles = [ ];
       brews.removePackagesFromProfiles = [ ];
     };

diff --git a/tests/darwin/expr.nix b/tests/darwin/expr.nix
@@ -12,13 +12,14 @@ in
   darwinFontProfile =
     (exporter.layouts.darwinConfiguration [
       omnibus.darwinProfiles.presets.homebrew
-      omnibus.darwinProfiles.presets.nix
+      omnibus.darwinProfiles.presets.nix.default
       { homebrew.__profiles__.fonts = true; }
     ]).config.homebrew.casks;
 
   darwinNixProfile =
-    (exporter.layouts.darwinConfiguration [ omnibus.darwinProfiles.presets.nix ])
-    .config.nix.extraOptions;
+    (exporter.layouts.darwinConfiguration [
+      omnibus.darwinProfiles.presets.nix.default
+    ]).config.nix.extraOptions;
 }
 
 // lib.optionalAttrs trace { }