From d099b7bd11febec9d9467918c0995e6b4fe70e47 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Fri, 22 Dec 2023 23:04:38 +0400 Subject: [PATCH] system.stateVersion = lib.mkDefault "$release" --- nixos-infect | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/nixos-infect b/nixos-infect index c540c61..1208c0c 100755 --- a/nixos-infect +++ b/nixos-infect @@ -37,12 +37,6 @@ genUserdata() { local HASHED_PASSWORD userdata_infect release 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 { $(genOptionalSsh) @@ -56,8 +50,7 @@ genUserdata() { "domain": "$DOMAIN", "hashedMasterPassword": "$HASHED_PASSWORD", "hostname": "$HOSTNAME", - "username": "$LUSER", - "stateVersion": "$release" + "username": "$LUSER" } EOF ) @@ -148,11 +141,11 @@ genDeploymentConfiguration() { fi cat << EOF -${DoNetConf:+"{ lib, ... }: "}{ +{ lib, ... }: { # The content below is static and belongs to this deployment only! # 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) } EOF