From 24c67d3884fe87d13c39b36e787afcf11cd65c91 Mon Sep 17 00:00:00 2001 From: willifan Date: Sat, 4 Jan 2025 18:40:02 +0100 Subject: [PATCH 1/2] fix Lillie typo --- hosts/Lillie/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/Lillie/default.nix b/hosts/Lillie/default.nix index 448ea0f..ccfe258 100644 --- a/hosts/Lillie/default.nix +++ b/hosts/Lillie/default.nix @@ -16,7 +16,7 @@ laser.enable = true; hyprland = { - hardware.Lillie = true; + hardware.Lillie.enable = true; }; }; From 3a5fe4889f9b8d786e307b76bdbd16a27a36667b Mon Sep 17 00:00:00 2001 From: willifan Date: Sat, 4 Jan 2025 18:50:00 +0100 Subject: [PATCH 2/2] set Lillie WM to niri --- hosts/Lillie/default.nix | 2 +- hosts/Lillie/jovian.nix | 2 +- modules/default/common/options.nix | 7 ++++++- modules/default/home-manager/desktop/hyprland/options.nix | 4 ---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hosts/Lillie/default.nix b/hosts/Lillie/default.nix index ccfe258..228b41f 100644 --- a/hosts/Lillie/default.nix +++ b/hosts/Lillie/default.nix @@ -11,7 +11,7 @@ desktop = { enable = true; - autostart.enable = false; + autologin.enable = false; emulation.enable = true; laser.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;