diff --git a/desktop/awesome.nix b/desktop/awesome.nix
deleted file mode 100644
index aabfb4fb..00000000
--- a/desktop/awesome.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{...}: {
-  imports = [./xfce-base.nix];
-  services = {
-    xserver = {
-      desktopManager.xfce = {
-        enableXfwm = false;
-        noDesktop = true;
-      };
-      windowManager.awesome.enable = true;
-    };
-  };
-}
diff --git a/desktop/bspwm.nix b/desktop/bspwm.nix
deleted file mode 100644
index 9dedd248..00000000
--- a/desktop/bspwm.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{...}: {
-  imports = [./xfce-base.nix];
-  services = {
-    xserver = {
-      desktopManager.xfce = {
-        enableXfwm = false;
-        noDesktop = true;
-      };
-      windowManager.bspwm.enable = true;
-    };
-  };
-}
diff --git a/desktop/plasma.nix b/desktop/plasma.nix
deleted file mode 100644
index 805f0d33..00000000
--- a/desktop/plasma.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  imports = [./sddm.nix];
-  services.xserver.desktopManager.plasma5.enable = true;
-  programs.kdeconnect.enable = true;
-  environment.systemPackages = with pkgs; [
-    libsForQt5.lightly
-    libsForQt5.kwindowsystem
-    libsForQt5.ktorrent
-    libsForQt5.krdc
-  ];
-}
diff --git a/desktop/qtile.nix b/desktop/qtile.nix
deleted file mode 100644
index 7d9b5226..00000000
--- a/desktop/qtile.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{...}: {
-  imports = [./xfce-base.nix];
-  services = {
-    xserver = {
-      desktopManager.xfce = {
-        enableXfwm = false;
-        noDesktop = true;
-      };
-      windowManager.qtile = {
-        enable = true;
-        extraPackages = ps: with ps; [qtile-extras];
-      };
-    };
-  };
-}
diff --git a/desktop/sddm.nix b/desktop/sddm.nix
deleted file mode 100644
index 95293e2f..00000000
--- a/desktop/sddm.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{pkgs, ...}: let
-  sddm-catppuccin-macchiato = pkgs.callPackage ./pkgs/sddm-catppuccin-macchiato {};
-in {
-  imports = [./xserver.nix];
-  environment.systemPackages = [sddm-catppuccin-macchiato];
-  services.xserver.displayManager.sddm = {
-    enable = true;
-    theme = "catppuccin-macchiato";
-    settings = {General = {InputMethod = "";};};
-  };
-}
diff --git a/desktop/xfce-base.nix b/desktop/xfce-base.nix
deleted file mode 100644
index e02980f7..00000000
--- a/desktop/xfce-base.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{pkgs, ...}: {
-  imports = [./sddm.nix];
-  environment.systemPackages = with pkgs; [
-    gsettings-desktop-schemas
-    pavucontrol
-    pamixer
-    pulseaudio
-    flameshot
-  ];
-  programs.thunar = {
-    enable = true;
-    plugins = with pkgs.xfce; [
-      thunar-archive-plugin
-      thunar-volman
-    ];
-  };
-  services = {
-    xserver = {
-      desktopManager = {
-        xterm.enable = false;
-        xfce.enable = true;
-      };
-    };
-    blueman.enable = true;
-    gvfs.enable = true;
-    tumbler.enable = true;
-  };
-}
diff --git a/desktop/xserver.nix b/desktop/xserver.nix
deleted file mode 100644
index fbf1f12f..00000000
--- a/desktop/xserver.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{...}: {
-  services.xserver = {
-    enable = true;
-    layout = "gb";
-    xkbVariant = "";
-  };
-}
diff --git a/flake.nix b/flake.nix
index 3b9d47d7..d6693da9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,24 +93,23 @@
         pkgs = import nixpkgs {
           system = "x86_64-linux";
           config.allowUnfree = true;
-          overlays = [neovim-nightly-overlay.overlay];
+          overlays = [
+            waybar-experimental-overlay
+            neovim-nightly-overlay.overlay
+          ];
         };
         modules = [
           home-manager-config
+          services
+          hyprland.nixosModules.default
           ./hosts/Vanguard
-          ./desktop/bspwm.nix
-          ./desktop/awesome.nix
-          ./desktop/qtile.nix
           ./services/sshd
           ./services/syncthing/Vanguard.nix
           ({pkgs, ...}: {
-            services.xserver.displayManager = {
-              autoLogin.user = "xenia";
-              defaultSession = "xfce+bspwm";
-            };
             hardware.steam-hardware.enable = true;
             programs = {
               xwayland.enable = true;
+              hyprland.enable = true;
               gamescope = {
                 enable = true;
                 capSysNice = true;
@@ -123,9 +122,10 @@
             };
             home-manager.users.xenia = {
               imports = [
+                hyprland.homeManagerModules.default
                 ./home/personal.nix
-                ./home/desktop/bspwm.nix
-                ./home/desktop/awesome
+                ./home/desktop/hyprland.nix
+                ./home/desktop/waybar/main.nix
                 ./home/gui
               ];
               home = {
@@ -134,8 +134,12 @@
                 stateVersion = "22.11";
               };
               programs.neovim.package = pkgs.neovim-nightly;
-              xsession.windowManager.bspwm.extraConfig = ''
-                ${pkgs.feh}/bin/feh --no-fehbg --bg-fill ${wallpapers.outputs.default}
+              xdg.configFile."hypr/hyprpaper.conf".text = ''
+                preload = ${wallpapers.outputs.default}
+                wallpaper = ,${wallpapers.outputs.default}
+              '';
+              xdg.configFile."hypr/display.conf".text = ''
+                monitor=,highrr,auto,1
               '';
             };
           })
@@ -184,9 +188,9 @@
                 wallpaper = ,${wallpapers.outputs.default}
               '';
               xdg.configFile."hypr/display.conf".text = ''
-                monitor=desc:Iiyama North America PLB2403WS 0574281251316,1920x1200,0x185,1
-                monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,1920x1080,1920x0,1,transform,1
-                monitor=eDP-1,1920x1080,640x1385,1.5
+                monitor=desc:Iiyama North America PLB2403WS 0574281251316,1920x1200@60,0x185,1
+                monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,1920x1080@60,1920x0,1,transform,1
+                monitor=eDP-1,1920x1080@60,640x1385,1.5
                 monitor=,preferred,auto,auto
               '';
             };
diff --git a/desktop/pkgs/sddm-catppuccin-macchiato/default.nix b/pkgs/sddm-catppuccin-macchiato/default.nix
similarity index 100%
rename from desktop/pkgs/sddm-catppuccin-macchiato/default.nix
rename to pkgs/sddm-catppuccin-macchiato/default.nix
diff --git a/wm/default.nix b/wm/default.nix
deleted file mode 100644
index e0fefa3f..00000000
--- a/wm/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{pkgs, ...}: {
-  services.blueman.enable = true;
-  environment.systemPackages = with pkgs; [
-    gsettings-desktop-schemas
-    pavucontrol
-    pamixer
-    pulseaudio
-    grim
-    slurp
-  ];
-  security.pam.services.swaylock = {};
-  programs.thunar = {
-    enable = true;
-    plugins = with pkgs.xfce; [
-      thunar-archive-plugin
-      thunar-volman
-    ];
-  };
-  services.gvfs.enable = true; # Mount, trash, and other functionalities
-  services.tumbler.enable = true; # Thumbnail support for images
-}
diff --git a/wm/hyprland.nix b/wm/hyprland.nix
deleted file mode 100644
index c24eca31..00000000
--- a/wm/hyprland.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{...}: {
-  imports = [./default.nix];
-  nixpkgs.overlays = [
-    (final: prev: {
-      waybar = prev.waybar.overrideAttrs (oldAttrs: {
-        mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
-      });
-    })
-  ];
-  programs.hyprland = {
-    enable = true;
-    xwayland = {
-      enable = true;
-      hidpi = true;
-    };
-  };
-}
diff --git a/wm/sway.nix b/wm/sway.nix
deleted file mode 100644
index 88431827..00000000
--- a/wm/sway.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{pkgs, ...}: let
-  # bash script to let dbus know about important env variables and
-  # propogate them to relevent services run at the end of sway config
-  # see
-  # https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist
-  dbus-sway-environment = pkgs.writeTextFile {
-    name = "dbus-sway-environment";
-    destination = "/bin/dbus-sway-environment";
-    executable = true;
-
-    text = ''
-      dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
-      systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
-      systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
-    '';
-  };
-in {
-  imports = [./default.nix];
-  environment.systemPackages = [dbus-sway-environment];
-  xdg.portal = {
-    enable = true;
-    wlr.enable = true;
-    extraPortals = [pkgs.xdg-desktop-portal-gtk];
-  };
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-  };
-}