From 249be3bc398550fdccdece9eaa1f845672d65927 Mon Sep 17 00:00:00 2001 From: Roy Dumblauskas Date: Sun, 1 Jun 2025 20:31:54 -0500 Subject: [PATCH] update quasiSecrets input commit --- nixos/.sops.yaml | 5 ++++- nixos/bootstrap.sh | 2 +- nixos/flake.lock | 8 ++++---- nixos/secrets/build.json | 6 +++--- nixos/secrets/cloudflare.json | 6 +++--- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/nixos/.sops.yaml b/nixos/.sops.yaml index b45f4b4..cfbbb31 100644 --- a/nixos/.sops.yaml +++ b/nixos/.sops.yaml @@ -1,7 +1,7 @@ keys: hosts: - &laptop age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v - - &nixos-homelab-00 age1npdh6er3ntzlw4c7suwaw04fw4kqg2xr3h5qhw2anst02j7kypaspwyfda + - &nixos-homelab-00 age1p840m2676v7svktt3ljf25j6su7vgrrdpghfxk2a0l9lv2y0hsfqyswlfc creation_rules: - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ key_groups: @@ -9,3 +9,6 @@ creation_rules: - *laptop - *nixos-homelab-00 - *nixos-homelab-00 + - *nixos-homelab-00 + - *nixos-homelab-00 + - *nixos-homelab-00 diff --git a/nixos/bootstrap.sh b/nixos/bootstrap.sh index 7299a75..618e258 100755 --- a/nixos/bootstrap.sh +++ b/nixos/bootstrap.sh @@ -175,5 +175,5 @@ sops_generate_host_age_key "$target_key" # Install NixOS to the host system with our secrets nix run github:nix-community/nixos-anywhere --extra-experimental-features "nix-command flakes" -- --ssh-port "$ssh_port" --post-kexec-ssh-port "$ssh_port" --extra-files "$temp" --generate-hardware-config nixos-generate-config ./hardware-configuration.nix --disko-mode disko --build-on local --flake .#"$target_hostname" --target-host "$target_user"@"$target_destination" -echo "\nConfig Successfully Deployed\n" +echo "Config Successfully Deployed" diff --git a/nixos/flake.lock b/nixos/flake.lock index 8496530..376d7dc 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -220,11 +220,11 @@ }, "quasiSecrets": { "locked": { - "lastModified": 1748826711, - "narHash": "sha256-MATId8k2XLIBrEwYePxuWyHeYTF59focabs5FKt1bAI=", + "lastModified": 1748827872, + "narHash": "sha256-l5vEHHoG0X49ZaAi/dlyVidrgRl+uY2sTHSXiPStoUA=", "ref": "refs/heads/main", - "rev": "2b03b96cdfed1fb02e69c622472db62909029859", - "revCount": 11, + "rev": "f6dad37607b8044097d2f8700aee755e4268a6ce", + "revCount": 14, "type": "git", "url": "ssh://git@github.com/RoyDumblauskas/server-semi-secrets" }, diff --git a/nixos/secrets/build.json b/nixos/secrets/build.json index 17a06e9..04de92a 100644 --- a/nixos/secrets/build.json +++ b/nixos/secrets/build.json @@ -8,11 +8,11 @@ "age": [ { "recipient": "age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKREV0d0FMQSt0a05iZU1y\nMzdreG9WOXhWWFQ3RU41UnVCSXdQRjJDYmd3CkVHcGhvN0dmSUp2SWx6QkZ5N3px\nSTJjQi8ySE1YdWFTQ0FkOWpib2tYWkUKLS0tIE9MN0h5eGJHZExPNmk3WGtQd2ZN\nVGh1OWIxcVhaVktrUm5Za2IxSXdNQjAKFk6Lm6VQWwFPlPNP/m9y7DPUiGV0/buk\nOi6Lq2/yYJA0n3IHdqSG9H0QCZKDwyfVqKnmctsoG/pRCLsZYovgTw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrZzE0WkJBNk91bTMxWkQv\nRFdYNnBuSmY3d1lJQnQ4S09QOFY3QjNRRlRFCjNRSHBZYjdlZW81RXZOaXRZTURG\nZ2duRjY4TFl3U2ZkZGxsaW5hUi9QY2cKLS0tIGZxUTRzck1oaE5LZnpBeG11aDJG\nd0Jiem9xdjZRaGw1NVY4U2FwTk5EVmMKjuUaozKLj74Nr3uXuDu6LvJTCCDRDNRT\n3WvJt6DuFatsZ5zjvt0R7+0C0+YvZhBKuvfkfHPNj82UrFNCeRzpqA==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1npdh6er3ntzlw4c7suwaw04fw4kqg2xr3h5qhw2anst02j7kypaspwyfda", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYSk9SbmVQblBhYWdyZ1BG\nVDN0QXVPclFBRzUrN0xDU3JUbXJpT2ZlZ21jCmtROFdhaDFHbTZBK00rMzh5c21x\nN2hnOVIxeEJpN1dBekplT2hZN2VyalkKLS0tIEtZempQc3hiOUhBZzdqVG1LSEEx\nV0paSmdCeFpzQU5DWCt6RmloalFoejQKrizov+5Rd7+Vn1F/H6uFaC8Rpa9Ncj6e\nHfxk6oNaulKrD7bpApL6lVLrL7oy8UZpb/bX97zKO6e6ZaLVM/ju1w==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1p840m2676v7svktt3ljf25j6su7vgrrdpghfxk2a0l9lv2y0hsfqyswlfc", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUWnVXeEhYUjREUjM2azFZ\nS1dHemdsZnVKOUhyb0tHWmJUckRVbkdQRHpjCjNsWmpUMmJwai9ncmNXdmY5Zlpz\ncUwzSFg0MzhJYkxJNC9JS3FHWDl1dzQKLS0tIG5vS1hiRVBxTy9vQlpselhqRm5v\nVUlxMFJrZDlVempWYzR6NHNqUk14c0kKwnxxpRpiOmikqWOq7NPwYKX8kzEbC8XC\nxJy4xBLocURa9rTZOHpzDG91XUeQzFQE2N16dWSJz6yOMz7okunPOQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-04-17T15:26:55Z", diff --git a/nixos/secrets/cloudflare.json b/nixos/secrets/cloudflare.json index 95f95cf..ea03a91 100644 --- a/nixos/secrets/cloudflare.json +++ b/nixos/secrets/cloudflare.json @@ -9,11 +9,11 @@ "age": [ { "recipient": "age1ldgnl53dmvl4fjz6hgdj0cvensagddn3ltpmxfm72m8q273w75fsk42p8v", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpSzBqMXM4SWhrR0I1eXVG\ncmJ2aGx5YmpWZ2VSNkg0NWlCd2U1ckM2UndJClF3bkdxZDZnWG0zSWJ0R0ZRMUY4\nOXkyditGUnpiNHBkaHd1R1huZDh5TzQKLS0tIDk1MmIvbXZXT3owUkkvcHAxK0Jj\nSXVLMk9pWG55cTV6WUJOZlQwdmM4alkKZyqY0Cr4BNmOWLNMD60PWbodYnCUmHa3\n2An1qI+hXHmtpod4UqzoI2ZfBajI2dhYCtkJh6pVB/vbOCWyhCh+Nw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGSFVKUGo5L21hbDIyZ1kz\nUGdvQ0VQWk1FdFJSbUQ4Z29RVUZDaW5JU2tvCnI3WHdieUhUSjZqQm44Y1Z5RG5z\nbW5haC8wQVB3a0xvUnphbnllSWgwZU0KLS0tIDBFaFYzTlpDRVY0TnZPM0FYZkZQ\nMXRpZzF2Q05kcFJTVXhXVWVCYSsxL3cKn7U48cNBjhtTjSVAIPfFC8Y6gPCUvQJy\nvWLAmyDXAuugLhmpY+xMfDgZwg0KqzZr8mfckfRAJNcMNM2AnvMmig==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1npdh6er3ntzlw4c7suwaw04fw4kqg2xr3h5qhw2anst02j7kypaspwyfda", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwalc2ck1CQXNCVG9nMUtH\nakNyV0ZFUDZXQ21PVGg5OTNEVjZYVHU1ZXhNCk9CZ1FHb1I1RG11L0JKR1U5Rm9r\nanFRQ3NhNkNLcU1UYTZ5ZkxtTVUxL2sKLS0tIDNPanRqcmZmOS9mY0hGNWtLbVZC\nQ1NRb0dJWmo5TEtvQkpHcE9ScjRVSDAKnw+5oTzg+GU81j+wBWz8ZNTawnnPj8BJ\nfwNKtsorqo3SQ+KOb/zL7o0lairkkUBP9R2vcrCwl9oacnGl+y8ZFg==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1p840m2676v7svktt3ljf25j6su7vgrrdpghfxk2a0l9lv2y0hsfqyswlfc", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwK1lMWkxLOHFxeUNCV3FN\ncFZYY1MraXlDbjZnNDB1U1BEa0xyejVkSzJnCkg0Sy9kMGVqZUN6YTdoWkxzRS9h\nSEpHeWJNL2R2SUdiaUIvek41QVdvdE0KLS0tIFhKczZoZTYrV01VWUZ6V3ZqbzF2\nb21tZWpOQzNPNnZWRlUvWlBXb2NXTlUKF9zcWFu5wLzkBWdFHnwZdKkC/WMjcWJ3\nxRTamCIqEUZUgFJBH2IQebGzC7BAISlrbIPeHwxpzoRpaSYJc9GXuQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-04-28T04:15:19Z",