diff --git a/hosts/hulk/modules.nix b/hosts/hulk/modules.nix
index 7c76c64..7b178dc 100644
--- a/hosts/hulk/modules.nix
+++ b/hosts/hulk/modules.nix
@@ -12,18 +12,11 @@
 
   modules.fingerprint.enable = true;
   modules.bluetooth.enable = true;
+  modules.greetd.enable = true;
   modules.nvidia.enable = true;
   modules.audio.enable = true;
   
   security.rtkit.enable = true;
-
-  # Launch Hyprland upon login  
-  environment.loginShellInit = ''
-    if [ $(tty) = /dev/tty1 ]
-      dbus-run-session Hyprland
-    end
-	'';
-
   services = {
     gvfs.enable = true;
     upower.enable = true;
diff --git a/modules/nixos/greetd.nix b/modules/nixos/greetd.nix
index 45a5ca6..1b2abfe 100644
--- a/modules/nixos/greetd.nix
+++ b/modules/nixos/greetd.nix
@@ -9,7 +9,7 @@
   options.modules.greetd = {
     enable = lib.mkEnableOption "Enable GreetD with TUI-based login.";
     command = lib.mkOption {
-      type = lib.nullOr lib.types.str;
+      type = with lib.types; nullOr str;
       default = null;
       description = "Command to run after successful login";
     };
diff --git a/profiles/sadorowo/modules.nix b/profiles/sadorowo/modules.nix
index c6099df..2d20b22 100644
--- a/profiles/sadorowo/modules.nix
+++ b/profiles/sadorowo/modules.nix
@@ -6,7 +6,6 @@
     ../../modules/desktop-environments/hyprland.nix
     ../../modules/home-manager/apple-style.nix
     ../../modules/home-manager/stylix.nix
-    ../../modules/nixos/greetd.nix
 
     # Utilities + apps
     ../../modules/home-manager/darkman.nix
@@ -25,10 +24,8 @@
     full = true;
   };
 
-  modules.greetd.enable = true;
   modules.hyprland = {
     enable = true;
-    enableLoginManager = true;
     plugins = with pkgs.hyprlandPlugins; [ hyprspace ];
     additionalConfig.source = [
       "~/.config/hypr/config/animations.conf"
@@ -40,11 +37,6 @@
       "~/.config/hypr/config/workspaces.conf"
     ];
 
-    additionalConfig.env = [
-      "LIBVA_DRIVER_NAME,nvidia"
-      "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-    ];
-
     additionalConfig = {
       "$terminal" = "alacritty";
       "$fileManager" = "thunar";