diff --git a/hosts/abhoth/spec.nix b/hosts/abhoth/spec.nix index b0eae448..5ef21920 100644 --- a/hosts/abhoth/spec.nix +++ b/hosts/abhoth/spec.nix @@ -8,6 +8,8 @@ system.stateVersion = "24.05"; users.mutableUsers = false; + services.userborn.enable = true; + system.etc.overlay.enable = true; system.etc.overlay.mutable = false; nix.gc = { diff --git a/hosts/azasos/spec.nix b/hosts/azasos/spec.nix index 6fa23c9d..d6161301 100644 --- a/hosts/azasos/spec.nix +++ b/hosts/azasos/spec.nix @@ -11,6 +11,8 @@ system.stateVersion = "24.05"; users.mutableUsers = false; + services.userborn.enable = true; + system.etc.overlay.enable = true; system.etc.overlay.mutable = false; environment.etc."resolv.conf".text = '' nameserver 127.0.0.1 diff --git a/hosts/eihort/spec.nix b/hosts/eihort/spec.nix index 2ac9439f..fbd9fd2e 100644 --- a/hosts/eihort/spec.nix +++ b/hosts/eihort/spec.nix @@ -7,6 +7,9 @@ }: { + + system.etc.overlay.enable = true; + services.userborn.enable = true; virtualisation.podman = { enable = true; dockerSocket.enable = true; diff --git a/hosts/hastur/spec.nix b/hosts/hastur/spec.nix index a603a25f..ff386317 100644 --- a/hosts/hastur/spec.nix +++ b/hosts/hastur/spec.nix @@ -10,7 +10,9 @@ system.stateVersion = "22.11"; # Did you read the comment? users.mutableUsers = false; - system.etc.overlay.mutable = false; + # services.userborn.enable = true; + # system.etc.overlay.enable = false; + # system.etc.overlay.mutable = false; # system.forbiddenDependenciesRegexes = [ "perl" ]; environment.etc."resolv.conf".text = '' nameserver 127.0.0.1 @@ -24,7 +26,7 @@ }; nix.gc = { - automatic = true; + # automatic = true; dates = "weekly"; options = "--delete-older-than 10d"; }; diff --git a/hosts/kaambl/spec.nix b/hosts/kaambl/spec.nix index bdad716c..4b444934 100644 --- a/hosts/kaambl/spec.nix +++ b/hosts/kaambl/spec.nix @@ -9,7 +9,9 @@ system.stateVersion = "23.05"; # Did you read the comment? users.mutableUsers = false; - system.etc.overlay.mutable = false; + services.userborn.enable = true; + # system.etc.overlay.enable = true; + # system.etc.overlay.mutable = false; # system.forbiddenDependenciesRegexes = [ "perl" ]; environment.etc."resolv.conf".text = '' nameserver 127.0.0.1 diff --git a/hosts/nodens/spec.nix b/hosts/nodens/spec.nix index 4e9e6fbd..65586e03 100644 --- a/hosts/nodens/spec.nix +++ b/hosts/nodens/spec.nix @@ -10,6 +10,8 @@ system.stateVersion = "22.11"; users.mutableUsers = false; + services.userborn.enable = true; + system.etc.overlay.enable = true; system.etc.overlay.mutable = false; nix.gc = { diff --git a/hosts/yidhra/spec.nix b/hosts/yidhra/spec.nix index 1dff8563..8d8f6320 100644 --- a/hosts/yidhra/spec.nix +++ b/hosts/yidhra/spec.nix @@ -11,6 +11,8 @@ system.stateVersion = "24.11"; users.mutableUsers = false; + services.userborn.enable = true; + system.etc.overlay.enable = true; system.etc.overlay.mutable = false; nix.gc = { diff --git a/misc.nix b/misc.nix index b05c8b01..9bf2c132 100755 --- a/misc.nix +++ b/misc.nix @@ -10,11 +10,9 @@ { # systemd.sysusers.enable = true; - system.etc.overlay.enable = true; system.switch.enableNg = true; system.switch.enable = lib.mkForce false; system.copySystemConfiguration = false; - services.userborn.enable = true; system.disableInstallerTools = true; programs.less.lessopen = null; diff --git a/modules/hysteria.nix b/modules/hysteria.nix index ab5a197c..8f2d5416 100644 --- a/modules/hysteria.nix +++ b/modules/hysteria.nix @@ -78,6 +78,9 @@ in "network-online.target" "nss-lookup.target" ]; + unitConfig = { + StartLimitIntervalSec = 0; + }; description = "hysteria daemon"; serviceConfig = let @@ -103,7 +106,6 @@ in LimitNOFILE = "infinity"; Restart = "always"; RestartSec = 1; - StartLimitIntervalSec = 0; }; } ) (lib.filterAttrs (_: v: v.enable) cfg.instances);