Merge pull request 'base: stabilize system.build.toplevel.outPath for vmVariant' (!105) from no-flake-in-vm into main

Reviewed-on: https://git.pvv.ntnu.no/Drift/pvv-nixos-config/pulls/105
Reviewed-by: Oystein Kristoffer Tveit <oysteikt@pvv.ntnu.no>

base/nix.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ lib, config, inputs, ... }:
 {
   nix = {
     gc = {
@@ -21,11 +21,16 @@
     ** use the same channel the system
     ** was built with
     */
-    registry = {
+    registry = lib.mkMerge [
-      "nixpkgs".flake = inputs.nixpkgs;
+      {
-      "nixpkgs-unstable".flake = inputs.nixpkgs-unstable;
+        "nixpkgs".flake = inputs.nixpkgs;
-      "pvv-nix".flake = inputs.self;
+        "nixpkgs-unstable".flake = inputs.nixpkgs-unstable;
-    };
+      }
+      # We avoid the reference to self in vmVariant to get a stable system .outPath for equivalence testing
+      (lib.mkIf (!config.virtualisation.isVmVariant) {
+        "pvv-nix".flake = inputs.self;
+      })
+    ];
     nixPath = [
       "nixpkgs=${inputs.nixpkgs}"
       "unstable=${inputs.nixpkgs-unstable}"

base/services/auto-upgrade.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, lib, ... }:
+{ config, inputs, pkgs, lib, ... }:
 
 let
   inputUrls = lib.mapAttrs (input: value: value.url) (import "${inputs.self}/flake.nix").inputs;
@@ -26,12 +26,14 @@ in
 
   # workaround for https://github.com/NixOS/nix/issues/6895
   # via https://git.lix.systems/lix-project/lix/issues/400
-  environment.etc."current-system-flake-inputs.json".source
+  environment.etc = lib.mkIf (!config.virtualisation.isVmVariant) {
-    = pkgs.writers.writeJSON "flake-inputs.json" (
+    "current-system-flake-inputs.json".source
-      lib.flip lib.mapAttrs inputs (name: input:
+      = pkgs.writers.writeJSON "flake-inputs.json" (
-        # inputs.*.sourceInfo sans outPath, since writeJSON will otherwise serialize sourceInfo like a derivation
+        lib.flip lib.mapAttrs inputs (name: input:
-        lib.removeAttrs (input.sourceInfo or {}) [ "outPath" ]
+          # inputs.*.sourceInfo sans outPath, since writeJSON will otherwise serialize sourceInfo like a derivation
-          // { store-path = input.outPath; } # comment this line if you don't want to retain a store reference to the flake inputs
+          lib.removeAttrs (input.sourceInfo or {}) [ "outPath" ]
-      )
+            // { store-path = input.outPath; } # comment this line if you don't want to retain a store reference to the flake inputs
-    );
+        )
+      );
+  };
 }

flake.nix

@@ -169,9 +169,9 @@
     };
 
     devShells = forAllSystems (system: {
-      default = nixpkgs.legacyPackages.${system}.callPackage ./shell.nix { };
+      default = nixpkgs-unstable.legacyPackages.${system}.callPackage ./shell.nix { };
       cuda = let
-        cuda-pkgs = import nixpkgs {
+        cuda-pkgs = import nixpkgs-unstable {
           inherit system;
           config = {
             allowUnfree = true;

justfile

@@ -1,6 +1,6 @@
 set positional-arguments # makes variables accesible as $1 $2 $@
 export GUM_FILTER_HEIGHT := "15"
-nom := `if [[ -t 2 ]] && command -v nom >/dev/null; then echo nom; else echo nix; fi`
+nom := `if [[ -t 1 ]] && command -v nom >/dev/null; then echo nom; else echo nix; fi`
 nix_eval_opts := "--log-format raw --option warn-dirty false"
 
 @_default:
@@ -26,7 +26,7 @@ run-vm machine=`just _a_machine` *_:
     | xargs -d'\n' nix flake update "$@"
 
 @repl $machine=`just _a_machine` *_:
-  set -v; NIX_NO_NOM=1 nixos-rebuild --flake .#"$machine" repl "${@:2}"
+  set -v; nixos-rebuild --flake .#"$machine" repl "${@:2}"
 
 @eval $machine=`just _a_machine` $attrpath="system.build.toplevel.outPath" *_:
   set -v; nix eval {{nix_eval_opts}} ".#nixosConfigurations.\"$machine\".config.$attrpath" --show-trace "${@:3}"

shell.nix

@@ -1,18 +1,6 @@
 { pkgs ? import <nixpkgs> {} }:
-
-let
-  nixos-rebuild-nom = pkgs.writeScriptBin "nixos-rebuild" ''
-    if [[ -t 1 && -z "''${NIX_NO_NOM-}" ]]; then
-      exec ${pkgs.lib.getExe pkgs.nixos-rebuild} -L "$@" |& ${pkgs.lib.getExe pkgs.nix-output-monitor}
-    else
-      exec ${pkgs.lib.getExe pkgs.nixos-rebuild} -L "$@"
-    fi
-  '';
-in
-
 pkgs.mkShellNoCC {
   packages = with pkgs; [
-    nixos-rebuild-nom
     just
     jq
     gum