diff options
Diffstat (limited to 'system/settings')
-rw-r--r-- | system/settings/darwin.nix | 4 | ||||
-rw-r--r-- | system/settings/hardware/audio.nix | 2 | ||||
-rw-r--r-- | system/settings/programs/docker.nix | 5 | ||||
-rw-r--r-- | system/settings/services/git-server.nix | 22 | ||||
-rw-r--r-- | system/settings/user-interface.nix | 1 |
5 files changed, 12 insertions, 22 deletions
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..1560e8f5 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.instances.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.instances.gitolite; + fcgisocket = "${fcgi.socket.type}/${fcgi.socket.address}"; in { useACMEHost = "alanpearce.eu"; @@ -173,7 +176,6 @@ in enable-log-linecount=1 max-stats=year snapshots=tar.lz tar.zst zip - cache-size=10240 enable-http-clone=1 enable-commit-graph=1 mimetype-file=${pkgs.nginx}/conf/mime.types 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 |