diff --git a/common/nixos-rebuild.nix b/common/nixos-rebuild.nix index 841bf3b..83784d3 100644 --- a/common/nixos-rebuild.nix +++ b/common/nixos-rebuild.nix @@ -6,29 +6,18 @@ ... }: let - nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; }; + nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package; }; in lib.optionalAttrs (vacuModuleType == "nixos") { - 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 = lib.mkForce ( - pkgs.runCommandLocal "nixos-rebuild-wrapped" - { - nativeBuildInputs = [ pkgs.makeShellWrapper ]; - meta.mainProgram = "nixos-rebuild"; - } - '' - runHook preInstall - - mkdir -p "$out"/bin - makeShellWrapper ${lib.getExe nixos-rebuild} "$out"/bin/nixos-rebuild --add-flags "--use-remote-sudo" - - runHook postInstall - '' - ); - }; + system.build.nixos-rebuild = lib.mkForce ( + pkgs.runCommandLocal "nixos-rebuild-wrapped" + { + nativeBuildInputs = [ pkgs.makeShellWrapper ]; + meta.mainProgram = "nixos-rebuild"; + } + '' + mkdir -p "$out"/bin + makeShellWrapper ${lib.getExe nixos-rebuild} "$out"/bin/nixos-rebuild --add-flags "--use-remote-sudo --use-substitutes" + '' + ); }