diff --git a/modules/linux/hyprland.nix b/modules/linux/hyprland.nix
index 05c14ca..8fb2a91 100644
--- a/modules/linux/hyprland.nix
+++ b/modules/linux/hyprland.nix
@@ -5,20 +5,25 @@ in with lib; {
     # Turn on GDM for login
     services.xserver = {
       enable = true;
-      autorun = true;
-      displayManager = {
-        sddm = {
-          enable = true;
-          settings = {
-            Wayland = { CompositorCommand = "kwin_wayland --no-lockscreen"; };
-          };
-          theme = "sugar-dark";
-        };
-        defaultSession = "hyprland";
-      };
+      autorun = false;
       # Enable plasma for the applications
       desktopManager.plasma5.enable = true;
     };
+    # Greetd for login
+    programs.regreet = {
+      enable = true;
+      settings = { GTK = { font_name = "Roboto 16"; }; };
+      package = pkgs.greetd.regreet.overrideAttrs (old: {
+        preBuild = ''
+          export SESSION_DIRS=/run/current-system/sw/share/xsessions:/run/current-system/sw/share/wayland-sessions
+          echo SESSION_DIRS=$SESSION_DIRS
+        '';
+      });
+    };
+    services.greetd = {
+      enable = true;
+      settings = { default_session.command = "cage -s -- regreet"; };
+    };
     # Setup drivers
     hardware.opengl = {
       # Enable vulkan
@@ -28,6 +33,10 @@ in with lib; {
     };
     # Basic packages that are effectively required for a graphical system
     environment.systemPackages = with pkgs; [
+      # Greeter packages
+      cage
+      config.programs.regreet.package
+      gnome.adwaita-icon-theme
       # GTK Theming
       gtk-engine-murrine
       gtk_engines