diff --git a/data/ssh-keys.toml b/data/ssh-keys.toml new file mode 100644 index 0000000..cc17bed --- /dev/null +++ b/data/ssh-keys.toml @@ -0,0 +1,3 @@ +[foehammer] +leni = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDTIngMpTALLFEU4bDnPWCy7mznZZiPWw9vuYEAJ5zA0 foehammer@lorenzo-leni" +yubikey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtCcKS1jN/WSb4Ggvpz11pkUdE4kMgrN0xwptXLgSBX openpgp:0x79EFAC41" diff --git a/keys/foehammer.nix b/keys/foehammer.nix deleted file mode 100644 index e703994..0000000 --- a/keys/foehammer.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - leni = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDTIngMpTALLFEU4bDnPWCy7mznZZiPWw9vuYEAJ5zA0 foehammer@lorenzo-leni"; - - yubikey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtCcKS1jN/WSb4Ggvpz11pkUdE4kMgrN0xwptXLgSBX openpgp:0x79EFAC41"; -} diff --git a/lib/data.nix b/lib/data.nix new file mode 100644 index 0000000..d0aec59 --- /dev/null +++ b/lib/data.nix @@ -0,0 +1,6 @@ +rec { + getSSHKeys = let + sshKeys = builtins.fromTOML (builtins.readFile ../data/ssh-keys.toml); + in + name: (builtins.mapAttrs (_: value: builtins.attrValues value) sshKeys)."${name}"; +} diff --git a/lib/default.nix b/lib/default.nix index 341df42..f9ad521 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,5 +1,5 @@ nixpkgs: withSystem: { utils = import ./utils.nix; - getSSHKeys = (import ./keys.nix).getSSHKeys; + getSSHKeys = (import ./data.nix).getSSHKeys; mkSystem = (import ./nixos.nix nixpkgs withSystem).mkSystem; } diff --git a/lib/keys.nix b/lib/keys.nix deleted file mode 100644 index 18c993a..0000000 --- a/lib/keys.nix +++ /dev/null @@ -1,22 +0,0 @@ -let - utils = import ./utils.nix; -in rec { - getSSHKeys = name: (getKeySets ../keys)."${name}"; - - getKeySets = dir: let - entries = builtins.readDir dir; - - procEntry = name: type: let - path = dir + "/${name}"; - in - if type == "regular" - then [ - { - name = utils.getName name; - value = builtins.attrValues (import path); - } - ] - else []; - in - builtins.listToAttrs (builtins.concatLists (builtins.attrValues (builtins.mapAttrs procEntry entries))); -}