Set autoUpgrade to "boot" by default, keep as "switch" for Legion

Add stateVersion variables to Legion, missed last time...

flake.lock

@@ -37,11 +37,11 @@
     "base16-foot": {
       "flake": false,
       "locked": {
-        "lastModified": 1727574105,
+        "lastModified": 1696725948,
-        "narHash": "sha256-ByMVgH0rZ1by2YIVJ47gE8/ZHWcG8yqsErQ4tKLbm7Q=",
+        "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
         "owner": "tinted-theming",
         "repo": "base16-foot",
-        "rev": "e558fe47e187093313f19fa6a9eea61940ffbd6b",
+        "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
         "type": "github"
       },
       "original": {
@@ -53,11 +53,11 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1725860795,
+        "lastModified": 1696727917,
-        "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=",
+        "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9",
+        "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
     "base16-kitty": {
       "flake": false,
       "locked": {
-        "lastModified": 1721117198,
+        "lastModified": 1665001328,
-        "narHash": "sha256-+vEXvEsar7w7wPVRmKx+rJKUTD5DBgLR7jfl0k7VhnE=",
+        "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
         "owner": "kdrag0n",
         "repo": "base16-kitty",
-        "rev": "0898f2677f3a583cc6a89bde29b2b05ac2041e0b",
+        "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
         "type": "github"
       },
       "original": {
@@ -85,11 +85,11 @@
     "base16-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1727571738,
+        "lastModified": 1696725902,
-        "narHash": "sha256-AOITVZMhqELOzL5Jw54NIX7R8gFbTJqrHEDuPwgGYDQ=",
+        "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
         "owner": "tinted-theming",
         "repo": "base16-tmux",
-        "rev": "44fbe9034653c83a8ae68941aaeeeeb7503cd1ae",
+        "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
         "type": "github"
       },
       "original": {
@@ -209,11 +209,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728263287,
+        "lastModified": 1728790083,
-        "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
+        "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
+        "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
         "type": "github"
       },
       "original": {
@@ -240,11 +240,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1728500571,
+        "lastModified": 1728909085,
-        "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
+        "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
+        "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
         "type": "github"
       },
       "original": {
@@ -264,11 +264,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727917089,
+        "lastModified": 1729098898,
-        "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=",
+        "narHash": "sha256-poRon0EwKWfOfttFk/8IiUPzCO/ahpNvtsSd9lizlHY=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb",
+        "rev": "508a077405fa700de0248e7f84bc4fefbd308dd9",
         "type": "github"
       },
       "original": {

system/Legion.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ username, ... }:
 {
   imports = [
     ./services/adguardhome.nix
@@ -17,6 +17,13 @@
     systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;
   };
+  home-manager.users.${username} = {
+    home.stateVersion = "23.05";
+  };
+  system = {
+    stateVersion = "23.05";
+    autoUpgrade.operation = "switch";
+  };
   users.mutableUsers = false;
   hardware.bluetooth.enable = true;
 }

system/Northstar.nix

@@ -1,4 +1,8 @@
-{ ... }:
+{ username, ... }:
 {
   imports = [ ./laptop.nix ];
+  home-manager.users.${username} = {
+    home.stateVersion = "23.05";
+  };
+  system.stateVersion = "23.05";
 }

system/Ronin.nix

@@ -3,6 +3,7 @@
   imports = [ ./laptop.nix ];
   home-manager.users.${username} = {
     imports = [ ./home/work.nix ];
+    home.stateVersion = "23.05";
   };
   boot.initrd = {
     secrets = {
@@ -13,6 +14,7 @@
       keyFile = "/crypto_keyfile.bin";
     };
   };
+  system.stateVersion = "23.05";
   environment = {
     etc."ppp/options".text = ''
       ipcp-accept-remote

system/Tone.nix

@@ -3,6 +3,7 @@
   imports = [ ./desktop.nix ];
   home-manager.users.${username} = {
     imports = [ ./home/work.nix ];
+    home.stateVersion = "23.05";
   };
   boot = {
     loader.efi.efiSysMountPoint = "/boot/efi";
@@ -16,6 +17,7 @@
       };
     };
   };
+  system.stateVersion = "23.05";
   environment = {
     etc."ppp/options".text = ''
       ipcp-accept-remote

system/Vanguard.nix

@@ -8,7 +8,9 @@
   imports = [ ./desktop.nix ];
   environment.sessionVariables.MANGOHUD = 1;
   home-manager.users.${username} = {
-    home.packages = with pkgs; [
+    home = {
+      stateVersion = "23.05";
+      packages = with pkgs; [
         krita
         kdenlive
         helvum
@@ -24,6 +26,7 @@
         cartridges
         prismlauncher
       ];
+    };
     programs.obs-studio = {
       enable = true;
       plugins = with pkgs.obs-studio-plugins; [
@@ -69,6 +72,7 @@
     };
     steam-hardware.enable = true;
   };
+  system.stateVersion = "23.05";
   programs = {
     gamemode.enable = true;
     steam = {

system/default.nix

@@ -29,7 +29,6 @@
         "flakes"
       ];
       auto-optimise-store = true;
-      download-buffer-size = "2G";
       substituters = [ "https://nix.xenia.me.uk" ];
       trusted-public-keys = [ "nix.xenia.me.uk:tlgwOaG5KMLjQUk2YaErS8mAG69ZCr3PaHXZYi+Y5eI=" ];
     };
@@ -80,23 +79,21 @@
       })
     ];
   };
-  system = {
+  system.autoUpgrade = {
-    stateVersion = "23.05";
-    autoUpgrade = {
     enable = true;
+    operation = lib.mkDefault "boot";
     persistent = true;
     allowReboot = false;
     flake = "git+${config.nix.registry.my-nixos.to.url}";
     dates = "02:00";
     randomizedDelaySec = "5min";
+    fixedRandomDelay = true;
     flags = [
-        "--accept-flake-config"
       "--option"
       "extra-binary-caches"
       "https://nix.xenia.me.uk"
     ];
   };
-  };
   systemd.services = lib.mkIf config.system.autoUpgrade.enable {
     nixos-upgrade.serviceConfig = {
       CPUQuota = "75%";
@@ -152,7 +149,6 @@
       imports = [ ./home/default.nix ];
       home = {
         inherit username;
-        stateVersion = "23.05";
         homeDirectory = "/home/${username}";
       };
     };