From 41e52bb12bf42f2e35be2e6c5e4374920414a39f Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 13 Jun 2022 15:48:05 +0200
Subject: [PATCH] fixes

---
 config/c3d2.nix               |  2 +-
 hosts/hydra/default.nix       |  5 -----
 hosts/hydra/hydra.nix         |  2 +-
 hosts/rpi-netboot/default.nix | 11 ++++-------
 modules/autoupdate.nix        |  2 +-
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/config/c3d2.nix b/config/c3d2.nix
index 6a14e3a4..65e78cd2 100644
--- a/config/c3d2.nix
+++ b/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;
diff --git a/hosts/hydra/default.nix b/hosts/hydra/default.nix
index 0d04151a..8f480dc5 100644
--- a/hosts/hydra/default.nix
+++ b/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" ];
diff --git a/hosts/hydra/hydra.nix b/hosts/hydra/hydra.nix
index 338560f0..59de0146 100644
--- a/hosts/hydra/hydra.nix
+++ b/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";
diff --git a/hosts/rpi-netboot/default.nix b/hosts/rpi-netboot/default.nix
index 97ed0a63..80c0826b 100644
--- a/hosts/rpi-netboot/default.nix
+++ b/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;
 
diff --git a/modules/autoupdate.nix b/modules/autoupdate.nix
index e474508e..259409d5 100644
--- a/modules/autoupdate.nix
+++ b/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