diff --git a/nixos/system/sys/loginManager.nix b/nixos/system/sys/loginManager.nix
new file mode 100644
index 0000000..e8feae4
--- /dev/null
+++ b/nixos/system/sys/loginManager.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  options = {
+    sys.login.sddm.enable = lib.mkEnableOption "Enable SDDM login";
+    sys.login.gdm.enable = lib.mkEnableOption "Enable GDM login";
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf config.sys.login.sddm.enable {
+      services.displayManager = {
+        defaultSession = "hyprland";
+        sddm = {
+          enable = true;
+          wayland.enable = true;
+          theme = "sddm-astronaut-theme";
+          package = lib.mkDefault pkgs.kdePackages.sddm;
+          extraPackages = [pkgs.sddm-astronaut pkgs.kdePackages.qtvirtualkeyboard];
+        };
+      };
+
+      environment.systemPackages = with pkgs; [
+        (sddm-astronaut.override {
+          themeConfig = {
+            ScreenWidth = 1920;
+            ScreenHeight = 1080;
+            PartialBlur = false;
+          };
+        })
+      ];
+    })
+    (lib.mkIf config.sys.login.gdm.enable {
+      services.xserver.displayManager.gdm.enable = true;
+    })
+  ];
+}
diff --git a/nixos/system/sys/sddm.nix b/nixos/system/sys/sddm.nix
deleted file mode 100644
index 2cb1b1d..0000000
--- a/nixos/system/sys/sddm.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  options = {
-    sys.sddm.enable = lib.mkEnableOption "Enable SDDM login";
-  };
-
-  config = lib.mkIf config.sys.sddm.enable {
-    services.displayManager = {
-      defaultSession = "hyprland";
-      sddm = {
-        enable = true;
-        wayland.enable = true;
-        theme = "sddm-astronaut-theme";
-        package = lib.mkDefault pkgs.kdePackages.sddm;
-        extraPackages = [pkgs.sddm-astronaut pkgs.kdePackages.qtvirtualkeyboard];
-      };
-    };
-
-    environment.systemPackages = with pkgs; [
-      (sddm-astronaut.override {
-        themeConfig = {
-          ScreenWidth = 1920;
-          ScreenHeight = 1080;
-          PartialBlur = false;
-        };
-      })
-    ];
-  };
-}