diff --git a/common/admins.nix b/common/admins.nix index dc9ec93..e22bba8 100644 --- a/common/admins.nix +++ b/common/admins.nix @@ -8,6 +8,7 @@ in { keys.users.maxine ++ keys.users.jade ++ keys.users.lukegb ++ + keys.users.yuka ++ [ # more raito "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcEkYM1r8QVNM/G5CxJInEdoBCWjEHHDdHlzDYNSUIdHHsn04QY+XI67AdMCm8w30GZnLUIj5RiJEWXREUApby0GrfxGGcy8otforygfgtmuUKAUEHdU2MMwrQI7RtTZ8oQ0USRGuqvmegxz3l5caVU7qGvBllJ4NUHXrkZSja2/51vq80RF4MKkDGiz7xUTixI2UcBwQBCA/kQedKV9G28EH+1XfvePqmMivZjl+7VyHsgUVj9eRGA1XWFw59UPZG8a7VkxO/Eb3K9NF297HUAcFMcbY6cPFi9AaBgu3VC4eetDnoN/+xT1owiHi7BReQhGAy/6cdf7C/my5ehZwD" diff --git a/common/ssh-keys.nix b/common/ssh-keys.nix index d526451..4e9fc6c 100644 --- a/common/ssh-keys.nix +++ b/common/ssh-keys.nix @@ -17,5 +17,6 @@ "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBO4idMfdJxDJuBNOid60d4I+qxj09RHt+YkCYV2eXt6tGrEXg+S8hTQusy/SqooiXUH9pt4tea2RuBPN9+UwrH0= type-a yubikey slot 9a" ]; lukegb = [ ''cert-authority,principals="lukegb" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEqNOwlR7Qa8cbGpDfSCOweDPbAGQOZIcoRgh6s/J8DR'' ]; + yuka = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKath4/fDnlv/4fzxkPrQN1ttmoPRNu/m9bEtdPJBDfY cardno:16_933_242" ]; }; } diff --git a/flake.nix b/flake.nix index 7086851..9ab2980 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ lix.follows = "hydra/nix"; }; - outputs = { self, nixpkgs, terranix, ... } @ inputs: + outputs = { self, nixpkgs, terranix, colmena, ... } @ inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -67,6 +67,8 @@ ]; }; + nixosConfigurations = (colmena.lib.makeHive self.outputs.colmena).nodes; + colmena = { meta.nixpkgs = import nixpkgs { localSystem = system;