gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(extern): ssh host networks

Browse source
This commit is contained in:
arcnmx 2024-04-18 08:46:47 -07:00
parent 8480665c77
commit 5fdf5b36e7
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
modules/extern/home/ssh.nix vendored
View file

@ -11,12 +11,21 @@ let
inherit (gensokyo-zone.lib) unmerged coalesce mkAlmostOptionDefault mapListToAttrs; inherit (gensokyo-zone.lib) unmerged coalesce mkAlmostOptionDefault mapListToAttrs;
inherit (lib.options) mkOption mkEnableOption; inherit (lib.options) mkOption mkEnableOption;
inherit (lib.modules) mkIf mkMerge mkOptionDefault mkDefault; inherit (lib.modules) mkIf mkMerge mkOptionDefault mkDefault;
inherit (lib.lists) length head elem optional filter unique intersectLists; inherit (lib.lists) head elem optional filter unique intersectLists;
inherit (lib.attrsets) filterAttrs mapAttrsToList nameValuePair; inherit (lib.attrsets) filterAttrs mapAttrsToList nameValuePair;
inherit (lib.strings) optionalString; inherit (lib.strings) optionalString;
inherit (osConfig.gensokyo-zone) access; inherit (osConfig.gensokyo-zone) access;
cfg = gensokyo-zone.ssh.cfg; cfg = gensokyo-zone.ssh.cfg;
system = gensokyo-zone.systems.${config.systemName}.config; system = gensokyo-zone.systems.${config.systemName}.config;
networks = let
fallbackNetwork =
if system.network.networks.local.enable or false && access.local.enable then "local"
else if system.access.global.enable then null
else if system.network.networks.int.enable or false then "int"
else if system.network.networks.local.enable or false then "local"
else null;
networks = map (name: coalesce [ name fallbackNetwork ]) config.networks;
in unique networks;
in { in {
options = with lib.types; { options = with lib.types; {
enable = mkEnableOption "ssh client configuration" // { enable = mkEnableOption "ssh client configuration" // {
@ -56,18 +65,11 @@ let
networks = let networks = let
enabledNetworks = filterAttrs (_: net: net.enable) system.network.networks; enabledNetworks = filterAttrs (_: net: net.enable) system.network.networks;
networkNames = mapAttrsToList (_: net: net.name) enabledNetworks; networkNames = mapAttrsToList (_: net: net.name) enabledNetworks;
networks' = filter (name: name == null || elem name networkNames) cfg.networks; networks = filter (name: name == null || elem name networkNames) cfg.networks;
fallbackNetwork = in mkOptionDefault networks;
if system.network.networks.local.enable or false && access.local.enable then "local"
else if system.access.global.enable then null
else if system.network.networks.int.enable or false then "int"
else if system.network.networks.local.enable or false then "local"
else null;
networks = map (name: coalesce [ name fallbackNetwork ]) networks';
in mkOptionDefault (unique networks);
set = { set = {
matchBlocksSettings = let matchBlocksSettings = let
canonNetworkName' = intersectLists config.networks [ null "int" "local" ]; canonNetworkName' = intersectLists networks [ null "int" "local" ];
canonNetworkName = if canonNetworkName' != [ ] then head canonNetworkName' else null; canonNetworkName = if canonNetworkName' != [ ] then head canonNetworkName' else null;
in mapListToAttrs (network: let in mapListToAttrs (network: let
name = config.name + optionalString (network != canonNetworkName) "-${network}"; name = config.name + optionalString (network != canonNetworkName) "-${network}";
@ -85,9 +87,9 @@ let
); );
user = mkIf (config.user != null) (mkDefault config.user); user = mkIf (config.user != null) (mkDefault config.user);
port = mkIf (port != 22) (mkDefault port); port = mkIf (port != 22) (mkDefault port);
proxyJump = mkIf needsProxy (assert config.name != cfg.proxyJump; proxyJump = mkIf needsProxy (lib.warnIf (config.name == cfg.proxyJump) "proxyJump self-reference" (mkAlmostOptionDefault (
mkAlmostOptionDefault cfg.proxyJump cfg.proxyJump
); )));
identitiesOnly = mkIf (config.systemName == "u7pro") (mkAlmostOptionDefault true); identitiesOnly = mkIf (config.systemName == "u7pro") (mkAlmostOptionDefault true);
extraOptions = mkMerge [ extraOptions = mkMerge [
(unmerged.mergeAttrs config.extraOptions) (unmerged.mergeAttrs config.extraOptions)
@ -95,7 +97,7 @@ let
HostKeyAlias = mkIf (config.hostName != null && network != null) (mkOptionDefault system.access.fqdn); HostKeyAlias = mkIf (config.hostName != null && network != null) (mkOptionDefault system.access.fqdn);
} }
]; ];
}) config.networks; }) networks;
}; };
}; };
}; };