diff --git a/modules/sec_auth/default.nix b/modules/sec_auth/default.nix
index 27bdd07..0007eb8 100644
--- a/modules/sec_auth/default.nix
+++ b/modules/sec_auth/default.nix
@@ -1,10 +1,12 @@
 {
   imports = [
+    ./login
+
     ./apparmor.nix
     ./firejail.nix
-    ./login-manager.nix
     ./ssh-client.nix
     #./ssh-server.nix
     ./sudo-rs.nix
+    ./uwsm.nix
   ];
 }
diff --git a/modules/sec_auth/login/default.nix b/modules/sec_auth/login/default.nix
new file mode 100644
index 0000000..00031fe
--- /dev/null
+++ b/modules/sec_auth/login/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./login-manager.nix
+    ./uwsm.nix
+  ];
+}
diff --git a/modules/sec_auth/login-manager.nix b/modules/sec_auth/login/login-manager.nix
similarity index 100%
rename from modules/sec_auth/login-manager.nix
rename to modules/sec_auth/login/login-manager.nix
diff --git a/modules/sec_auth/login/uwsm.nix b/modules/sec_auth/login/uwsm.nix
new file mode 100644
index 0000000..fa4da9f
--- /dev/null
+++ b/modules/sec_auth/login/uwsm.nix
@@ -0,0 +1,3 @@
+{
+  programs.uwsm.enable = true;
+}
diff --git a/modules/sec_auth/uwsm.nix b/modules/sec_auth/uwsm.nix
new file mode 100644
index 0000000..fa4da9f
--- /dev/null
+++ b/modules/sec_auth/uwsm.nix
@@ -0,0 +1,3 @@
+{
+  programs.uwsm.enable = true;
+}
diff --git a/modules/wm_and_de/hyprland.nix b/modules/wm_and_de/hyprland.nix
index 8482832..9e99b65 100644
--- a/modules/wm_and_de/hyprland.nix
+++ b/modules/wm_and_de/hyprland.nix
@@ -2,12 +2,6 @@
   #imports = [
   #  ./components/rofi.nix
   #];
-  # Enable the X11 windowing system.
-  # You can disable this if you're only using the Wayland session.
-  services.xserver.enable = false;
-
-  # force chromium and electron apps to use wayland
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   xdg = {
     portal = {
@@ -20,76 +14,76 @@
       ];
     };
   };
+
   # Enable the hyprland window manager with additions
   programs = {
     hyprland = {
       enable = true;
-      xwayland.enable = true;
-      systemd.setPath.enable = true;
       #package = pkgs.unstable.hyprland;
+
+      systemd.setPath.enable = true;
+      withUWSM = true;
+      xwayland.enable = true;
     };
     hyprlock = {
       enable = true;
       #package = pkgs.unstable.hyprlock;
     };
   };
-  services.hypridle = {
-    enable = true;
-    #package = pkgs.unstable.hypridle;
+
+  services = {
+    hypridle = {
+      enable = true;
+      #package = pkgs.unstable.hypridle;
+    };
+
+    # for mounting stuff, also needs a auth agent like lxqt.lxqt-policykit
+    gvfs.enable = true;
   };
 
-  # for mounting stuff, also needs a auth agent like lxqt.lxqt-policykit
-  services.gvfs.enable = true;
+  environment = {
+    pathsToLink = ["/share/foot"];
 
-  #qt = {
-  #  enable = true;
-  #  platformTheme = "qt5ct";
-  #  style = "kvantum";
-  #};
+    systemPackages = with pkgs; [
+      hyprsunset
+      hyprpolkitagent
+      hyprutils
+      # for tiling window manager
+      foot
+      foot.themes
+      wofi
+      wl-clipboard # for waydroid and maybe more
+      wlogout
+      pamixer
+      waybar
+      hyprpaper
+      #unstable.kanshi
+      shikane
+      dunst
 
-  environment.pathsToLink = ["/share/foot"];
+      # audio
+      mixxc
+      ncpamixer
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    hyprsunset
-    hyprpolkitagent
-    hyprutils
-    # for tiling window manager
-    foot
-    foot.themes
-    wofi
-    wl-clipboard # for waydroid and maybe more
-    wlogout
-    pamixer
-    waybar
-    hyprpaper
-    #unstable.kanshi
-    shikane
-    dunst
+      # for screenshot + annotation
+      grim
+      slurp
+      satty
+      flameshot
 
-    # audio
-    mixxc
-    ncpamixer
+      # theming
+      gruvbox-plus-icons
+      gruvbox-gtk-theme
+      kde-gruvbox
+      capitaine-cursors-themed
+      libsForQt5.qtstyleplugin-kvantum
+      kdePackages.qtstyleplugin-kvantum
 
-    # for screenshot + annotation
-    grim
-    slurp
-    satty
-    flameshot
+      # polkit auth agent
+      lxqt.lxqt-policykit
 
-    # theming
-    gruvbox-plus-icons
-    gruvbox-gtk-theme
-    kde-gruvbox
-    capitaine-cursors-themed
-    libsForQt5.qtstyleplugin-kvantum
-    kdePackages.qtstyleplugin-kvantum
-
-    # polkit auth agent
-    lxqt.lxqt-policykit
-
-    # file manager
-    nautilus
-  ];
+      # file manager
+      nautilus
+    ];
+  };
 }
diff --git a/system_profiles/components/no-x.nix b/system_profiles/components/no-x.nix
new file mode 100644
index 0000000..6ed1892
--- /dev/null
+++ b/system_profiles/components/no-x.nix
@@ -0,0 +1,9 @@
+{
+  # Enable the X11 windowing system.
+  # You can disable this if you're only using the Wayland session.
+  services.xserver.enable = false;
+
+  # force chromium and electron apps to use wayland
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+}
+
diff --git a/system_profiles/desktop.nix b/system_profiles/desktop.nix
index 9c27f35..afbcd25 100644
--- a/system_profiles/desktop.nix
+++ b/system_profiles/desktop.nix
@@ -2,6 +2,7 @@
   imports = [
     ./components/home-manager.nix
     ./components/nix-defaults.nix
+    ./components/no-x.nix
     #./components/nixpkgs-ng.nix
 
     ./importers/desktop.nix