diff --git a/flake.nix b/flake.nix index d5043079..4ae65cd3 100644 --- a/flake.nix +++ b/flake.nix @@ -247,7 +247,7 @@ system = "x86_64-linux"; in systemConfig { inherit hostName user system; - systemModules = [ ./system/default.nix ./system/autoupgrade.nix ]; + systemModules = [ ./system/default.nix ]; serviceModules = [ ./services/adguardhome.nix ./services/caddy.nix @@ -280,10 +280,7 @@ hostName = "Scorch"; user = "elitherl"; system = "x86_64-linux"; - in systemConfig { - inherit hostName user system; - systemModules = default.systemModules ++ [ ./system/autoupgrade.nix ]; - }; + in systemConfig { inherit hostName user system; }; Vanguard = let hostName = "Vanguard"; @@ -291,8 +288,7 @@ system = "x86_64-linux"; in systemConfig { inherit hostName user system; - systemModules = default.systemModules - ++ [ ./system/autoupgrade.nix ./system/steam.nix ]; + systemModules = default.systemModules ++ [ ./system/steam.nix ]; homeModules = default.homeModules ++ [ ./home/games/default.nix ]; }; diff --git a/hosts/Legion/configuration.nix b/hosts/Legion/configuration.nix index f70f6455..71fa8add 100644 --- a/hosts/Legion/configuration.nix +++ b/hosts/Legion/configuration.nix @@ -1,9 +1,8 @@ -# 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`). { ... }: { users.mutableUsers = false; system.autoUpgrade = { + enable = true; + flake = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main"; dates = "02:30"; allowReboot = true; rebootWindow = { diff --git a/hosts/Ronin/configuration.nix b/hosts/Ronin/configuration.nix index 5fb9b4c6..a265850e 100644 --- a/hosts/Ronin/configuration.nix +++ b/hosts/Ronin/configuration.nix @@ -14,6 +14,4 @@ ''; systemPackages = with pkgs; [ openfortivpn samba nomachine-client ]; }; - - system.autoUpgrade.allowReboot = false; } diff --git a/hosts/Vanguard/configuration.nix b/hosts/Vanguard/configuration.nix index 1a4017b4..6619c7ca 100644 --- a/hosts/Vanguard/configuration.nix +++ b/hosts/Vanguard/configuration.nix @@ -1,5 +1,4 @@ { config, ... }: { - system.autoUpgrade.allowReboot = false; boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; boot.extraModprobeConfig = '' options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1 diff --git a/system/autoupgrade.nix b/system/autoupgrade.nix deleted file mode 100644 index 143ce826..00000000 --- a/system/autoupgrade.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: { - system.autoUpgrade = { - enable = true; - flake = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main"; - }; -}