From a57da685a79873995d9b25ad3ae53e62b6f3ed58 Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Mon, 26 May 2025 15:49:03 -0700
Subject: [PATCH] feat: nest xorg/wayland under shell

---
 modules/home/profiles.nix      | 2 +-
 modules/home/shell/wayland.nix | 4 ++--
 modules/home/shell/xorg.nix    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix
index dd6336f..b78652b 100644
--- a/modules/home/profiles.nix
+++ b/modules/home/profiles.nix
@@ -19,7 +19,7 @@ in {
     #
     # Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     (lib.optionalAttrs cfg.desktop {
-      wayland = enabled;
+      shell.wayland = enabled;
     })
     #
     #
diff --git a/modules/home/shell/wayland.nix b/modules/home/shell/wayland.nix
index d26159a..98104bb 100644
--- a/modules/home/shell/wayland.nix
+++ b/modules/home/shell/wayland.nix
@@ -3,9 +3,9 @@
   config,
   ...
 }: {
-  options.marleyos.wayland.enable = lib.mkEnableOption "wayland";
+  options.marleyos.shell.wayland.enable = lib.mkEnableOption "wayland";
 
-  config = lib.mkIf config.marleyos.wayland.enable {
+  config = lib.mkIf config.marleyos.shell.wayland.enable {
     # Fix the "tray.target not found" error.
     systemd.user.targets.tray = lib.mkIf (!config.xsession.enable) {
       Unit = {
diff --git a/modules/home/shell/xorg.nix b/modules/home/shell/xorg.nix
index ac7ae3a..ce09d18 100644
--- a/modules/home/shell/xorg.nix
+++ b/modules/home/shell/xorg.nix
@@ -3,9 +3,9 @@
   config,
   ...
 }: {
-  options.marleyos.xorg.enable = lib.mkEnableOption "xorg";
+  options.marleyos.shell.xorg.enable = lib.mkEnableOption "xorg";
 
-  config = lib.mkIf config.marleyos.xorg.enable {
+  config = lib.mkIf config.marleyos.shell.xorg.enable {
     xsession = {
       enable = true;