diff --git a/system/default.nix b/system/default.nix
index 9b80792..6d9de9d 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -10,8 +10,9 @@
     ./boot.nix
     ./shell.nix
     ./networking.nix
-    ./gdm.nix
+    ./display-manager.nix
     ./localization.nix
     ./fira-code.nix
+    ./nixos-cli.nix
   ];
 }
diff --git a/system/gdm.nix b/system/display-manager.nix
similarity index 70%
rename from system/gdm.nix
rename to system/display-manager.nix
index 5390aad..759949f 100644
--- a/system/gdm.nix
+++ b/system/display-manager.nix
@@ -13,10 +13,9 @@
         variant = "";
       };
     };
-    displayManager.gdm = {
+    displayManager.ly = {
       enable = true;
-      wayland = true;
-      autoSuspend = false;
     };
   };
+  programs.hyprland.enable = true;
 }
diff --git a/system/nixos-cli.nix b/system/nixos-cli.nix
new file mode 100644
index 0000000..bebd807
--- /dev/null
+++ b/system/nixos-cli.nix
@@ -0,0 +1,10 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  services.nixos-cli.enable = true;
+}