diff --git a/flake.lock b/flake.lock index 71d5abd..d7451fa 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754337839, - "narHash": "sha256-fEc2/4YsJwtnLU7HCFMRckb0u9UNnDZmwGhXT5U5NTw=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "856df6f6922845abd4fd958ce21febc07ca2fa45", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6716350..725edbb 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,10 @@ keys = import ./lib/keys.nix; paths = { flake = "/home/gortium/infra"; - identities = [ "/home/gortium/.ssh/gortium_ssh_key" "/etc/ssh/ssh_host_ed25519_key" ]; + identities = [ + "/home/gortium/.ssh/gortium_ssh_key" + "/etc/ssh/ssh_host_ed25519_key" + "/root/.age/bootstrap.key" ]; }; overlays = [ agenix.overlays.default ]; pkgs = import nixpkgs { diff --git a/hosts/lazyworkhorse/configuration.nix b/hosts/lazyworkhorse/configuration.nix index bb2770c..81aef1a 100644 --- a/hosts/lazyworkhorse/configuration.nix +++ b/hosts/lazyworkhorse/configuration.nix @@ -143,13 +143,13 @@ group = "root"; mode = "0400"; }; - # lazyworkhorse_host_ssh_key = { - # file = ../../secrets/lazyworkhorse_host_ssh_key.age; - # owner = "root"; - # group = "root"; - # mode = "0600"; - # path = "/etc/ssh/ssh_host_ed25519_key"; - # }; + lazyworkhorse_host_ssh_key = { + file = ../../secrets/lazyworkhorse_host_ssh_key.age; + owner = "root"; + group = "root"; + mode = "0600"; + path = "/etc/ssh/ssh_host_ed25519_key"; + }; }; }; diff --git a/lib/keys.nix b/lib/keys.nix index e82a203..b3f8d77 100644 --- a/lib/keys.nix +++ b/lib/keys.nix @@ -12,6 +12,7 @@ main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINmXqD+bBveCYf4khmARA0uaCzkBOUIE077ZrInLNs1O"; github = ""; gitea = ""; + bootstrap = "age1r796v2uldtspawyh863pks74sd2pwcan8j4e4pjzsvkmr3vjja9qpz5ste"; }; }; } diff --git a/modules/nixos/filesystem/hoardingcow-mount.nix b/modules/nixos/filesystem/hoardingcow-mount.nix index 1b9db33..f334e62 100644 --- a/modules/nixos/filesystem/hoardingcow-mount.nix +++ b/modules/nixos/filesystem/hoardingcow-mount.nix @@ -1,7 +1,7 @@ { pkgs, lib, config, ... }: { options = { - hoardingcow-mount.enable = lib.mkEnableOption "enable hoardingcow acces"; + hoardingcow-mount.enable = lib.mkEnableOption "enable hoardingcow access"; }; config = lib.mkIf config.hoardingcow-mount.enable { fileSystems."/mnt/HoardingCow_docker_data" = { diff --git a/secrets/containers.env.age b/secrets/containers.env.age index 2a8c362..5dffed4 100644 --- a/secrets/containers.env.age +++ b/secrets/containers.env.age @@ -1,8 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 GhMD8A rV+MVE/yCBXffr3Za8av5+lL8B/473Owe7phe2oKzXs -1Y3qBT07SKzO0EaSzLelbz5/whoEVfBD52N4+WwVScU --> ssh-ed25519 kYn3oA fHmhGCOWPfUOQpGEY0+lA6akxhJcCzn1zmiBQFeD4wg -k48jDsxD7uXfg+VUgM0+PIL1WOBdSOGsLyvsuqYOziY ---- PXyg0xCJqashEWw9FNHv5g9UWWZ/vzvgKfZJ85OyNKU -;O*E[ z4XG;R~S\7Ђ>ZU,ȏ糿#`:%'ixɟMfW -&E̛C >H,WZ%@nY \ No newline at end of file +-> ssh-ed25519 GhMD8A gLjSioFoNbora4jCZw3UguGp5TdUBLLMaYAiW11T824 +TXRVls3R4Zaz2AOvRujcy1kf2XqBQulK3gRzoh45g5g +-> ssh-ed25519 kYn3oA 25YlZSMkVE6I3VMUrlF4t3ZwuKj9PsMQoh2gi/pHb10 +CAFHTAZ7eyGHT8t766aBiT2Iiq9ZBKitVIIt3AxJfTE +-> X25519 2mIaB09iQVif9F3UF9azfs5bFpUkLIU4wtjsyavHPHc +GAoZGils65rkG8wOhR4MJB1M2c9IdVSPh0frZdc3Pg0 +--- 4Ujt4d9bouX5RsLq4WnkKb8vvGCrsLXfk3MWxP4Jar0 +ڝғw9"=UYEފ ( J9mw{\jcc>NqT| ^XyI+ߘN> |H߀WcW z^9T؈ .q L \ No newline at end of file diff --git a/secrets/lazyworkhorse_host_ssh_key.age b/secrets/lazyworkhorse_host_ssh_key.age index 6fc1a13..ac24217 100644 Binary files a/secrets/lazyworkhorse_host_ssh_key.age and b/secrets/lazyworkhorse_host_ssh_key.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 3cdbe08..e3a853f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,6 +1,6 @@ let keys = import ../lib/keys.nix; - authorizedKeys = [ keys.users.gortium.main keys.hosts.lazyworkhorse.main ]; + authorizedKeys = [ keys.users.gortium.main keys.hosts.lazyworkhorse.main keys.hosts.lazyworkhorse.bootstrap ]; in { "containers.env.age".publicKeys = authorizedKeys;