diff --git a/flake.nix b/flake.nix
index ba66445..3ea84d2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,7 +71,12 @@
       in
         nixpkgs.lib.nixosSystem {
           inherit system;
-          specialArgs = attrs // {inherit fn;};
+          specialArgs =
+            attrs
+            // {
+              inherit system;
+              inherit fn;
+            };
           modules =
             [
               (toString ./options/machine.nix)
diff --git a/services/desktop/hyprland.nix b/services/desktop/hyprland.nix
index 8016f89..ee7171b 100644
--- a/services/desktop/hyprland.nix
+++ b/services/desktop/hyprland.nix
@@ -9,22 +9,38 @@
 }:
 with lib;
   mkIf (elem "desktop::hyprland" config.machine.services) {
-    programs.hyprland = {
+
+    programs = {
+      dconf.enable = true;
+      hyprland = {
+        enable = true;
+        package = hyprland.packages."${system}".hyprland;
+        xwayland.enable = false;
+      };
+    };
+    services.xserver = {
       enable = true;
-      package = hyprland.packages."${system}".hyprland;
-      xwayland.enable = false;
+      displayManager.sddm = {
+        enable = true;
+        autoNumlock = true;
+        wayland.enable = true;
+      };
     };
     environment.systemPackages =
       [
         hy3.packages."${system}".hy3
       ]
-      ++ (with pkgs; [
+      ++
+      (with pkgs; [
         kanagawa
         eww-wayland
         rofi-wayland
         hyprpicker
         waybar
         swaybg
+        gtk3
+        gnome.adwaita-icon-theme
+        gsettings-desktop-schemas
       ]);
 
     # TODO: Refactor