From 3aabae7e6ff80cccdf7fe10f73f5d93c0ab24980 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Mon, 11 Dec 2023 11:18:00 +0000 Subject: [PATCH] Revert "Disable nix autoUpgrade for regular machines" This reverts commit ce7c6ec582e916dd8d025473fd6d39b1e7351c97. --- hosts/Legion/configuration.nix | 7 ++----- system/default.nix | 10 +++++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hosts/Legion/configuration.nix b/hosts/Legion/configuration.nix index b92aa8dd..7f78e921 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,10 +11,7 @@ let in { users.mutableUsers = false; system.autoUpgrade = { - enable = true; - flake = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main"; - dates = "02:30"; - allowReboot = true; + allowReboot = lib.mkForce true; rebootWindow = { lower = "02:00"; upper = "05:00"; diff --git a/system/default.nix b/system/default.nix index 5e8f3351..2c7998aa 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,4 +1,6 @@ -{ pkgs, ... }: { +{ config, lib, pkgs, ... }: +let flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main"; +in { networking = { networkmanager.enable = true; nameservers = [ "9.9.9.9" ]; @@ -38,4 +40,10 @@ LC_TIME = locale; }; }; + system.autoUpgrade = { + enable = true; + dates = "02:00"; + allowReboot = false; + flake = flakeURL; + }; }