diff --git a/hosts/apollo/default.nix b/hosts/apollo/default.nix
index 7f05f9a..053b185 100644
--- a/hosts/apollo/default.nix
+++ b/hosts/apollo/default.nix
@@ -9,4 +9,20 @@
   networking.hostName = "apollo";
   networking.hostId = "40ced703";
   networking.networkmanager.insertNameservers = [ "10.5.0.1" "1.1.1.1" ];
+
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+    xwayland.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    kitty
+  ];
+
+  programs.zsh.loginShellInit = ''
+    if [[ $(tty) == "/dev/tty1" ] && uwsm check may-start; then 
+      exec uwsm start hyprland-uwsm.desktop
+    fi
+  '';
 }
\ No newline at end of file
diff --git a/hosts/base.nix b/hosts/base.nix
index 1d15c54..4eaedcb 100644
--- a/hosts/base.nix
+++ b/hosts/base.nix
@@ -61,6 +61,9 @@
     variant = "";
   };
 
+  programs.zsh.enable = true;
+  users.defaultUserShell = pkgs.zsh;
+
   users.users.nyxerinys = {
     isNormalUser = true;
     description = "Nyx";