diff --git a/modules/nixos/graphical-interface/desktop-manager/addons/rofi/default.nix b/modules/nixos/graphical-interface/desktop-manager/addons/rofi/default.nix
index b5fc410..8c780ed 100644
--- a/modules/nixos/graphical-interface/desktop-manager/addons/rofi/default.nix
+++ b/modules/nixos/graphical-interface/desktop-manager/addons/rofi/default.nix
@@ -9,10 +9,15 @@
 let
   cfg = config.${namespace}.graphical-interface.desktop-manager.addons.rofi;
 
-  inherit (lib) mkIf mkEnableOption mkOption types;
+  inherit (lib)
+    mkIf
+    mkEnableOption
+    mkOption
+    types
+    ;
 in
 {
-    options.${namespace}.graphical-interface.desktop-manager.addons.rofi = {
+  options.${namespace}.graphical-interface.desktop-manager.addons.rofi = {
     enable = mkEnableOption "Rofi";
     package = mkOption {
       type = types.package;
diff --git a/modules/nixos/graphical-interface/desktop-manager/addons/waybar/default.nix b/modules/nixos/graphical-interface/desktop-manager/addons/waybar/default.nix
index eb4cad1..0ea8e7b 100644
--- a/modules/nixos/graphical-interface/desktop-manager/addons/waybar/default.nix
+++ b/modules/nixos/graphical-interface/desktop-manager/addons/waybar/default.nix
@@ -29,7 +29,6 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
 
-
     wyrdgard.home.file = {
       ".config/waybar/config".source = ./config;
       ".config/waybar/style.css".source = ./style.css;
diff --git a/modules/nixos/graphical-interface/desktop-manager/hyprland/default.nix b/modules/nixos/graphical-interface/desktop-manager/hyprland/default.nix
index 7743732..80a366b 100644
--- a/modules/nixos/graphical-interface/desktop-manager/hyprland/default.nix
+++ b/modules/nixos/graphical-interface/desktop-manager/hyprland/default.nix
@@ -46,36 +46,49 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-      polkit
+      polkit-kde-agent
 
       wl-clipboard
       wl-screenrec
       wlr-randr
       grimblast
-
-      rofi
+      xfce.thunar
+      dunst
 
       jq
       focus-1password
     ];
 
-    services.xserver = enabled;
+    programs = {
+      hyprland = {
+        enable = true;
+        package = hyprland-package;
+        portalPackage =
+          inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+      };
+    };
 
-    programs.hyprland = {
-      enable = true;
-      package = hyprland-package;
-      portalPackage =
-        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+    services = {
+      xserver = enabled;
+      greetd = {
+        enable = true;
+        settings = {
+          default_session = {
+            command = "${lib.getExe pkgs.greetd.tuigreet} --cmd Hyprland";
+            user = config.wyrdgard.user.name;
+          };
+        };
+      };
     };
 
     wyrdgard = {
       graphical-interface.desktop-manager.addons = {
         waybar = enabled;
         rofi = {
-        enable = true;
-        package = pkgs.rofi-wayland-unwrapped;
-        };
+          enable = true;
+          package = pkgs.rofi-wayland-unwrapped;
         };
+      };
 
       nix.extra-substituters.${cachix-url} = {
         key = cachix-key;
@@ -92,6 +105,9 @@ in
 
               exec-once = [
                 "waybar"
+                "dunst"
+                "systemctl --user start plasma-polkit-agent"
+
                 "[workspace 3 silent] steam"
                 "[workspace 2 silent] discord"
                 "[workspace 2 silent] noisetorch"
@@ -176,6 +192,9 @@ in
                   "$mod, P, pseudo,"
                   "$mod ALT, ,resizeactive,"
 
+                  "$mod CTRL, left, movecurrentworkspacetomonitor, l"
+                  "$mod CTRL, right, movecurrentworkspacetomonitor, r"
+
                   # move focus
                   "$mod, h, hy3:movefocus, l"
                   "$mod, j, hy3:movefocus, d"
diff --git a/modules/nixos/submodules/graphical-interface/default.nix b/modules/nixos/submodules/graphical-interface/default.nix
index b03ebcb..ac01313 100644
--- a/modules/nixos/submodules/graphical-interface/default.nix
+++ b/modules/nixos/submodules/graphical-interface/default.nix
@@ -17,11 +17,8 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [ xdg-utils ];
 
-    wyrdgard.graphical-interface = {
-      display-manager.sddm = enabled;
-      desktop-manager = {
-        kde = enabled;
+    wyrdgard.graphical-interface =
+      {
       };
-    };
   };
 }
diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix
index 3c79346..bf902a5 100644
--- a/systems/x86_64-linux/yggdrasil/default.nix
+++ b/systems/x86_64-linux/yggdrasil/default.nix
@@ -39,8 +39,8 @@ in
         ];
 
         exec-once = [
-          "hyprctl dispatch moveworkspacetomonitor 4 HDMI-A-1"
           "xrandr --output DP-2 --primary"
+          "hyprctl dispatch moveworkspacetomonitor 4 HDMI-A-1"
         ];
 
         workspace = [