rest of the split migration

config/base.nix

@@ -26,11 +26,11 @@
     backupFileExtension = "hbckup";
     useUserPackages = true;
     useGlobalPkgs = true;
+    users.jawz = import ./home-manager.nix;
     sharedModules = [ ../modules/home-manager.nix ];
     extraSpecialArgs = {
       inherit inputs outputs;
     };
-    users.jawz = import ./home-manager.nix;
   };
   time = {
     inherit (config.my) timeZone;

config/derek-home.nix

@@ -0,0 +1,3 @@
+_: {
+  home.stateVersion = "23.05";
+}

config/derek.nix

@@ -86,5 +86,4 @@ in
       "games"
     ];
   };
-  home-manager.users.bearded_dragonn.home.stateVersion = "23.05";
 }

config/home-manager.nix

@@ -29,7 +29,10 @@ let
   };
 in
 {
-  imports = lib.optionals (osConfig != null) [ ./jawz-home.nix ];
+  imports = lib.optionals (osConfig != null) [
+    ./jawz-home.nix
+    ./stylix-home.nix
+  ];
   home.stateVersion = "23.05";
   programs = {
     direnv = {

config/stylix-home.nix

@@ -0,0 +1,41 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  osConfig,
+  ...
+}:
+let
+  schemesFile = import ./schemes.nix {
+    inherit pkgs inputs;
+  };
+  scheme = schemesFile.schemes.paul;
+  cfg = osConfig.my.stylix;
+  gnomeEnabled = osConfig.services.desktopManager.gnome.enable;
+in
+{
+  gtk = lib.mkIf (!cfg.enable && gnomeEnabled) {
+    enable = true;
+    iconTheme = {
+      name = "Papirus-Light";
+      package = pkgs.papirus-icon-theme.override {
+        color = "yellow";
+      };
+    };
+  };
+  stylix = {
+    inherit (cfg) enable;
+    autoEnable = cfg.enable;
+    iconTheme = {
+      enable = true;
+      package = scheme.iconPackage;
+      light = "Papirus-Light";
+      dark = "Papirus-Dark";
+    };
+    targets.librewolf = {
+      firefoxGnomeTheme.enable = true;
+      profileNames = [ config.home.username ];
+    };
+  };
+}

config/stylix.nix

@@ -11,7 +11,6 @@ let
   };
   scheme = schemesFile.schemes.paul;
   cfg = config.my.stylix;
-  gnomeEnabled = config.services.desktopManager.gnome.enable;
 in
 {
   options.my.stylix = {
@@ -30,30 +29,5 @@ in
       targets.qt.platform = lib.mkForce "qtct";
     }
     // lib.optionalAttrs (scheme ? base16Scheme) { inherit (scheme) base16Scheme; };
-    home-manager.users = inputs.self.lib.mkHomeManagerUsers lib config.my.stylix.users (user: {
-      gtk = lib.mkIf (!cfg.enable && gnomeEnabled) {
-        enable = true;
-        iconTheme = {
-          name = "Papirus-Light";
-          package = pkgs.papirus-icon-theme.override {
-            color = "yellow";
-          };
-        };
-      };
-      stylix = {
-        inherit (cfg) enable;
-        autoEnable = cfg.enable;
-        iconTheme = {
-          enable = true;
-          package = scheme.iconPackage;
-          light = "Papirus-Light";
-          dark = "Papirus-Dark";
-        };
-        targets.librewolf = {
-          firefoxGnomeTheme.enable = true;
-          profileNames = [ user ];
-        };
-      };
-    });
   };
 }