diff --git a/common/login-manager/gdm.nix b/common/login-manager/gdm.nix
new file mode 100644
index 0000000..9eb7b82
--- /dev/null
+++ b/common/login-manager/gdm.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  login-manager = "gdm";
+
+  services.xserver.displayManager.gdm.enable = true;
+
+}
diff --git a/common/login-manager/sddm.nix b/common/login-manager/sddm.nix
new file mode 100644
index 0000000..04b595d
--- /dev/null
+++ b/common/login-manager/sddm.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  login-manager = "sddm";
+
+  services.xserver.displayManager.sddm = {
+    enable = true;
+    
+    autoNumlock = true;
+    enableHidpi = true;
+    wayland.enable = true;
+  };
+}
diff --git a/common/login-manager/tuigreet.nix b/common/login-manager/tuigreet.nix
new file mode 100644
index 0000000..ee70fd5
--- /dev/null
+++ b/common/login-manager/tuigreet.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+{
+  login-manager = "tuigreet";
+
+  environment.systemPackages = (with pkgs; [
+    greetd.tuigreet
+  ]);
+
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
+        user = "greeter";
+      };
+    };
+  };
+}
diff --git a/common/options.nix b/common/options.nix
index 9037291..63aa986 100644
--- a/common/options.nix
+++ b/common/options.nix
@@ -2,6 +2,11 @@
 
 with lib; {
   options = {
+    login-manager = mkOption {
+      default = "";
+      type = types.str;
+    };
+
     desktop = mkOption {
       default = "";
       type = types.str;
diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix
index be76681..9a4ba9f 100644
--- a/hosts/nixos/configuration.nix
+++ b/hosts/nixos/configuration.nix
@@ -10,6 +10,7 @@ in {
 
     (common_dir + /bootloader/systemd-boot.nix)
     (common_dir + /users/users.nix)
+    (common_dir + /display-manager/tuigreet.nix)
     (common_dir + /desktop/sway.nix)
   ];
   
@@ -98,8 +99,6 @@ in {
     lf
     tmux
     firefox
-
-    greetd.tuigreet
   ]);
 
   environment.shells = with pkgs; [ bash zsh ];
@@ -168,20 +167,6 @@ in {
 
 
 
-  # Login Manager Configuration
-
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
-        user = "greeter";
-      };
-    };
-  };
-
-
-
   # User Configuration
 
   user.cameron.enable = true;
diff --git a/hosts/nixserver/configuration.nix b/hosts/nixserver/configuration.nix
index 52a730f..f32009b 100755
--- a/hosts/nixserver/configuration.nix
+++ b/hosts/nixserver/configuration.nix
@@ -14,6 +14,7 @@ in {
 
       (common_dir + /bootloader/grub.nix)
       (common_dir + /users/users.nix)
+      (common_dir + /login-manager/tuigreet.nix)
 
       ./minecraft.nix
       ./frp.nix