From 647f1754d04f1c21f22269d62e04ab91fbf5d2d1 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 19 Jan 2026 01:36:28 +0100
Subject: [PATCH] ng gone

---
 flake.nix |  2 +-
 justfile  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3706023..b11fb85 100644
--- a/flake.nix
+++ b/flake.nix
@@ -320,7 +320,7 @@
       inherit  (input-views.inputs-edge.system-manager-edge.packages.${system}) system-manager;
       inherit  (self.packages.${system}) nom-system-manager;
       envrc-pkgs = [
-        self.packages.${system}.nom-nixos-rebuild
+        # self.packages.${system}.nom-nixos-rebuild
         self.packages.${system}.nom-nixos-rebuild-ng
         # self.packages.${system}.nom-home-manager
         pkgs.nix-output-monitor
diff --git a/justfile b/justfile
index fa6c42e..f50053c 100644
--- a/justfile
+++ b/justfile
@@ -19,7 +19,7 @@ export FZF_DEFAULT_OPTS := "--height 15 --cycle --bind 'ctrl-a:toggle-all' " + e
   set -x; nix eval --log-format raw ".#nixosConfigurations.\"$hostname\".pkgs.$attrpath" --show-trace "${@:3}"
 
 repl $hostname=`just _a_host`:
-  NIX_NO_NOM=1 nixos-rebuild-ng --flake .#"$hostname" repl
+  NIX_NO_NOM=1 nixos-rebuild --flake .#"$hostname" repl
 
 why-depends $hostname $attrpath:
   nix why-depends .#nixosConfigurations."$hostname".config.system.build.toplevel .#nixosConfigurations."$hostname".pkgs."$attrpath"
@@ -67,7 +67,7 @@ build $hostname="" *_:
     echo >&2 "WARNING(just): 'hostname' starts with '-', moving it to nix args..."
     set -- "" "$@"; hostname=""
   fi
-  set -x; nixos-rebuild-ng build --accept-flake-config --show-trace --flake .#"$hostname" "${@:2}"
+  set -x; nixos-rebuild build --accept-flake-config --show-trace --flake .#"$hostname" "${@:2}"
 
 build-vm hostname=`just _a_host` *_:
   #!/usr/bin/env -S bash -euo pipefail
@@ -75,7 +75,7 @@ build-vm hostname=`just _a_host` *_:
     echo >&2 "WARNING(just): 'hostname' starts with '-', moving it to nix args..."
     set -- "" "$@"; hostname=""
   fi
-  set -x; nixos-rebuild-ng build-vm --accept-flake-config --show-trace --flake .#"$hostname" "${@:2}"
+  set -x; nixos-rebuild build-vm --accept-flake-config --show-trace --flake .#"$hostname" "${@:2}"
 
 build-vm-and-run $hostname=`just _a_host` *_:
   #!/usr/bin/env -S bash -euo pipefail
@@ -109,7 +109,7 @@ test *_:
   elif [[ $# -gt 0 && "${1::1}" != "-" ]]; then
     echo >&2 "WARNING(just): first arg does not start with "-", is it a hostname?"
   fi
-  set -x; sudo nixos-rebuild-ng test --accept-flake-config --show-trace --flake . "$@"
+  set -x; sudo nixos-rebuild test --accept-flake-config --show-trace --flake . "$@"
 
 switch *_:
   #!/usr/bin/env -S bash -euo pipefail
@@ -118,7 +118,7 @@ switch *_:
   elif [[ $# -gt 0 && "${1::1}" != "-" ]]; then
     echo >&2 "WARNING(just): first arg does not start with "-", is it a hostname?"
   fi
-  set -x; sudo nixos-rebuild-ng switch --accept-flake-config --show-trace --flake . "$@"
+  set -x; sudo nixos-rebuild switch --accept-flake-config --show-trace --flake . "$@"
 
 boot *_:
   #!/usr/bin/env -S bash -euo pipefail
@@ -127,7 +127,7 @@ boot *_:
   elif [[ $# -gt 0 && "${1::1}" != "-" ]]; then
     echo >&2 "WARNING(just): first arg does not start with "-", is it a hostname?"
   fi
-  set -x; sudo nixos-rebuild-ng boot --accept-flake-config --show-trace --flake . "$@"
+  set -x; sudo nixos-rebuild boot --accept-flake-config --show-trace --flake . "$@"
 
 boot-and-reboot *_:
   #!/usr/bin/env -S bash -euo pipefail
@@ -137,10 +137,10 @@ boot-and-reboot *_:
     echo >&2 "WARNING(just): first arg does not start with "-", is it a hostname?"
   fi
   set -x
-  sudo nixos-rebuild-ng boot --accept-flake-config --show-trace --flake . "$@"
+  sudo nixos-rebuild boot --accept-flake-config --show-trace --flake . "$@"
   sudo reboot # TODO: can i somehow ensure that the sudo hasn't timed out by this time?
 
-# TODO: nixos-rebuild-ng
+# TODO: does this support nixos-rebuild-ng?
 push $hostname=`just _a_host` cmd=`gum choose test switch boot --header "Select mode..."`:
   #!/usr/bin/env -S bash -euo pipefail
   remote_sudo=1