6 files changed, 15 insertions, 21 deletions
diff --git a/system/linde.nix b/system/linde.nix
index c0af9144..ee680eb0 100644
--- a/system/linde.nix
+++ b/system/linde.nix
@@ -943,6 +943,9 @@ in
     enable = true;
     initialClusterState = "existing";
     dataDir = "/var/lib/etcd"; # TODO backup
+    extraConf = {
+      AUTO_COMPACTION_RETENTION = "1h";
+    };
   };
 
   services.dex =
diff --git a/system/settings/darwin.nix b/system/settings/darwin.nix
index 6d5b357d..0f507a31 100644
--- a/system/settings/darwin.nix
+++ b/system/settings/darwin.nix
@@ -19,10 +19,6 @@
   environment.darwinConfig = "$HOME/.config/nixpkgs/darwin-configuration.nix";
   nix = {
     daemonIOLowPriority = true;
-    gc = {
-      user = "alan";
-      options = "--max-freed $((25 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | awk '{ print $4 }')))";
-    };
     settings.extra-platforms = "aarch64-darwin x86_64-darwin";
 
     settings.trusted-users = [ "@admin" ];
diff --git a/system/settings/hardware/audio.nix b/system/settings/hardware/audio.nix
index 0afb38bb..78c7775a 100644
--- a/system/settings/hardware/audio.nix
+++ b/system/settings/hardware/audio.nix
@@ -9,8 +9,6 @@
     pulse.enable = true;
   };
 
-  sound.enable = true;
-
   environment.systemPackages = with pkgs; [
     pamixer
   ];
diff --git a/system/settings/programs/docker.nix b/system/settings/programs/docker.nix
index 29c2ac73..bbe0e4fc 100644
--- a/system/settings/programs/docker.nix
+++ b/system/settings/programs/docker.nix
@@ -18,9 +18,4 @@
       };
     };
   };
-  # TODO: autoPrune doesn't affect rootless
-  # systemd.timers.docker-prune.timerConfig = {
-  #   Persistent = true;
-  #   RandomizedDelaySec = 1800;
-  # };
 }
diff --git a/system/settings/services/git-server.nix b/system/settings/services/git-server.nix
index e8fe6360..72c441f5 100644
--- a/system/settings/services/git-server.nix
+++ b/system/settings/services/git-server.nix
@@ -64,13 +64,16 @@ let
   mkMirrorWants = repo: map (target: "mirror-to-${target}@${repo}.path");
 in
 {
-  services.fcgiwrap = {
-    enable = true;
-    user = "gitolite";
-    group = "gitolite";
-    preforkProcesses = 2;
-    socketType = "tcp6";
-    socketAddress = "[::1]:9000";
+  services.fcgiwrap.gitolite = {
+    process = {
+      user = "gitolite";
+      group = "gitolite";
+      prefork = 2;
+    };
+    socket = {
+      type = "tcp6";
+      address = "[::1]:9000";
+    };
   };
   services.gitolite = {
     enable = true;
@@ -114,8 +117,8 @@ in
   services.caddy.virtualHosts = {
     "git.alanpearce.eu" =
       let
-        fcgi = config.services.fcgiwrap;
-        fcgisocket = "${fcgi.socketType}/${fcgi.socketAddress}";
+        fcgi = config.services.fcgiwrap.gitolite;
+        fcgisocket = "${fcgi.socket.type}/${fcgi.socket.address}";
       in
       {
         useACMEHost = "alanpearce.eu";
diff --git a/system/settings/user-interface.nix b/system/settings/user-interface.nix
index d9d3297f..d8ae301a 100644
--- a/system/settings/user-interface.nix
+++ b/system/settings/user-interface.nix
@@ -58,7 +58,6 @@
       extraArgs = "--keep-since 14d";
     };
   };
-  nix.gc.automatic = ! config.programs.nh.enable;
 
   imports = [
     ./services/xserver.nix