Compare commits

..

3 commits

3 changed files with 4 additions and 8 deletions

View file

@ -27,7 +27,7 @@
|> lib.attrValues |> lib.attrValues
|> lib.map (host: host.config.custom.sops) |> lib.map (host: host.config.custom.sops)
|> lib.filter (sops: sops.enable) |> lib.filter (sops: sops.enable)
|> lib.map (sops: mkCreationRule sops); |> lib.map mkCreationRule;
userCreationRules = userCreationRules =
self.nixosConfigurations self.nixosConfigurations
@ -35,7 +35,7 @@
|> lib.filter (host: host.config |> lib.hasAttr "home-manager") |> lib.filter (host: host.config |> lib.hasAttr "home-manager")
|> lib.map (host: host.config.home-manager.users.seb.custom.sops) |> lib.map (host: host.config.home-manager.users.seb.custom.sops)
|> lib.filter (sops: sops.enable) |> lib.filter (sops: sops.enable)
|> lib.map (sops: mkCreationRule sops); |> lib.map mkCreationRule;
jsonConfig = { creation_rules = hostCreationRules ++ userCreationRules; } |> lib.strings.toJSON; jsonConfig = { creation_rules = hostCreationRules ++ userCreationRules; } |> lib.strings.toJSON;
in in

View file

@ -5,10 +5,6 @@
{ {
isPrivateDomain = domain: domain |> lib.hasSuffix ".splitleaf.de"; isPrivateDomain = domain: domain |> lib.hasSuffix ".splitleaf.de";
subdomainOf = domain: domain |> lib.splitString "." |> lib.head;
rootDomainOf = domain: domain |> lib.splitString "." |> lib.tail |> lib.concatStringsSep ".";
listNixFilesRecursively = listNixFilesRecursively =
dir: dir |> lib.filesystem.listFilesRecursive |> lib.filter (lib.hasSuffix ".nix"); dir: dir |> lib.filesystem.listFilesRecursive |> lib.filter (lib.hasSuffix ".nix");

View file

@ -16,7 +16,7 @@ in
openssh = { openssh = {
enable = true; enable = true;
openFirewall = false; openFirewall = false;
ports = [ ]; ports = lib.mkForce [ ];
listenAddresses = lib.singleton { listenAddresses = lib.singleton {
addr = netCfg.overlay.address; addr = netCfg.overlay.address;
port = 22; port = 22;
@ -46,7 +46,7 @@ in
users.users.seb.openssh.authorizedKeys.keyFiles = users.users.seb.openssh.authorizedKeys.keyFiles =
self.nixosConfigurations self.nixosConfigurations
|> lib.attrValues |> lib.attrValues
|> lib.filter (host: host.config.custom.networking.hostName != netCfg.hostName) |> lib.filter (host: host.config.networking.hostName != netCfg.hostName)
|> lib.filter (host: host.config |> lib.hasAttr "home-manager") |> lib.filter (host: host.config |> lib.hasAttr "home-manager")
|> lib.map (host: host.config.home-manager.users.seb.custom.programs.ssh) |> lib.map (host: host.config.home-manager.users.seb.custom.programs.ssh)
|> lib.filter (ssh: ssh.enable) |> lib.filter (ssh: ssh.enable)