+

oluceps · Oct 15, 2024 · 33b8e3c · 33b8e3c
1 parent e8c0a45
commit 33b8e3c
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);