fix: move nix.optimise to non-hm

konradmalik · Nov 11, 2024 · da26e0b · da26e0b
1 parent c121db8
commit da26e0b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/hosts/common/modules/nix/not-hm.nix b/hosts/common/modules/nix/not-hm.nix
@@ -1,7 +1,31 @@
-{ inputs, ... }:
 {
-  # should be >= max-jobs
-  nix.nrBuildUsers = 16;
+  inputs,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  nix = {
+    # should be >= max-jobs
+    nrBuildUsers = 16;
+
+    optimise =
+      {
+        automatic = true;
+      }
+      // lib.optionalAttrs (pkgs.stdenvNoCC.isLinux) {
+        dates = [ "Fri *-*-* 10:00:00" ];
+      }
+      // lib.optionalAttrs (pkgs.stdenvNoCC.isDarwin) {
+        interval = [
+          {
+            Hour = 10;
+            Minute = 0;
+            Weekday = 5;
+          }
+        ];
+      };
+  };
   # Make `nix repl '<nixpkgs>'` use the same nixpkgs as the one used by this flake.
   environment.etc."nix/inputs/nixpkgs".source = "${inputs.nixpkgs}";
 }
diff --git a/hosts/common/modules/nix/shared.nix b/hosts/common/modules/nix/shared.nix
@@ -36,22 +36,6 @@ in
       # Setting only non standards here. Eg. "nixpkgs" is set by default.
       nixpkgs-stable.flake = inputs.nixpkgs-stable;
     };
-    optimise =
-      {
-        automatic = true;
-      }
-      // lib.optionalAttrs (pkgs.stdenvNoCC.isLinux) {
-        dates = [ "Fri *-*-* 10:00:00" ];
-      }
-      // lib.optionalAttrs (pkgs.stdenvNoCC.isDarwin) {
-        interval = [
-          {
-            Hour = 10;
-            Minute = 0;
-            Weekday = 5;
-          }
-        ];
-      };
     settings = {
       experimental-features = [
         "nix-command"