From 0b6ce6377a47881b4e0119161d35804220b180ae Mon Sep 17 00:00:00 2001 From: RGBCube Date: Fri, 12 Jan 2024 15:08:29 +0300 Subject: [PATCH] Merge keys.nix into secrets.nix --- flake.nix | 2 +- secrets/default.nix | 3 ++- secrets/keys.nix | 4 ---- secrets/secrets.nix | 19 +++++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 secrets/keys.nix diff --git a/flake.nix b/flake.nix index 43b064a..0c66142 100644 --- a/flake.nix +++ b/flake.nix @@ -133,7 +133,7 @@ }; in defaults // other; - keys = import ./secrets/keys.nix; + keys = (import ./secrets/secrets.nix).keys; theme = themes.custom (themes.raw.gruvbox-dark-hard // { cornerRadius = 8; diff --git a/secrets/default.nix b/secrets/default.nix index 7eb4129..e3a8547 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -4,6 +4,7 @@ systemConfiguration { age.secrets = lib.genAttrs (builtins.map (lib.removeSuffix ".age") - (builtins.attrNames (import ./secrets.nix))) + (builtins.attrNames + (builtins.removeAttrs (import ./secrets.nix) [ "keys" ]))) (name: { file = ./${name}.age; }); } diff --git a/secrets/keys.nix b/secrets/keys.nix deleted file mode 100644 index 79fe83a..0000000 --- a/secrets/keys.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - rgbcube = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDRSLWxpIMOZIQv9ggDnAwSxmux/TZvuEPgq2HFiH+oI2OE07xYQAiroBVI5HH+aIg1nwpYtArANoD8V9Hrx2XCo2py/fMi9LhJWNMlFVcRLqYrCmrZYhBqZhxXIdY+wXqkSE7kvTKsz84BrhwilfA/bqTgVw2Ro6w0RnTzUhlYx4w10DT3isN09cQJMgvuyWNRlpGpkEGhPwyXythKM2ERoHTfq/XtpiGZQeLr6yoTTd9q4rbvnGGka5IUEz3RrmeXEs13l02IY6dCUFJkRRsK8dvB9zFjQyM08IqdaoHeudZoCOsnl/AiegZ7C5FoYEKIXY86RqxS3TH3nwuxe2fXTNr9gwf2PumM1Yh2WxV4+pHQOksxW8rWgv1nXMT5AG0RrJxr+S0Nn7NBbzCImrprX3mg4vJqT24xcUjUSDYllEMa2ioXGCeff8cwVKK/Ly5fwj0AX1scjiw+b7jD6VvDLA5z+ALwCblxiRMCN0SOMk9/V2Xsg9YIRMHyQwpqu8k= nixos@enka"; - cube = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMkCJeHcD0SIOZ4HkyF6rqUmbvlKhSha3HWMZ0hbIjp rgb@cube"; -} diff --git a/secrets/secrets.nix b/secrets/secrets.nix index ee0de1f..10cad13 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,10 +1,13 @@ -with import ./keys.nix; +rec { + keys = { + rgbcube = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDRSLWxpIMOZIQv9ggDnAwSxmux/TZvuEPgq2HFiH+oI2OE07xYQAiroBVI5HH+aIg1nwpYtArANoD8V9Hrx2XCo2py/fMi9LhJWNMlFVcRLqYrCmrZYhBqZhxXIdY+wXqkSE7kvTKsz84BrhwilfA/bqTgVw2Ro6w0RnTzUhlYx4w10DT3isN09cQJMgvuyWNRlpGpkEGhPwyXythKM2ERoHTfq/XtpiGZQeLr6yoTTd9q4rbvnGGka5IUEz3RrmeXEs13l02IY6dCUFJkRRsK8dvB9zFjQyM08IqdaoHeudZoCOsnl/AiegZ7C5FoYEKIXY86RqxS3TH3nwuxe2fXTNr9gwf2PumM1Yh2WxV4+pHQOksxW8rWgv1nXMT5AG0RrJxr+S0Nn7NBbzCImrprX3mg4vJqT24xcUjUSDYllEMa2ioXGCeff8cwVKK/Ly5fwj0AX1scjiw+b7jD6VvDLA5z+ALwCblxiRMCN0SOMk9/V2Xsg9YIRMHyQwpqu8k= nixos@enka"; + cube = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMkCJeHcD0SIOZ4HkyF6rqUmbvlKhSha3HWMZ0hbIjp rgb@cube"; + }; -{ - "acme.age".publicKeys = [ cube ]; - "cube.password.hash.age".publicKeys = [ cube ]; - "cube.mail.password.hash.age".publicKeys = [ cube ]; - "cube.id.age".publicKeys = [ rgbcube ]; - "enka.said.password.hash.age".publicKeys = [ rgbcube ]; - "enka.orhan.password.hash.age".publicKeys = [ rgbcube ]; + "acme.age".publicKeys = [ keys.cube ]; + "cube.password.hash.age".publicKeys = [ keys.cube ]; + "cube.mail.password.hash.age".publicKeys = [ keys.cube ]; + "cube.id.age".publicKeys = [ keys.rgbcube ]; + "enka.said.password.hash.age".publicKeys = [ keys.rgbcube ]; + "enka.orhan.password.hash.age".publicKeys = [ keys.rgbcube ]; }