From 230e2d0e3a77b0b3f3f4f904c2ae3c14301073f5 Mon Sep 17 00:00:00 2001 From: punkfairie Date: Mon, 26 May 2025 15:12:22 -0700 Subject: [PATCH] feat: wayland --- modules/home/profiles.nix | 4 +++- modules/home/shell/default.nix | 1 + .../wayland/default.nix => modules/home/shell/wayland.nix | 8 +++----- 3 files changed, 7 insertions(+), 6 deletions(-) rename snowflake/modules/home/wayland/default.nix => modules/home/shell/wayland.nix (81%) diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix index 4c047d5..dd6336f 100644 --- a/modules/home/profiles.nix +++ b/modules/home/profiles.nix @@ -18,7 +18,9 @@ in { # # # Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (lib.optionalAttrs cfg.desktop {}) + (lib.optionalAttrs cfg.desktop { + wayland = enabled; + }) # # # Server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix index bef840d..7b59eae 100644 --- a/modules/home/shell/default.nix +++ b/modules/home/shell/default.nix @@ -3,6 +3,7 @@ ./stylix.nix ./xorg.nix + ./wayland.nix ./gtk.nix ./qt.nix diff --git a/snowflake/modules/home/wayland/default.nix b/modules/home/shell/wayland.nix similarity index 81% rename from snowflake/modules/home/wayland/default.nix rename to modules/home/shell/wayland.nix index 38922b1..d26159a 100644 --- a/snowflake/modules/home/wayland/default.nix +++ b/modules/home/shell/wayland.nix @@ -1,13 +1,11 @@ { - config, lib, + config, ... -}: let - cfg = config.marleyos.wayland; -in { +}: { options.marleyos.wayland.enable = lib.mkEnableOption "wayland"; - config = lib.mkIf cfg.enable { + config = lib.mkIf config.marleyos.wayland.enable { # Fix the "tray.target not found" error. systemd.user.targets.tray = lib.mkIf (!config.xsession.enable) { Unit = {