From 3ae42bf5da70a99cf5ddb21b618c8cde16dabb89 Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Fri, 28 Feb 2025 20:28:44 -0800
Subject: [PATCH] feat(home): Create top-level wayland/xorg options

---
 modules/home/wayland/default.nix          | 18 ++++++++++++------
 modules/home/wayland/hyprland/default.nix |  2 ++
 modules/home/wayland/niri/default.nix     |  2 ++
 modules/home/xorg/default.nix             | 13 +++++++++++++
 modules/home/xorg/i3/default.nix          |  1 +
 5 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 modules/home/xorg/default.nix

diff --git a/modules/home/wayland/default.nix b/modules/home/wayland/default.nix
index 5e0021c..38922b1 100644
--- a/modules/home/wayland/default.nix
+++ b/modules/home/wayland/default.nix
@@ -2,12 +2,18 @@
   config,
   lib,
   ...
-}: {
-  # Fix the "tray.target not found" error.
-  systemd.user.targets.tray = lib.mkIf (!config.xsession.enable) {
-    Unit = {
-      Description = "Home Manager System Tray";
-      Requires = ["graphical-session-pre.target"];
+}: let
+  cfg = config.marleyos.wayland;
+in {
+  options.marleyos.wayland.enable = lib.mkEnableOption "wayland";
+
+  config = lib.mkIf cfg.enable {
+    # Fix the "tray.target not found" error.
+    systemd.user.targets.tray = lib.mkIf (!config.xsession.enable) {
+      Unit = {
+        Description = "Home Manager System Tray";
+        Requires = ["graphical-session-pre.target"];
+      };
     };
   };
 }
diff --git a/modules/home/wayland/hyprland/default.nix b/modules/home/wayland/hyprland/default.nix
index abd699f..3b69fb1 100644
--- a/modules/home/wayland/hyprland/default.nix
+++ b/modules/home/wayland/hyprland/default.nix
@@ -36,6 +36,8 @@ in {
     ];
 
     marleyos = {
+      wayland.enable = true;
+
       programs = {
         hyprlock.enable = true;
         waybar.enable = true;
diff --git a/modules/home/wayland/niri/default.nix b/modules/home/wayland/niri/default.nix
index 73ea3ee..395150c 100644
--- a/modules/home/wayland/niri/default.nix
+++ b/modules/home/wayland/niri/default.nix
@@ -11,6 +11,8 @@ in {
 
   config = lib.mkIf cfg.enable {
     marleyos = {
+      wayland.enable = true;
+
       programs = {
         waybar.enable = true;
         wlogout.enable = true;
diff --git a/modules/home/xorg/default.nix b/modules/home/xorg/default.nix
new file mode 100644
index 0000000..c58300f
--- /dev/null
+++ b/modules/home/xorg/default.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.marleyos.xorg;
+in {
+  options.marleyos.xorg.enable = lib.mkEnableOption "xorg";
+
+  # config = lib.mkIf cfg.enable {
+  #
+  # };
+}
diff --git a/modules/home/xorg/i3/default.nix b/modules/home/xorg/i3/default.nix
index 4238a4e..58c1650 100644
--- a/modules/home/xorg/i3/default.nix
+++ b/modules/home/xorg/i3/default.nix
@@ -11,6 +11,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     marleyos = {
+      xorg.enable = true;
       programs.rofi.enable = true;
       services = {
         dunst.enable = true;