From 18075d1d78f772c6ed7649d96330f7c8020abc4a Mon Sep 17 00:00:00 2001
From: willifan <willifan@pm.me>
Date: Mon, 14 Jul 2025 16:50:34 +0200
Subject: [PATCH] switch lillie to gnome

---
 hosts/Lillie/default.nix          |  2 +-
 hosts/Lillie/jovian.nix           |  2 +-
 modules/nixos/desktop/DE.nix      | 11 +++++++++++
 modules/nixos/desktop/default.nix |  2 +-
 modules/nixos/desktop/plasma6.nix |  6 ------
 modules/nixos/options.nix         | 12 +++++++++---
 6 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 modules/nixos/desktop/DE.nix
 delete mode 100644 modules/nixos/desktop/plasma6.nix

diff --git a/hosts/Lillie/default.nix b/hosts/Lillie/default.nix
index 70403a7..ebeeecf 100644
--- a/hosts/Lillie/default.nix
+++ b/hosts/Lillie/default.nix
@@ -18,7 +18,7 @@
     autologin.enable = false;
     emulation.enable = true;
     laser.enable = true;
-    wm.niri.enable = true;
+    wm.gnome.enable = true;
 
     hyprland = {
       hardware.Lillie.enable = true;
diff --git a/hosts/Lillie/jovian.nix b/hosts/Lillie/jovian.nix
index 02c8746..d30b2df 100644
--- a/hosts/Lillie/jovian.nix
+++ b/hosts/Lillie/jovian.nix
@@ -37,7 +37,7 @@
       enable = true;
       user = "willifan";
       autoStart = true;
-      desktopSession = "niri";
+      desktopSession = "gnome";
       updater.splash = "jovian";
     };
   };
diff --git a/modules/nixos/desktop/DE.nix b/modules/nixos/desktop/DE.nix
new file mode 100644
index 0000000..bfd7060
--- /dev/null
+++ b/modules/nixos/desktop/DE.nix
@@ -0,0 +1,11 @@
+{ lib, config, ... }:
+{
+  services.desktopManager = {
+    plasma6 = lib.mkIf config.desktop.wm.plasma6.enable {
+      enable = true;
+    };
+    gnome = lib.mkIf config.desktop.wm.gnome.enable {
+      enable = true;
+    };
+  };
+}
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index fba83c2..a546e06 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -3,6 +3,7 @@
   imports = [
     ./games
 
+    ./DE.nix
     ./applications.nix
     ./autostart.nix
     ./boot.nix
@@ -13,7 +14,6 @@
     ./nfs-client.nix
     ./nix-ld.nix
     ./pipewire.nix
-    ./plasma6.nix
     ./polkit.nix
     ./printers.nix
     ./remoteBuilder.nix
diff --git a/modules/nixos/desktop/plasma6.nix b/modules/nixos/desktop/plasma6.nix
deleted file mode 100644
index c28ea49..0000000
--- a/modules/nixos/desktop/plasma6.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ lib, config, ... }:
-lib.mkIf config.desktop.wm.plasma6.enable {
-  services.desktopManager.plasma6 = {
-    enable = true;
-  };
-}
diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix
index 90e3074..7790311 100644
--- a/modules/nixos/options.nix
+++ b/modules/nixos/options.nix
@@ -43,9 +43,15 @@
         type = lib.types.str;
       };
 
-      wm.plasma6.enable = lib.mkOption {
-        default = false;
-        type = lib.types.bool;
+      wm = {
+        plasma6.enable = lib.mkOption {
+          default = false;
+          type = lib.types.bool;
+        };
+        gnome.enable = lib.mkOption {
+          default = false;
+          type = lib.types.bool;
+        };
       };
 
     };