Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'lass/master'

Browse Source
This commit is contained in:
makefu 2022-01-06 13:18:48 +01:00
commit fe0e878c1f
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
krebs/3modules/exim.nix
View File

@ -65,8 +65,9 @@ in {
config.environment.etc."exim.conf".source config.environment.etc."exim.conf".source
]; ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.exim}/bin/exim -bdf -q30m"; ExecStart = "+${pkgs.exim}/bin/exim -bdf -q30m";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecReload = "+${pkgs.coreutils}/bin/kill -HUP $MAINPID";
User = cfg.user.name;
}; };
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
}; };

4
krebs/3modules/external/default.nix vendored
View File

@ -320,7 +320,7 @@ in {
aliases = [ aliases = [
"zaatar.r" "zaatar.r"
"zaatar.kmein.r" "zaatar.kmein.r"
"radio.kmein.r" "grocy.kmein.r"
"bvg.kmein.r" "bvg.kmein.r"
"moodle.kmein.r" "moodle.kmein.r"
]; ];
@ -662,6 +662,7 @@ in {
vDZ+BoHCjq9FfQrAu1+E83yCYyu+3fWrLSgYyrqjg0gPcCcnb1g6hqECAwEAAQ== vDZ+BoHCjq9FfQrAu1+E83yCYyu+3fWrLSgYyrqjg0gPcCcnb1g6hqECAwEAAQ==
-----END RSA PUBLIC KEY----- -----END RSA PUBLIC KEY-----
''; '';
tinc.pubkey_ed25519 = "PiqJGofbo6941m20NJM3yhUoWKTNyLCtTPzsKcrvFSL";
}; };
}; };
}; };
@ -686,6 +687,7 @@ in {
/n/eHElmKWoMCXhkV/mee1Cl2Y74XKivM6ov3lLvIDRxdXl46PvBFVkCAwEAAQ== /n/eHElmKWoMCXhkV/mee1Cl2Y74XKivM6ov3lLvIDRxdXl46PvBFVkCAwEAAQ==
-----END RSA PUBLIC KEY----- -----END RSA PUBLIC KEY-----
''; '';
tinc.pubkey_ed25519 = "P9yurwK2l1npimgm3yk8WXigWLfEtJ6G1w/3kVCPG7F";
}; };
}; };
}; };

7
krebs/3modules/htgen.nix
View File

@ -75,7 +75,12 @@ let
} }
) cfg; ) 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 in out

1
lib/default.nix
View File

@ -52,6 +52,7 @@ let
type = typeOf x; type = typeOf x;
reject = throw "cannot convert ${type}"; reject = throw "cannot convert ${type}";
in { in {
int = toJSON x; # close enough
list = "{ ${concatStringsSep ", " (map toC x)} }"; list = "{ ${concatStringsSep ", " (map toC x)} }";
null = "NULL"; null = "NULL";
set = if isDerivation x then toJSON x else reject; set = if isDerivation x then toJSON x else reject;

5
tv/1systems/querel/config.nix
View File

@ -73,9 +73,8 @@ with import <stockholm/lib>;
services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
services.xserver.displayManager.lightdm.autoLogin.enable = true; services.xserver.displayManager.autoLogin.enable = true;
services.xserver.displayManager.lightdm.autoLogin.user = "itak"; services.xserver.displayManager.autoLogin.user = "itak";
services.xserver.displayManager.lightdm.enable = true;
users.users.itak = { users.users.itak = {
inherit (config.krebs.users.itak) home uid; inherit (config.krebs.users.itak) home uid;