diff --git a/home-manager/features/linux-desktop.nix b/home-manager/features/linux-desktop.nix
index f2ecc42..ce63840 100644
--- a/home-manager/features/linux-desktop.nix
+++ b/home-manager/features/linux-desktop.nix
@@ -1,10 +1,11 @@
 { pkgs, ... }:
 {
   imports = [
-    ./sway.nix
     ./audio.nix
+    ./hyprland.nix
     ./nix.nix
     ./rofi/rofi.nix
+    ./sway.nix
     ../apps/element.nix
     ../apps/discord.nix
     ./terminal.nix
diff --git a/home-manager/features/sway.nix b/home-manager/features/sway.nix
index d876010..f107dc2 100644
--- a/home-manager/features/sway.nix
+++ b/home-manager/features/sway.nix
@@ -8,6 +8,7 @@
   imports = [
     ./swaync.nix
   ];
+
   home.packages = with pkgs; [
     hyprlock # lock screen
     #   swayidle # lock on idle
@@ -37,6 +38,10 @@
 
   wayland.windowManager.sway = {
     enable = true;
+    extraOptions = [
+      # Required for NVIDIA GPUs
+      "--unsupported-gpu"
+    ];
     checkConfig = true;
     systemd = {
       enable = true;
diff --git a/system/hosts/altair/configuration.nix b/system/hosts/altair/configuration.nix
index 01aa031..f23de92 100644
--- a/system/hosts/altair/configuration.nix
+++ b/system/hosts/altair/configuration.nix
@@ -42,15 +42,9 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  # Enable the X11 windowing system.
-  # You can disable this if you're only using the Wayland session.
-  services.xserver.enable = true;
-
-  services.displayManager.sddm = {
-    enable = true;
-
-    theme = "sddm-astronaut-theme";
-  };
+  # Enable Ozone Wayland support in chromium and electron apps.
+  # https://nixos.wiki/wiki/Wayland
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   # Unlock the default keyring on login to hyprland
   security.pam.services.hyprland.enableGnomeKeyring = true;
@@ -63,6 +57,20 @@
     '';
   };
 
+  # Enable the X11 windowing system and a display manager
+  services.xserver = {
+    enable = true;
+    displayManager.gdm = {
+      enable = true;
+      wayland = true;
+    };
+    # displayManager.sddm = {
+    #   enable = true;
+    #   wayland.enable = true;
+    # };
+  };
+  # services.displayManager.ly.enable = true;
+
   # Enable Hyprland so it shows up in the menu
   programs.hyprland = {
     enable = true;
@@ -70,6 +78,7 @@
     package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
     portalPackage =
       inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+    xwayland.enable = true;
   };
 
   # Configure keymap in X11
@@ -123,7 +132,6 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     vim
-    sddm-astronaut
   ];
 
   # Some programs need SUID wrappers, can be configured further or are