diff --git a/configs/hu-berlin.nix b/configs/hu-berlin.nix index cf45357..b6f8942 100644 --- a/configs/hu-berlin.nix +++ b/configs/hu-berlin.nix @@ -1,6 +1,9 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let - eduroam = (import ).eduroam; + eduroam = { + identity = lib.strings.removeSuffix "\n" (builtins.readFile ); + password = lib.strings.removeSuffix "\n" (builtins.readFile ); + }; eduroamAuth = '' key_mgmt=WPA-EAP eap=TTLS diff --git a/configs/traadfri.nix b/configs/traadfri.nix index 589055f..1a73ee3 100644 --- a/configs/traadfri.nix +++ b/configs/traadfri.nix @@ -6,7 +6,7 @@ enable = true; user = "kmein"; host = "192.168.178.28"; - key = lib.strings.removeSuffix "\n" (builtins.readFile ); + key = lib.strings.removeSuffix "\n" (builtins.readFile ); rooms = { bedroom = 131074; corridor = 131076; diff --git a/deploy.nix b/deploy.nix index ddfe7ce..b4aface 100644 --- a/deploy.nix +++ b/deploy.nix @@ -41,6 +41,10 @@ let dir = toString ~/.password-store/systems; inherit name; }; + shared-secrets.pass = { + dir = toString ~/.password-store; + name = "shared"; + }; }) ]; target = "root@${name}:22022";