Move NixOS and home-manager stable to 22.05

nixos/modules/build.nix

@@ -6,16 +6,12 @@ let
   cfg = config.my.build;
 
   asDevVM = extendModules {
-    # TODO: Hack because this is kinda broken on 21.11 (https://github.com/NixOS/nixpkgs/issues/148343)
-    specialArgs = { inherit baseModules; };
     modules = [
       "${modulesPath}/virtualisation/qemu-vm.nix"
       { my.build.isDevVM = true; }
     ];
   };
   asISO = extendModules {
-    # TODO: see previous
-    specialArgs = { inherit baseModules; };
     modules = lib.flatten [
       "${modulesPath}/installer/cd-dvd/iso-image.nix"
       (lib.optional config.my.build.allHardware { imports = [ "${modulesPath}/profiles/all-hardware.nix" ]; })
@@ -32,8 +28,6 @@ let
     ];
   };
   asContainer = extendModules {
-    # TODO: see previous
-    specialArgs = { inherit baseModules; };
     modules = [
       {
         boot.isContainer = true;

nixos/modules/common.nix

@@ -25,7 +25,7 @@ in
   config = mkMerge [
     {
       system = {
-        stateVersion = "21.11";
+        stateVersion = "22.05";
         configurationRevision = with inputs; mkIf (self ? rev) self.rev;
       };
 
@@ -48,12 +48,10 @@ in
 
       nix = {
         package = pkgs'.mine.nix;
-        # TODO: This has been renamed to nix.settings.trusted-users in 22.05
-        trustedUsers = [ "@wheel" ];
-        extraOptions =
-          ''
-            experimental-features = nix-command flakes ca-derivations
-          '';
+        settings = {
+          trusted-users = [ "@wheel" ];
+          experimental-features = [ "nix-command" "flakes" "ca-derivations" ];
+        };
       };
       nixpkgs = {
         overlays = [

nixos/modules/tmproot.nix

@@ -220,6 +220,9 @@ in
         my.tmproot.persistence.config.files =
           concatMap (k: [ k.path "${k.path}.pub" ]) config.services.openssh.hostKeys;
       })
+      (mkIf config.services.logrotate.enable {
+        my.tmproot.persistence.config.files = [ "/var/lib/logrotate.status" ];
+      })
       (mkIf config.my.build.isDevVM {
         fileSystems = mkVMOverride {
           # Hijack the "root" device for persistence in the VM