Merge remote-tracking branch 'lass/master'

5 files changed, 15 insertions, 7 deletions

diff --git a/krebs/3modules/exim.nix b/krebs/3modules/exim.nix
index 972c7f437..0f0aa67f0 100644
--- a/krebs/3modules/exim.nix
+++ b/krebs/3modules/exim.nix
@@ -65,8 +65,9 @@ in {
         config.environment.etc."exim.conf".source
       ];
       serviceConfig = {
-        ExecStart = "${pkgs.exim}/bin/exim -bdf -q30m";
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        ExecStart = "+${pkgs.exim}/bin/exim -bdf -q30m";
+        ExecReload = "+${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        User = cfg.user.name;
       };
       wantedBy = [ "multi-user.target" ];
     };
diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 4c4e53f2f..66914797d 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -320,7 +320,7 @@ in {
           aliases = [
             "zaatar.r"
             "zaatar.kmein.r"
-            "radio.kmein.r"
+            "grocy.kmein.r"
             "bvg.kmein.r"
             "moodle.kmein.r"
           ];
@@ -662,6 +662,7 @@ in {
            vDZ+BoHCjq9FfQrAu1+E83yCYyu+3fWrLSgYyrqjg0gPcCcnb1g6hqECAwEAAQ==
            -----END RSA PUBLIC KEY-----
          '';
+         tinc.pubkey_ed25519 = "PiqJGofbo6941m20NJM3yhUoWKTNyLCtTPzsKcrvFSL";
         };
       };
     };
@@ -686,6 +687,7 @@ in {
            /n/eHElmKWoMCXhkV/mee1Cl2Y74XKivM6ov3lLvIDRxdXl46PvBFVkCAwEAAQ==
            -----END RSA PUBLIC KEY-----
          '';
+         tinc.pubkey_ed25519 = "P9yurwK2l1npimgm3yk8WXigWLfEtJ6G1w/3kVCPG7F";
         };
       };
     };
diff --git a/krebs/3modules/htgen.nix b/krebs/3modules/htgen.nix
index 4221703ec..375e26974 100644
--- a/krebs/3modules/htgen.nix
+++ b/krebs/3modules/htgen.nix
@@ -75,7 +75,12 @@ let
       }
     ) cfg;
 
-    users.groups = mapAttrs (_: _: {}) cfg;
+    users.groups = mapAttrs' (name: htgen:
+      nameValuePair htgen.user.name {
+        name = htgen.user.name;
+        gid = htgen.user.uid;
+      }
+    ) cfg;
 
   };
 in out
diff --git a/lib/default.nix b/lib/default.nix
index 574713e48..94a81439e 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -52,6 +52,7 @@ let
       type = typeOf x;
       reject = throw "cannot convert ${type}";
     in {
+      int = toJSON x; # close enough
       list = "{ ${concatStringsSep ", " (map toC x)} }";
       null = "NULL";
       set = if isDerivation x then toJSON x else reject;
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index 96d8d2b6a..41253cfb3 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -73,9 +73,8 @@ with import <stockholm/lib>;
 
   services.xserver.desktopManager.plasma5.enable = true;
 
-  services.xserver.displayManager.lightdm.autoLogin.enable = true;
-  services.xserver.displayManager.lightdm.autoLogin.user = "itak";
-  services.xserver.displayManager.lightdm.enable = true;
+  services.xserver.displayManager.autoLogin.enable = true;
+  services.xserver.displayManager.autoLogin.user = "itak";
 
   users.users.itak = {
     inherit (config.krebs.users.itak) home uid;