diff --git a/configuration/laptop/configuration.nix b/configuration/laptop/configuration.nix
index f0426b0..80fee2d 100644
--- a/configuration/laptop/configuration.nix
+++ b/configuration/laptop/configuration.nix
@@ -9,6 +9,7 @@
     ../modules/audio.nix
     ../modules/printing.nix
     ../modules/programs.nix
+    ../modules/sddm.nix
   ];
 
   nix.settings.experimental-features = ["nix-command" "flakes"];
diff --git a/configuration/laptop/sddm-theme.nix b/configuration/laptop/sddm-theme.nix
deleted file mode 100644
index ddb44b3..0000000
--- a/configuration/laptop/sddm-theme.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{pkgs}:
-pkgs.stdenv.mkDerivation {
-  name = "sddm-theme";
-  src = pkgs.fetchFromGitHub {
-    owner = "MarianArlt";
-    repo = "sddm-sugar-dark";
-    rev = "ceb2c455663429be03ba62d9f898c571650ef7fe";
-    sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy";
-  };
-
-  installPhase = ''
-    mkdir -p $out
-    cp -R ./* $out/
-  '';
-}
diff --git a/configuration/main/configuration.nix b/configuration/main/configuration.nix
index 163f344..9fac88c 100644
--- a/configuration/main/configuration.nix
+++ b/configuration/main/configuration.nix
@@ -12,6 +12,7 @@
     ../modules/audio.nix
     ../modules/printing.nix
     ../modules/programs.nix
+    ../modules/sddm.nix
   ];
 
   nix.settings.experimental-features = ["nix-command" "flakes"];
diff --git a/configuration/main/sddm-theme.nix b/configuration/main/sddm-theme.nix
deleted file mode 100644
index ddb44b3..0000000
--- a/configuration/main/sddm-theme.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{pkgs}:
-pkgs.stdenv.mkDerivation {
-  name = "sddm-theme";
-  src = pkgs.fetchFromGitHub {
-    owner = "MarianArlt";
-    repo = "sddm-sugar-dark";
-    rev = "ceb2c455663429be03ba62d9f898c571650ef7fe";
-    sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy";
-  };
-
-  installPhase = ''
-    mkdir -p $out
-    cp -R ./* $out/
-  '';
-}
diff --git a/configuration/modules/sddm.nix b/configuration/modules/sddm.nix
new file mode 100644
index 0000000..9273ca8
--- /dev/null
+++ b/configuration/modules/sddm.nix
@@ -0,0 +1,23 @@
+{pkgs, ...}: let
+  sddm-astronaut = pkgs.sddm-astronaut.override {
+    embeddedTheme = "hyprland_kath";
+  };
+in {
+  environment.systemPackages = [sddm-astronaut];
+
+  services.displayManager = {
+    sddm = {
+      package = pkgs.kdePackages.sddm;
+      extraPackages = with pkgs.kdePackages; [
+        qtsvg
+        qtmultimedia
+        qtvirtualkeyboard
+      ];
+      enable = true;
+      wayland.enable = false;
+      autoNumlock = true;
+      enableHidpi = false;
+      theme = "sddm-astronaut-theme";
+    };
+  };
+}
diff --git a/flake.lock b/flake.lock
index 5c7c8ef..b5d4631 100644
--- a/flake.lock
+++ b/flake.lock
@@ -266,6 +266,26 @@
         "type": "github"
       }
     },
+    "hexecute": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762448830,
+        "narHash": "sha256-UrtHmFnU0YtGbkc31SHiTqWLDTBZp9UOfiK4CQaNcmI=",
+        "owner": "ThatOtherAndrew",
+        "repo": "Hexecute",
+        "rev": "00af24d8fc27816e61204db38f744fc2e790810d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ThatOtherAndrew",
+        "repo": "Hexecute",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -674,6 +694,7 @@
     "root": {
       "inputs": {
         "dolphin-overlay": "dolphin-overlay",
+        "hexecute": "hexecute",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs",