Move NixOS and home-manager stable to 22.05

home-manager/configs/castle.nix

@@ -1,6 +1,7 @@
 {
   home-manager.homes."dev@castle" = {
     system = "x86_64-linux";
+    home-manager = "mine";
     nixpkgs = "mine";
     homeDirectory = "/home/dev";
     username = "dev";

home-manager/default.nix

@@ -1,7 +1,7 @@
 { lib, hmFlakes, inputs, pkgs', config, ... }:
 let
   inherit (builtins) head tail mapAttrs attrValues;
-  inherit (lib) flatten optional mkOption mkOptionType;
+  inherit (lib) flatten optional mkOption mkDefault mkOptionType;
   inherit (lib.my) homeStateVersion mkOpt' commonOpts inlineModule';
 
   cfg = config.home-manager;
@@ -60,6 +60,10 @@ let
         };
       };
     };
+
+    config = {
+      nixpkgs = mkDefault config.home-manager;
+    };
   };
 in
 {

home-manager/modules/common.nix

@@ -26,12 +26,25 @@ in
         };
       };
     };
-
-    # Only present in >=22.05, so forward declare
-    nix.registry = dummyOption;
   };
   config = mkMerge [
-    (mkIf (versionAtLeast config.home.stateVersion "22.05") {
+    {
+      my = {
+        isStandalone = !(args ? osConfig);
+
+        shell = mkDefault "${config.programs.fish.package}/bin/fish";
+      };
+
+      home = {
+        file.".ssh/authorized_keys" = with config.my.ssh.authKeys;
+          mkIf (config.programs.ssh.enable && (literal != [ ] || files != [ ])) {
+            text = ''
+              ${concatStringsSep "\n" literal}
+              ${concatMapStrings (f: readFile f + "\n") files}
+            '';
+          };
+      };
+
       nix = {
         package = pkgs.nix;
         registry = {
@@ -48,21 +61,6 @@ in
           max-jobs = mkDefault "auto";
         };
       };
-    })
-    {
-      my = {
-        isStandalone = !(args ? osConfig);
-
-        shell = mkDefault "${config.programs.fish.package}/bin/fish";
-      };
-
-      home.file.".ssh/authorized_keys" = with config.my.ssh.authKeys;
-        mkIf (config.programs.ssh.enable && (literal != [ ] || files != [ ])) {
-          text = ''
-            ${concatStringsSep "\n" literal}
-            ${concatMapStrings (f: readFile f + "\n") files}
-          '';
-        };
 
       programs = {
         # Even when enabled this will only be actually installed in standalone mode