nixos-rebuild --use-remote-sudo no more

common/nixos-rebuild.nix

@@ -0,0 +1,25 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };
+in
+{
+  options.vacu.alwaysUseRemoteSudo = (lib.mkEnableOption "always deploy to this machine with --use-remote-sudo") // { default = true; };
+  config = lib.mkIf config.vacu.alwaysUseRemoteSudo {
+    system.build.nixos-rebuild = pkgs.stdenvNoCC.mkDerivation {
+      nativeBuildInputs = [ pkgs.makeShellWrapper ];
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p $out/bin
+        makeShellWrapper ${nixos-rebuild} $out/bin/nixos-rebuild --add-flags "--use-remote-sudo"
+
+        runHook postInstall
+      '';
+    };
+  };
+}

common/nixos.nix

@@ -2,7 +2,6 @@
   lib,
   pkgs,
   config,
-  inputs,
   utils,
   ...
 }:
@@ -11,6 +10,7 @@
     ./module.nix
     ./common-but-not.nix
     ./verify-system/nixos.nix
+    ./nixos-rebuild.nix
   ];
   options.vacu.underTest = lib.mkOption {
     default = false;