diff --git a/users/patriot/default.nix b/users/patriot/default.nix
index 00a4bf4..3d74efa 100644
--- a/users/patriot/default.nix
+++ b/users/patriot/default.nix
@@ -18,6 +18,8 @@ in
       "$6$spzqhAyJfhHy$iHgLBlhjGn1l8PnbjJdWTn1GPvcjMqYNKUzdCe/7IrX6sHNgETSr/Nfpdmq9FCXLhrAfwHOd/q/8SvfeIeNX4/";
   };
 
+  environment.systemPackages = [ pkgs.qt5.qtwayland ];
+
   xdg.portal = {
     enable = true;
     gtkUsePortal = true;
@@ -49,7 +51,7 @@ in
       enable = true;
       desktopManager = {
         plasma5.enable = false;
-        gnome.enable = false;
+        gnome.enable = true;
         xterm.enable = false;
       };
       displayManager = {
@@ -59,11 +61,11 @@ in
         };
         lightdm.enable = false;
         gdm = {
-          enable = false;
+          enable = true;
           wayland = true;
         };
         sddm.enable = false;
-        startx.enable = true;
+        startx.enable = false;
       };
     };
   };
@@ -291,9 +293,9 @@ in
         export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
         # Fix for some Java AWT applications (e.g. Android Studio),
         # use this if they aren't displayed properly:
-        export _JAVA_AWT_WM_NONREPARENTING=1
-        export QT_QPA_PLATFORMTHEME=qt5ct
-        export QT_PLATFORM_PLUGIN=qt5ct
+        # export _JAVA_AWT_WM_NONREPARENTING=1
+        # export QT_QPA_PLATFORMTHEME=qt5ct
+        # export QT_PLATFORM_PLUGIN=qt5ct
       '';
     in
     {
@@ -376,7 +378,7 @@ in
 
       wayland.windowManager = {
         sway = {
-          enable = true;
+          enable = false;
           extraSessionCommands = extraEnv;
           wrapperFeatures.gtk = true;
           config = {
@@ -458,10 +460,10 @@ in
         alacritty = {
           enable = true;
           settings = {
-            shell = {
-              program = "${pkgs.tmux}/bin/tmux";
-              args = [ "attach" ];
-            };
+            # shell = {
+            #   program = "${pkgs.tmux}/bin/tmux";
+            #   args = [ "attach" ];
+            # };
             font = {
               normal = { family = font; };
               size = fontSize;
@@ -470,7 +472,7 @@ in
           };
         };
         tmux = {
-          enable = true;
+          enable = false;
           newSession = true;
           secureSocket = true;
           baseIndex = 1;
@@ -579,12 +581,12 @@ in
           dotDir = ".config/zsh";
           history.path = ".local/share/zsh/history";
           envExtra = extraEnv;
-          loginExtra =
-            ''
-              if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
-                  exec sway
-              fi
-            '';
+          # loginExtra =
+          #   ''
+          #     if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
+          #         exec sway
+          #     fi
+          #   '';
           initExtra = ''
             export TERM=alacritty
 
@@ -616,7 +618,7 @@ in
             acc = "#${acColor}";
           in
           {
-            enable = true;
+            enable = false;
             colors = {
               window = {
                 background = bgc;
@@ -644,7 +646,7 @@ in
             swayEnabled = config.wayland.windowManager.sway.enable;
           in
           {
-            enable = swayEnabled || config.wayland.windowManager.hikari.enable;
+            enable = swayEnabled;
             settings = [{
               layer = "top";
               position = "top";