diff --git a/homes/nathan/home-manager/default.nix b/homes/nathan/home-manager/default.nix
index 85f33ab..83cd8e4 100644
--- a/homes/nathan/home-manager/default.nix
+++ b/homes/nathan/home-manager/default.nix
@@ -39,7 +39,7 @@
             nh.enable = lib.mkDefault true;
 
             minimal = lib.mkDefault false;
-            hyprland.enable = lib.mkDefault (config.homeconfig.graphical && !config.homeconfig.standalone);
+            hyprland.enable = lib.mkDefault config.homeconfig.graphical;
             hyprlock.enable = lib.mkDefault config.homeconfig.hyprland.enable;
             wal.enable = lib.mkDefault config.homeconfig.graphical;
             hyprpanel.enable = lib.mkDefault config.homeconfig.hyprland.enable;
@@ -51,8 +51,6 @@
 
         home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
 
-        programs.home-manager.enable = config.homeconfig.standalone;
-
         home.stateVersion = "23.11";
 
         home.pointerCursor = lib.mkIf config.homeconfig.graphical {
@@ -76,15 +74,6 @@
             defaultSopsFormat = "yaml";
         };
 
-        nix = lib.mkIf config.homeconfig.standalone {
-            nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
-            settings = {
-                experimental-features = [ "nix-command" "flakes" ];
-                builders = "ssh://builder x86_64-linux,aarch64-linux /run/secrets/remoteBuildKey 1 1 nixos-test,benchmark,big-parallel,kvm - -";
-                builders-use-substituters = true;
-            };
-        };
-
         services.mpris-proxy.enable = true;
 
         programs.ssh = {
@@ -92,18 +81,23 @@
 
             matchBlocks = {
                 "builder" = {
-                    hostname = "blunkall.us";
+                    hostname = "esotericbytes.com";
                     user = "remote-builder";
                     identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
                     port = 2222;
                 };
                 
                 "remote" = {
-                    hostname = "blunkall.us";
+                    hostname = "esotericbytes.com";
                     user = "nathan";
                     identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519";
                     port = 2222;
                 };
+
+                "esotericbytes.com" = {
+                    hostname = "esotericbytes.com";
+                    port = 2222;
+                };
             };
         };
 
diff --git a/homes/nathan/home.nix b/homes/nathan/home.nix
index ef7f623..757dbc3 100644
--- a/homes/nathan/home.nix
+++ b/homes/nathan/home.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, inputs, ... }:
 
 {
 
@@ -6,6 +6,20 @@
         homeconfig = {
             graphical = lib.mkDefault false;
             minimal = lib.mkDefault false;
+
+            hyprland.enable = false;
         };
+
+
+        nix = {
+            nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+            settings = {
+                experimental-features = [ "nix-command" "flakes" ];
+                builders = "ssh://builder x86_64-linux,aarch64-linux /run/secrets/remoteBuildKey 1 1 nixos-test,benchmark,big-parallel,kvm - -";
+                builders-use-substituters = true;
+            };
+        };
+        
+        programs.home-manager.enable = true;
     };
  }