diff --git a/flake.lock b/flake.lock
index 0aa61c4..6cf4b9c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714981474,
-        "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=",
+        "lastModified": 1715077503,
+        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f",
+        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index fcf9fe1..61ac7dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,14 +16,10 @@
         specialArgs = {inherit inputs;};
         modules = [
           ./hosts/default/configuration.nix
-        ];
-      };
-      workmachine = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs;};
-        modules = [
-          ./hosts/workmachine/configuration.nix
+	  ./nixos_modules
         ];
       };
     };
+    homeManagerModules.default = ./homeManager_modules;
   };
 }
diff --git a/hosts/workmachine/configuration.nix b/hosts/default/configuration.nix
similarity index 100%
rename from hosts/workmachine/configuration.nix
rename to hosts/default/configuration.nix
diff --git a/hosts/workmachine/hardware-configuration.nix b/hosts/default/hardware-configuration.nix
similarity index 100%
rename from hosts/workmachine/hardware-configuration.nix
rename to hosts/default/hardware-configuration.nix
diff --git a/hosts/workmachine/home.nix b/hosts/default/home.nix
similarity index 98%
rename from hosts/workmachine/home.nix
rename to hosts/default/home.nix
index 2f0587a..06f9293 100644
--- a/hosts/workmachine/home.nix
+++ b/hosts/default/home.nix
@@ -20,7 +20,7 @@
   
     shellAliases = {
       ll = "ls -l";
-      update = "sudo nixos-rebuild switch --flake $(readlink -f /etc/nixos)#workmachine";
+      update = "sudo nixos-rebuild switch --flake $(readlink -f /etc/nixos)#default";
       nix-home = "nvim $HOME/nixos/hosts/workmachine/home.nix";
       nix-conf = "nvim $HOME/nixos/hosts/workmachine/configuration.nix";
     };
diff --git a/hosts/workmachine/scripts/wallpaper_changer.nix b/hosts/default/scripts/wallpaper_changer.nix
similarity index 100%
rename from hosts/workmachine/scripts/wallpaper_changer.nix
rename to hosts/default/scripts/wallpaper_changer.nix
diff --git a/hosts/workmachine/themes/sddm-sugar-candy.nix b/hosts/default/themes/sddm-sugar-candy.nix
similarity index 100%
rename from hosts/workmachine/themes/sddm-sugar-candy.nix
rename to hosts/default/themes/sddm-sugar-candy.nix