diff --git a/enviroments/common/default.nix b/enviroments/common/default.nix
index 25c221a..a1dbdb0 100644
--- a/enviroments/common/default.nix
+++ b/enviroments/common/default.nix
@@ -14,9 +14,6 @@
   # Enable networking
   networking.networkmanager.enable = true;
 
-  # Set your time zone.
-  # time.timeZone = "America/Chicago";
-
   i18n.defaultLocale = "en_US.UTF-8";
 
   i18n.extraLocaleSettings = {
diff --git a/enviroments/server/default.nix b/enviroments/server/default.nix
index 9466c42..3d20a17 100644
--- a/enviroments/server/default.nix
+++ b/enviroments/server/default.nix
@@ -107,7 +107,7 @@
               "${config.sops.secrets."services/pi-hole".path}:${passwordFileLocation}"
             ];
             environment = {
-              TZ = config.time.timeZone;
+              TZ = "America/Chicago";
               WEBPASSWORD_FILE = passwordFileLocation;
               PIHOLE_UID = toString config.users.users.pihole.uid;
               PIHOLE_GID = toString config.users.groups.pihole.gid;
diff --git a/flake.nix b/flake.nix
index 4f551e2..7567deb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,23 +69,27 @@
       horizon = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs;};
         modules = [
-          ./hosts/horizon/configuration.nix
-          nixos-hardware.nixosModules.framework-11th-gen-intel
-          home-manager.nixosModules.home-manager
-          {
+          home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.backupFileExtension = "backup";
             home-manager.extraSpecialArgs = { inherit inputs; };
           }
+          ./hosts/horizon/configuration.nix
+          nixos-hardware.nixosModules.framework-11th-gen-intel
         ];
       };
       # Leyla Desktop
       twilight = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs;};
         modules = [
+          home-manager.nixosModules.home-manager {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.backupFileExtension = "backup";
+            home-manager.extraSpecialArgs = { inherit inputs; };
+          }
           ./hosts/twilight/configuration.nix
-          home-manager.nixosModules.default
         ];
       };
       # NAS Service
@@ -93,6 +97,12 @@
         specialArgs = {inherit inputs;};
         modules = [
           disko.nixosModules.disko
+          home-manager.nixosModules.home-manager {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.backupFileExtension = "backup";
+            home-manager.extraSpecialArgs = { inherit inputs; };
+          }
           ./hosts/defiant/disko-config.nix
           ./hosts/defiant/configuration.nix
         ];
diff --git a/hosts/defiant/configuration.nix b/hosts/defiant/configuration.nix
index 9288d36..2faa378 100644
--- a/hosts/defiant/configuration.nix
+++ b/hosts/defiant/configuration.nix
@@ -14,6 +14,10 @@
     ../../enviroments/server
   ];
 
+
+  home-manager.users.leyla.config = {
+    isThinUser = true;
+  };
   users.leyla.isThinUser = true;
 
   boot.loader.grub = {
diff --git a/hosts/twilight/configuration.nix b/hosts/twilight/configuration.nix
index 5c27001..972fd72 100644
--- a/hosts/twilight/configuration.nix
+++ b/hosts/twilight/configuration.nix
@@ -14,11 +14,13 @@
     ../../enviroments/client
   ];
 
+  home-manager.users.leyla.config = {
+    isFullUser = true;
+    hasGPU = true;
+  };
+
   users = {
-    leyla = {
-      isFullUser = true;
-      hasGPU = true;
-    };
+    leyla.isFullUser = true;
     ester.isFullUser = true;
     eve.isFullUser = true;
   };