diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index d9ad5ce..bf17f3f 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -15,19 +15,9 @@ in
 
       services.displayManager = {
         enable = true;
-        # sessionPackages = [ pkgs.hyprland ];
         sddm = {
           enable = lib.mkDefault true;
           wayland.enable = lib.mkDefault true;
-          theme = "sddm-astronaut-theme";
-          package = pkgs.kdePackages.sddm;
-          extraPackages = [
-            (pkgs.sddm-astronaut.override { embeddedTheme = "purple_leaves"; })
-          ] ++ (with pkgs.kdePackages; [
-            qtsvg
-            qtvirtualkeyboard
-            qtmultimedia
-          ]);
         };
       };
 
@@ -49,8 +39,6 @@ in
 
       programs.waybar.enable = true;
 
-
-
       programs.hyprland = {
         enable = true;
         withUWSM = true;
@@ -92,14 +80,35 @@ in
         wdisplays
         xorg.xlsclients
         wl-clipboard
-
-        # sddm Theme
-        (pkgs.sddm-astronaut.override { embeddedTheme = "purple_leaves"; })
       ];
 
       home-manager.sharedModules = [
         ./home/hyprland.nix
       ];
     }
+
+    # SDDM Theme
+    (
+      let sddmPkg = (pkgs.sddm-astronaut.override { embeddedTheme = "purple_leaves"; });
+      in {
+        services.displayManager = {
+          enable = lib.mkDefault true;
+          sddm = {
+            enable = lib.mkDefault true;
+            wayland.enable = lib.mkDefault true;
+            theme = "sddm-astronaut-theme";
+            package = pkgs.kdePackages.sddm;
+            extraPackages = with pkgs; [
+              sddmPkg
+              kdePackages.qtsvg
+              kdePackages.qtvirtualkeyboard
+              kdePackages.qtmultimedia
+            ];
+          };
+        };
+
+        environment.systemPackages = [ sddmPkg ];
+      }
+    )
   ]);
 }