diff --git a/flake.nix b/flake.nix index 692f9cc..ce52b1e 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,6 @@ noshell, nur, nvf, - self, stylix, ... }: let diff --git a/pub-keys.nix b/pub-keys.nix new file mode 100644 index 0000000..389786b --- /dev/null +++ b/pub-keys.nix @@ -0,0 +1,14 @@ +{ + age.secrets = { + secret0.file = ./secrets/secret0.age; + secret1.file = ./secrets/secret1.age; + secret2.file = ./secrets/secret2.age; + }; + pub-keys = { + ssh = { + andromeda = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJy2VD362wUcu0lKj2d6OIU8dbAna0Lu/NaAYIj8gdIA andromeda@lenovo"; + lenovo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHG4eqsLTq2os2mxfwhys3BpVnowcJrqt2CbRFzN2pJb root@lenovo"; + _109-199-104-83 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJe5ol56yC23fivSEKeK4HZQm934ROX46AM7o0aE2hMq root@vmi2998419"; + }; + }; +} diff --git a/secrets.nix b/secrets.nix index 2e435a5..fd1c166 100644 --- a/secrets.nix +++ b/secrets.nix @@ -1,17 +1,5 @@ {lib, ...}: { - config = { - age.secrets = { - secret0.file = ./secrets/secret0.age; - secret1.file = ./secrets/secret1.age; - secret2.file = ./secrets/secret2.age; - }; - pub-keys = { - ssh = { - andromeda = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJy2VD362wUcu0lKj2d6OIU8dbAna0Lu/NaAYIj8gdIA andromeda@lenovo"; - lenovo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHG4eqsLTq2os2mxfwhys3BpVnowcJrqt2CbRFzN2pJb root@lenovo"; - }; - }; - }; + imports = [./pub-keys.nix]; options = { pub-keys.ssh = lib.mkOption { type = lib.types.attrsOf lib.types.str; diff --git a/secrets/secret0.age b/secrets/secret0.age index 4fd14de..757e7ff 100644 Binary files a/secrets/secret0.age and b/secrets/secret0.age differ diff --git a/secrets/secret1.age b/secrets/secret1.age index 3a172d3..facb97b 100644 Binary files a/secrets/secret1.age and b/secrets/secret1.age differ diff --git a/secrets/secret2.age b/secrets/secret2.age index de8612d..993e770 100644 Binary files a/secrets/secret2.age and b/secrets/secret2.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index e6859f1..309c6ac 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,9 +1,10 @@ let - pub-keys = (import ../secrets.nix).pub-keys; + pub-keys = (import ../pub-keys.nix).pub-keys; andromeda = pub-keys.ssh.andromeda; lenovo = pub-keys.ssh.lenovo; + _109-199-104-83 = pub-keys.ssh._109-199-104-83; in { "secret0.age".publicKeys = [andromeda lenovo]; "secret1.age".publicKeys = [andromeda lenovo]; - "secret2.age".publicKeys = [andromeda lenovo]; + "secret2.age".publicKeys = [andromeda lenovo _109-199-104-83]; }