fixes

config/c3d2.nix

@@ -133,7 +133,7 @@ in {
       gc = {
         automatic = true;
         dates = "06:00";
-        options = "--delete-older-than 21d"
+        options = "--delete-older-than 21d";
         randomizedDelaySec = "6h";
       };
       package = pkgs.nixUnstable;

hosts/hydra/default.nix

@@ -24,11 +24,6 @@
     useSandbox = false;
     maxJobs = 4;
     buildCores = 16;
-    gc = {
-      automatic = true;
-      dates = lib.mkForce "06:00";
-      options = "--delete-older-than 14d";
-    };
     autoOptimiseStore = true;
     sshServe.enable = true;
     trustedUsers = [ "@wheel" ];

hosts/hydra/hydra.nix

@@ -51,7 +51,7 @@ in {
       MemoryMax = "32G";
       MemorySwapMax = "16G";
     };
-    services.nix-daemon.serviceConfig = {
+    nix-daemon.serviceConfig = {
       LimitNOFILE = lib.mkForce 8192;
       CPUWeight = 5;
       MemoryHigh = "32G";

hosts/rpi-netboot/default.nix

@@ -91,12 +91,6 @@
     keyMap = "de";
   };
 
-  services.xserver = {
-    enable = true;
-    layout = "de";
-    xkbOptions = "eurosign:e";
-  };
-
   services = {
     # Do not log to flash
     journald.extraConfig = ''
@@ -104,6 +98,9 @@
     '';
     openssh.enable = true;
     xserver = {
+      enable = true;
+      layout = "de";
+      xkbOptions = "eurosign:e";
       displayManager = {
         lightdm.enable = true;
         autoLogin = {
@@ -120,7 +117,7 @@
     # r/o /nix/store
     services = {
       nix-daemon.enable = false;
-      nix-gc.enable = false
+      nix-gc.enable = false;
     };
     sockets.nix-daemon.enable = false;
 

modules/autoupdate.nix

@@ -59,7 +59,7 @@
     nix.gc = lib.mkIf config.c3d2.autoUpdate {
       automatic = true;
       randomizedDelaySec = "6h";
-      options = "--delete-older-than 21d"
+      options = "--delete-older-than 21d";
     };
 
     # Always show a diff when activating a new system