nix/lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename old option

Browse Source
This commit is contained in:
niten 2023-07-10 11:58:44 -07:00
parent 977ae77a76
commit 9865877695
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/fudo/hosts.nix
View File

@ -43,13 +43,13 @@ in {
firewall = mkIf ((length host-cfg.external-interfaces) > 0) { firewall = mkIf ((length host-cfg.external-interfaces) > 0) {
enable = true; enable = true;
allowedTCPPorts = [ 22 2112 ]; # Make sure _at least_ SSH is allowed allowedTCPPorts = [ 22 2112 ]; # Make sure _at least_ SSH is allowed
trustedInterfaces = let trustedInterfaces =
all-interfaces = attrNames config.networking.interfaces; let all-interfaces = attrNames config.networking.interfaces;
in subtractLists host-cfg.external-interfaces all-interfaces; in subtractLists host-cfg.external-interfaces all-interfaces;
}; };
hostId = mkIf (host-cfg.machine-id != null) hostId =
(substring 0 8 host-cfg.machine-id); mkIf (host-cfg.machine-id != null) (substring 0 8 host-cfg.machine-id);
}; };
environment = { environment = {
@ -78,11 +78,13 @@ in {
mode = "0444"; mode = "0444";
}; };
current-system-packages.text = with builtins; let current-system-packages.text = with builtins;
packages = map (p: "${p.name}") let
config.environment.systemPackages; packages = map (p: "${p.name}") config.environment.systemPackages;
sorted-unique = sort lessThan (unique packages); sorted-unique = sort lessThan (unique packages);
in "${concatStringsSep "\n" sorted-unique}\n"; in ''
${concatStringsSep "\n" sorted-unique}
'';
}; };
systemPackages = with pkgs; systemPackages = with pkgs;
@ -105,10 +107,9 @@ in {
}; };
programs.adb.enable = host-cfg.android-dev; programs.adb.enable = host-cfg.android-dev;
users.groups.adbusers = mkIf host-cfg.android-dev { users.groups.adbusers =
members = config.instance.local-admins; mkIf host-cfg.android-dev { members = config.instance.local-admins; };
};
boot.tmpOnTmpfs = host-cfg.tmp-on-tmpfs; boot.tmp.useTmpFs = host-cfg.tmp-on-tmpfs;
}; };
} }