From ce7c6ec582e916dd8d025473fd6d39b1e7351c97 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Fri, 8 Dec 2023 06:26:53 +0000 Subject: [PATCH] Disable nix autoUpgrade for regular machines Only keep enabled for server where it makes sense --- hosts/Legion/configuration.nix | 9 ++++++--- system/default.nix | 10 +--------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/hosts/Legion/configuration.nix b/hosts/Legion/configuration.nix index a1a37c89..b92aa8dd 100644 --- a/hosts/Legion/configuration.nix +++ b/hosts/Legion/configuration.nix @@ -1,7 +1,7 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running `nixos-help`). -{ lib, ... }: +{ ... }: let # generate via openvpn --genkey --secret openvpn-laptop.key client-key = "/root/openvpn.key"; @@ -11,9 +11,12 @@ let in { 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 = "03:00"; + lower = "02:00"; upper = "05:00"; }; }; diff --git a/system/default.nix b/system/default.nix index 2c7998aa..5e8f3351 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,6 +1,4 @@ -{ config, lib, 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" ]; @@ -40,10 +38,4 @@ in { LC_TIME = locale; }; }; - system.autoUpgrade = { - enable = true; - dates = "02:00"; - allowReboot = false; - flake = flakeURL; - }; }