From 0a83529d1222e315207cff0d16e37a54cae29c34 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Wed, 20 Dec 2023 07:49:22 +0000 Subject: [PATCH] Revert "Revert "Disable nix autoUpgrade for regular machines"" This reverts commit 3aabae7e6ff80cccdf7fe10f73f5d93c0ab24980. autoUpgrade gets weird when network issues are involved, especially relevant for laptops... Yes I know I'm indecisive --- hosts/Legion/configuration.nix | 5 ++++- system/default.nix | 10 +--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/hosts/Legion/configuration.nix b/hosts/Legion/configuration.nix index ab709786..0eaaf012 100644 --- a/hosts/Legion/configuration.nix +++ b/hosts/Legion/configuration.nix @@ -4,7 +4,10 @@ { lib, ... }: { users.mutableUsers = false; system.autoUpgrade = { - allowReboot = lib.mkForce true; + enable = true; + flake = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main"; + dates = "02:30"; + allowReboot = true; rebootWindow = { lower = "02:00"; upper = "05:00"; diff --git a/system/default.nix b/system/default.nix index d7a21ede..39bff923 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,6 +1,4 @@ -{ pkgs, ... }: -let flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main"; -in { +{ pkgs, ... }: { networking = { networkmanager.enable = true; nameservers = [ "9.9.9.9" ]; @@ -50,10 +48,4 @@ in { LC_TIME = locale; }; }; - system.autoUpgrade = { - enable = true; - dates = "02:00"; - allowReboot = false; - flake = flakeURL; - }; }