diff --git a/nix/configurations/hetzner_benchmark.nix b/nix/configurations/hetzner_benchmark.nix index f14a3cf9..2fddb026 100644 --- a/nix/configurations/hetzner_benchmark.nix +++ b/nix/configurations/hetzner_benchmark.nix @@ -47,7 +47,14 @@ in nix.package = pkgs.nix-monitored; - system.nixos.version = lib.substring 0 8 sources.nixpkgs.revision; + system.nixos = + let + rev = lib.substring 0 8 sources.nixpkgs.revision; + in + { + versionSuffix = "-git:${rev}"; + revision = rev; + }; } ./hetzner_benchmark/nixos/hardware-configuration.nix diff --git a/nix/configurations/hydrogen.nix b/nix/configurations/hydrogen.nix index f26705ea..c751ef0a 100644 --- a/nix/configurations/hydrogen.nix +++ b/nix/configurations/hydrogen.nix @@ -53,7 +53,14 @@ in nix.package = pkgs.nix-monitored; - system.nixos.version = lib.substring 0 8 sources.nixpkgs.revision; + system.nixos = + let + rev = lib.substring 0 8 sources.nixpkgs.revision; + in + { + versionSuffix = "-git:${rev}"; + revision = rev; + }; } ./hydrogen/nixos/misc.nix diff --git a/nix/configurations/installer.nix b/nix/configurations/installer.nix index e77b99ad..972409e9 100644 --- a/nix/configurations/installer.nix +++ b/nix/configurations/installer.nix @@ -4,6 +4,9 @@ # figured out an elegant (enough) way to do it while keeping my secrets # encrypted. # +let + sources = import ../../npins; +in { pkgs, lib, @@ -41,6 +44,15 @@ ]; }; + system.nixos = + let + rev = lib.substring 0 8 sources.nixpkgs.revision; + in + { + versionSuffix = "-git:${rev}"; + revision = rev; + }; + isoImage.squashfsCompression = "zstd -Xcompression-level 3"; environment.systemPackages = [ diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 019b2f4f..2fba0b2a 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -78,7 +78,14 @@ in nix.package = pkgs.nix-monitored; - system.nixos.version = lib.substring 0 8 sources.nixpkgs.revision; + system.nixos = + let + rev = lib.substring 0 8 sources.nixpkgs.revision; + in + { + versionSuffix = "-git:${rev}"; + revision = rev; + }; } #