diff --git a/flake.nix b/flake.nix
index 8f9a89c6..57af8d79 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,8 +41,6 @@
         };
       };
     };
-    xfce-config = {pkgs, ...}: {
-    };
     xfce-bspwm-config = {pkgs, ...}: {
       environment.systemPackages = with pkgs; [
         nitrogen
@@ -82,84 +80,6 @@
         package = pkgs.i3lock-fancy;
       };
     };
-    hyprland-config = {pkgs, ...}: {
-      imports = [hyprland.nixosModules.default];
-      environment.systemPackages = with pkgs; [
-        gsettings-desktop-schemas
-        pavucontrol
-        pamixer
-        pulseaudio
-        pipewire
-        wireplumber
-        wl-clipboard
-        swayimg
-        hyprpaper
-        grim
-        slurp
-      ];
-      security.pam.services.swaylock = {};
-      programs = {
-        hyprland.enable = true;
-        thunar = {
-          enable = true;
-          plugins = with pkgs.xfce; [thunar-archive-plugin thunar-volman];
-        };
-      };
-      services = {
-        gvfs.enable = true; # Mount, trash, and other functionalities
-        tumbler.enable = true; # Thumbnail support for images
-        greetd = {
-          enable = true;
-          settings = rec {
-            initial_session.command = "Hyprland";
-            default_session = initial_session;
-          };
-        };
-      };
-    };
-    hyprland-home-config = {pkgs, ...}: {
-      imports = [
-        hyprland.homeManagerModules.default
-        ./home/desktop/hyprland.nix
-        ./home/gui
-      ];
-      xdg.configFile."hypr/hyprpaper.conf".text = ''
-        preload = ${wallpapers.outputs.default}
-        wallpaper = ,${wallpapers.outputs.default}
-      '';
-    };
-    gamescope-config = {...}: {
-      services.xserver = {
-        enable = true;
-        layout = "gb";
-        xkbVariant = "";
-      };
-      hardware.steam-hardware.enable = true;
-      programs = {
-        xwayland.enable = true;
-        gamescope = {
-          enable = true;
-          capSysNice = true;
-        };
-        steam = {
-          enable = true;
-          remotePlay.openFirewall = true;
-          gamescopeSession.enable = true;
-        };
-      };
-      services.greetd = {
-        enable = true;
-        settings = rec {
-          initial_session.command = "steam-gamescope";
-          default_session = initial_session;
-        };
-      };
-    };
-    waybar-experimental-overlay = final: prev: {
-      waybar = prev.waybar.overrideAttrs (old: {
-        mesonFlags = old.mesonFlags ++ ["-Dexperimental=true"];
-      });
-    };
   in {
     nixosConfigurations = {
       Legion = nixpkgs.lib.nixosSystem {
@@ -191,13 +111,31 @@
         };
         modules = [
           home-config
-          gamescope-config
+          xfce-bspwm-config
           ./hosts/Vanguard
           ./services/sshd
           ./services/syncthing/Vanguard.nix
           ({pkgs, ...}: {
+            service.xserver.displayManager.autologin.user = "xenia";
+            hardware.steam-hardware.enable = true;
+            programs = {
+              xwayland.enable = true;
+              gamescope = {
+                enable = true;
+                capSysNice = true;
+              };
+              steam = {
+                enable = true;
+                remotePlay.openFirewall = true;
+                gamescopeSession.enable = true;
+              };
+            };
             home-manager.users.xenia = {
-              imports = [./home/personal.nix];
+              imports = [
+                ./home/personal.nix
+                ./home/desktop/bspwm.nix
+                ./home/gui
+              ];
               home = {
                 username = "xenia";
                 homeDirectory = "/home/xenia";
@@ -220,6 +158,7 @@
           ./hosts/Ronin
           ./services/syncthing/Ronin.nix
           ({pkgs, ...}: {
+            service.xserver.displayManager.autologin.user = "elitherl";
             home-manager.users.elitherl = {
               imports = [
                 ./home/work.nix