diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix
index 248d870..5d36a7a 100644
--- a/hosts/catbook-j/configuration.nix
+++ b/hosts/catbook-j/configuration.nix
@@ -20,6 +20,10 @@
   ];
   jade = {
     desktop = {
+      dm.autoLogin = {
+        enable = true;
+        delay = 5;
+      };
       syncthing.enable = true;
       kdeconnect.enable = true;
       cloud.enable = true;
@@ -81,10 +85,6 @@
   };
 
   boot.kernelPackages = pkgs.linuxPackages_zen;
-  services.displayManager.autoLogin = {
-    enable = true;
-    user = "jade";
-  };
 
   # networking
   networking.networkmanager.enable = true;
diff --git a/modules/desktop-environment/default.nix b/modules/desktop-environment/default.nix
index 59206a0..4a5b04f 100644
--- a/modules/desktop-environment/default.nix
+++ b/modules/desktop-environment/default.nix
@@ -3,6 +3,7 @@
     ./audio.nix
     ./flatpak.nix
     ./home
+    ./dm.nix
   ];
   services.upower = {
     enable = true;
diff --git a/modules/desktop-environment/dm.nix b/modules/desktop-environment/dm.nix
new file mode 100644
index 0000000..ebdb023
--- /dev/null
+++ b/modules/desktop-environment/dm.nix
@@ -0,0 +1,36 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.jade.desktop.dm;
+in
+  with lib; {
+    options.jade.desktop.dm.autoLogin = {
+      enable = mkEnableOption "Enable Autologin";
+      delay = mkOption {
+        type = types.int;
+        default = 0;
+      };
+    };
+    config.services = {
+      displayManager = {
+        autoLogin = {
+          enable = cfg.autoLogin.enable;
+          user = "jade";
+        };
+        defaultSession = "sway";
+        sessionPackages = [
+          pkgs.sway
+        ];
+      };
+      xserver.displayManager.gdm = {
+        enable = true;
+        banner = "Meow :3";
+        autoLogin = {
+          delay = cfg.autoLogin.delay;
+        };
+      };
+    };
+  }
diff --git a/modules/desktop/x.nix b/modules/desktop/x.nix
index 00178fb..b8527c6 100644
--- a/modules/desktop/x.nix
+++ b/modules/desktop/x.nix
@@ -6,14 +6,6 @@
       xterm.enable = false;
     };
 
-    displayManager = {
-      gdm.enable = true;
-      sessionPackages = [
-        pkgs.sway
-      ];
-      gdm.autoLogin.delay = 5;
-    };
-
     windowManager.xmonad = {
       enable = true;
     };
@@ -21,7 +13,4 @@
 
   security.polkit.enable = true;
   programs.sway.enable = true;
-
-  # services.displayManager.defaultSession = "none+xmonad";
-  services.displayManager.defaultSession = "sway";
 }