punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: nest xorg/wayland under shell

Browse source
This commit is contained in:
punkfairie 2025-05-26 15:49:03 -07:00
parent ede3d69907
commit a57da685a7
Signed by: punkfairie
GPG key ID: B3C5488E9A1A7CA6
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/home/profiles.nix
View file

@ -19,7 +19,7 @@ in {
# #
# Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - -
(lib.optionalAttrs cfg.desktop { (lib.optionalAttrs cfg.desktop {
wayland = enabled; shell.wayland = enabled;
}) })
# #
# #

4
modules/home/shell/wayland.nix
View file

@ -3,9 +3,9 @@
config, 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. # Fix the "tray.target not found" error.
systemd.user.targets.tray = lib.mkIf (!config.xsession.enable) { systemd.user.targets.tray = lib.mkIf (!config.xsession.enable) {
Unit = { Unit = {

4
modules/home/shell/xorg.nix
View file

@ -3,9 +3,9 @@
config, 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 = { xsession = {
enable = true; enable = true;