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