diff --git a/flake.nix b/flake.nix
index b0f4b19..7f4775e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,6 +41,17 @@
     overlays = [
       nur.overlay
     ];
+    home-manager-config = toplevel: [
+      home-manager.nixosModules.home-manager
+      {
+        home-manager.useGlobalPkgs = true;
+        home-manager.extraSpecialArgs = {inherit inputs;};
+        home-manager.users.tacocat = {
+          imports = [toplevel];
+          _module.args.theme = import ./modules/themes;
+        };
+      }
+    ];
   in {
     # desktop
     nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem {
@@ -59,22 +70,13 @@
     nixosConfigurations."JWST" = nixpkgs.lib.nixosSystem {
       inherit system;
       specialArgs = {inherit inputs;};
-      modules = [
-        ./hosts/JWST/configuration.nix
-        nixos-hardware.nixosModules.dell-xps-15-9520
-        {nixpkgs.overlays = overlays;}
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.extraSpecialArgs = {inherit inputs;};
-          home-manager.users."tacocat" = {
-            imports = [
-              ./users/tacocat/home.nix
-            ];
-            _module.args.theme = import ./modules/themes;
-          };
-        }
-      ];
+      modules =
+        [
+          ./hosts/JWST/configuration.nix
+          nixos-hardware.nixosModules.dell-xps-15-9520
+          {nixpkgs.overlays = overlays;}
+        ]
+        ++ home-manager-config ./users/tacocat/home.nix;
     };
 
     formatter.${system} = pkgs.alejandra;
diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix
index 0d00f2a..631fdad 100644
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@@ -2,7 +2,7 @@
   home = {
     username = "tacocat";
     homeDirectory = "/home/tacocat";
-    stateVersion = "23.11";
+    stateVersion = "24.05";
     sessionVariables = {
       EDITOR = "hx";
       BAT_THEME = "ansi";