nixos: home: import common modules

modules/common/default.nix

@@ -3,9 +3,9 @@
 { lib, type ? null, ... }:
 let
   allowedTypes = [
-    "nixos"
-    "home"
     "darwin"
+    "home"
+    "nixos"
   ];
 
   allowedTypesString = lib.concatStringSep ", " (builtins.map lib.escapeNixString allowedTypes);

modules/nixos/home/default.nix

@@ -14,7 +14,12 @@ in
   config = lib.mkIf cfg.enable {
     home-manager = {
       # Not a fan of out-of-directory imports, but this is a good exception
-      users.${config.my.user.name} = import "${inputs.self}/modules/home";
+      users.${config.my.user.name} = {
+        imports = [
+          "${inputs.self}/modules/common"
+          "${inputs.self}/modules/home"
+        ];
+      };
 
       # Nix Flakes compatibility
       useGlobalPkgs = true;
@@ -23,6 +28,8 @@ in
       # Forward inputs to home-manager configuration
       extraSpecialArgs = {
         inherit inputs;
+        # For consumption by common modules
+        type = "home";
       };
     };
   };