SelfPrivacy/selfprivacy-nixos-infect
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect.git synced 2024-11-25 21:11:27 +00:00
Code Issues Projects Releases Wiki Activity

system.stateVersion = lib.mkDefault "$release"

Browse source
This commit is contained in:
Alexander Tomokhov 2023-12-22 23:04:38 +04:00
parent 9cd6207238
commit d099b7bd11
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nixos-infect
View file

@ -37,12 +37,6 @@ genUserdata() {
local HASHED_PASSWORD userdata_infect release local HASHED_PASSWORD userdata_infect release
HASHED_PASSWORD="$(mkpasswd -m sha-512 "$USER_PASS")" HASHED_PASSWORD="$(mkpasswd -m sha-512 "$USER_PASS")"
if ! release="$($NIX "${NIX_OPTS[@]}" eval --impure --raw --expr "(builtins.getFlake (builtins.toString ${LOCAL_FLAKE_DIR})).inputs.selfprivacy-nixos-config.inputs.nixpkgs.lib.trivial.release")"
then
echo "cannot determine NixOS release version"
return 1
fi
userdata_infect=$(cat << EOF userdata_infect=$(cat << EOF
{ {
$(genOptionalSsh) $(genOptionalSsh)
@ -56,8 +50,7 @@ genUserdata() {
"domain": "$DOMAIN", "domain": "$DOMAIN",
"hashedMasterPassword": "$HASHED_PASSWORD", "hashedMasterPassword": "$HASHED_PASSWORD",
"hostname": "$HOSTNAME", "hostname": "$HOSTNAME",
"username": "$LUSER", "username": "$LUSER"
"stateVersion": "$release"
} }
EOF EOF
) )
@ -148,11 +141,11 @@ genDeploymentConfiguration() {
fi fi
cat << EOF cat << EOF
${DoNetConf:+"{ lib, ... }: "}{ { lib, ... }: {
# The content below is static and belongs to this deployment only! # The content below is static and belongs to this deployment only!
# Do not copy this configuration file to another NixOS installation! # Do not copy this configuration file to another NixOS installation!
# system.stateVersion = "$release";` system.stateVersion = lib.mkDefault "$release";`
`$(if [ "$DoNetConf" == "y" ]; then echo -e "$NL"; genNetworkingConf; fi) `$(if [ "$DoNetConf" == "y" ]; then echo -e "$NL"; genNetworkingConf; fi)
} }
EOF EOF