From 879164245414590b956da9e31276a31594231f6c Mon Sep 17 00:00:00 2001 From: Andre Date: Tue, 1 Oct 2024 10:04:28 -0400 Subject: [PATCH] Services: fix autoupgrade typo --- bin/nixos-upgrade-script.sh | 2 +- modules/services/autoupgrade.nix | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/nixos-upgrade-script.sh b/bin/nixos-upgrade-script.sh index 6a79295..6a45c31 100755 --- a/bin/nixos-upgrade-script.sh +++ b/bin/nixos-upgrade-script.sh @@ -38,7 +38,7 @@ while [[ $# -gt 0 ]]; do shift shift ;; - --no-update|-n) + --no-update|--no-upgrade|-n) update=false shift shift diff --git a/modules/services/autoupgrade.nix b/modules/services/autoupgrade.nix index 1a607f5..bca52aa 100644 --- a/modules/services/autoupgrade.nix +++ b/modules/services/autoupgrade.nix @@ -15,6 +15,7 @@ in extraFlags = lib.mkOption { type = lib.types.str; description = "Extra flags to pass to nixos-rebuild."; + default = ""; }; onCalendar = lib.mkOption { default = "daily"; @@ -57,10 +58,10 @@ in unitConfig.RequiresMountsFor = cfg.configDir; script = lib.strings.concatStrings [ "/run/current-system/sw/bin/nixos-upgrade-script --operation switch " - (lib.mkIf (cfg.configDir) "--flake ${cfg.configDir} ").content - (lib.mkIf (cfg.user) "--user ${cfg.user} ").content + (lib.mkIf (cfg.configDir != "") "--flake ${cfg.configDir} ").content + (lib.mkIf (cfg.user != "") "--user ${cfg.user} ").content (lib.mkIf (!cfg.pushUpdates) "--no-update ").content - (lib.mkIf (cfg.extraFlags) cfg.extraFlags).content + (lib.mkIf (cfg.extraFlags != "") cfg.extraFlags).content ]; }; timers."nixos-upgrade" = {