diff options
| -rw-r--r-- | hosts/ahmed/ssh/default.nix | 1 | ||||
| -rw-r--r-- | hosts/ali/configuration.nix | 3 | ||||
| -rw-r--r-- | metadata.toml | 8 | ||||
| -rw-r--r-- | secrets/secrets.nix | 4 |
4 files changed, 15 insertions, 1 deletions
diff --git a/hosts/ahmed/ssh/default.nix b/hosts/ahmed/ssh/default.nix index a2110b7..30dba4b 100644 --- a/hosts/ahmed/ssh/default.nix +++ b/hosts/ahmed/ssh/default.nix @@ -14,6 +14,7 @@ users.users = lib.genAttrs ["root" "linus"] (_: { openssh.authorizedKeys.keys = [ metadata.hosts.muhammed.sshKeys.linus + metadata.hosts.ali.sshKeys.linus # Identity used by Termios on iPhone. "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBPbGet0Mn5+HMeRBXeOkSYqGqbefFZ4kE9aYemyDp9D" diff --git a/hosts/ali/configuration.nix b/hosts/ali/configuration.nix index 6b69f3f..373d637 100644 --- a/hosts/ali/configuration.nix +++ b/hosts/ali/configuration.nix @@ -17,6 +17,9 @@ ./desktop-environment ]; + # Should match containing folder. + networking.hostName = "ali"; + boot.loader.grub = { # Use the GRUB 2 boot loader. enable = true; diff --git a/metadata.toml b/metadata.toml index a2a5573..7c2cac1 100644 --- a/metadata.toml +++ b/metadata.toml @@ -14,5 +14,13 @@ ipv4Address = "192.168.68.111" [hosts.muhammed.sshKeys] linus = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDcmUCfFA/arYpT0zBWoOXcyxN5bgk5cMrWgTIol5RsHB82VzoS+LG3IV4IwBz4QALaCj5DlhfbasGKMkFRgFvLerEtBleIb58RtOXIOf6TIUaqpyHB3h2CjdwrbmyjjWEl9W2BTpadrR5uPr0HoeED8dCFYE5cPjrSELtrYxEW0o1DBJw8bXfpgyYB21loBzrcOhRsrPSaS0gYHZLGY7Av7FGfncVZDLNYL0/pZ/t0UWD6JF+6FgOdGWAuuwSt5WR9DVxGilVG5aFktDB14fNPEBIVf7tkT4/McAihR/u344yaiUWA4bV7w039Ubhn9NdnoBSvGrP6jTy/zDgq5ywFj8aqcdlahxtELNWgxYYrI8HZzvITKo1FU7BOcUN1vNS4npOvyWBl7s3jFCO+R2E/BoyjfsjYTylacpepf26D87U32jNsh39OKdHxRF3/qmMGYa1L7N4M0iT9WFEMCcKB/MMAcHgE25vWPQaY1orU8X8NZPhxjfIVcw1rqcjwCryNwb1ZOMTIEc9kbGiP99MhE7ZA0yvHZfMezeymSwg1kN+iJDTp24gSsFtYuz5vm9lRu/PzfU9lNlp2KHdaLISUouSCCHPgF7zZSWtXa1B920zrAg2Fco8/Iymh+Fa0UNnrbnfyQTgLeNT12SLD4Y5gHimUsuq8tFkxjR6WffmrRw== linus@muhammed" +[hosts.ali] +network = "rumpenettet" +ipv4Address = "192.168.68.173" + +[hosts.ali.sshKeys] +root = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHAINiNBU5XTF7E/ErI/xF9S/t350OR3sOIYhRhfAhZ2 root@ali" +linus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMmjaik3g25rPFs1QD/Ig/tobACwHCDxkabc8x69yBZz linus@ali" + [networks.rumpenettet] v4 = "192.168.68.0" diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 56fa89e..e81ff62 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -7,13 +7,15 @@ let interactiveKeys = [ metadata.hosts.ahmed.sshKeys.linus metadata.hosts.muhammed.sshKeys.linus + metadata.hosts.ali.sshKeys.linus ]; # These are the keys which are used when actually decoding the secrets as part of activation. # On NixOS hosts this is the root user, and on nix-darwin hosts it's the user who installed nix-darwin. decodingKeys = { ahmed = metadata.hosts.ahmed.sshKeys.root; - muhammed = metadata.hosts.muhammed.linus; + muhammed = metadata.hosts.muhammed.sshKeys.linus; + ali = metadata.hosts.ali.sshKeys.root; }; in { "cloudflare-ddns-token.env.age".publicKeys = [decodingKeys.muhammed] ++ interactiveKeys; |