diff --git a/flake.lock b/flake.lock index 7748d0f..564efd9 100644 --- a/flake.lock +++ b/flake.lock @@ -228,11 +228,11 @@ "nix-secrets": { "flake": false, "locked": { - "lastModified": 1716740534, - "narHash": "sha256-dmhiwpEQfk49yYv4q+UrpmH4TQSPzCpzV4635wvO93g=", + "lastModified": 1716740590, + "narHash": "sha256-ZmoCxovGSdsKIxzZcbFWZH8OjFqcXx7iKSSA1PkhjU4=", "ref": "refs/heads/master", - "rev": "204907123c7a9a7dde23200cf9096cb08c7169fb", - "revCount": 51, + "rev": "32406415be32389c8019ab6e8aaaf6ac259cb773", + "revCount": 52, "type": "git", "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git" }, @@ -300,11 +300,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1716733566, - "narHash": "sha256-Zu0fn7bC+M/LwOOkR1RmeoOuCIbvvFwuqTldVBVe4WY=", + "lastModified": 1716739594, + "narHash": "sha256-0iXuhpC57QUNaEG0qRMufWEL9mRPYEHfrnPNMOsO7fY=", "owner": "nix-community", "repo": "nixvim", - "rev": "8212bf1cd2d2dfe6ba521dd8c65a13b67e562d1a", + "rev": "23276f629b0c68ce869f32fae41323763981039c", "type": "github" }, "original": { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 922d8eb..5873d64 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -42,9 +42,6 @@ ssh-keygen -t ed25519 -f "$temp/persist/etc/ssh/ssh_host_ed25519_key" -C root@"$ chmod 600 "$temp/persist/etc/ssh/ssh_host_ed25519_key" chmod 644 "$temp/persist/etc/ssh/ssh_host_ed25519_key.pub" -echo -e "\nNeed to change ownership of temp directories\n" -sudo chown root:root -R "$temp" - # Generate age key from target host and user public ssh key echo "Generating age key from target host and user ssh key" HOST_AGE_KEY=$(nix-shell -p ssh-to-age --run "cat $temp/persist/etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age") @@ -64,6 +61,9 @@ sed -i "{ just update-sops-secrets && just update-flake-secrets && just update-flake +echo -e "\nNeed to change ownership of temp directories, enter sudo password if prompted:\n" +sudo chown root:root -R "$temp" + # Install Nixos to target cd "$HOME/nixos" git add . && git commit -m "auto: bootstrapping $hostname" && git push