diff --git a/hosts/Lillie/default.nix b/hosts/Lillie/default.nix
index 448ea0f..228b41f 100644
--- a/hosts/Lillie/default.nix
+++ b/hosts/Lillie/default.nix
@@ -11,12 +11,12 @@
 
   desktop = {
     enable = true;
-    autostart.enable = false;
+    autologin.enable = false;
     emulation.enable = true;
     laser.enable = true;
 
     hyprland = {
-      hardware.Lillie = true;
+      hardware.Lillie.enable = true;
     };
   };
 
diff --git a/hosts/Lillie/jovian.nix b/hosts/Lillie/jovian.nix
index ec96f29..97815ac 100644
--- a/hosts/Lillie/jovian.nix
+++ b/hosts/Lillie/jovian.nix
@@ -36,7 +36,7 @@
       enable = true;
       user = "willifan";
       autoStart = true;
-      desktopSession = "hyprland";
+      desktopSession = "niri";
     };
   };
 
diff --git a/modules/default/common/options.nix b/modules/default/common/options.nix
index 92a6fbd..a59da09 100644
--- a/modules/default/common/options.nix
+++ b/modules/default/common/options.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, config, ... }:
 {
   options = {
 
@@ -33,6 +33,11 @@
         type = lib.types.bool;
       };
 
+      autologin.enable = lib.mkOption {
+        default = config.desktop.enable;
+        type = lib.types.bool;
+      };
+
       windowManager = lib.mkOption {
         default = "Hyprland";
         type = lib.types.str;
diff --git a/modules/default/home-manager/desktop/hyprland/options.nix b/modules/default/home-manager/desktop/hyprland/options.nix
index a645ca6..1adb64c 100644
--- a/modules/default/home-manager/desktop/hyprland/options.nix
+++ b/modules/default/home-manager/desktop/hyprland/options.nix
@@ -2,10 +2,6 @@
 {
   options = {
     desktop = {
-      autologin.enable = lib.mkOption {
-        default = config.desktop.enable;
-        type = lib.types.bool;
-      };
       fuzzel.enable = lib.mkOption {
         default = config.desktop.enable;
         type = lib.types.bool;