feat: nest xorg/wayland under shell
This commit is contained in:
parent
ede3d69907
commit
a57da685a7
3 changed files with 5 additions and 5 deletions
|
@ -19,7 +19,7 @@ in {
|
|||
#
|
||||
# Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
(lib.optionalAttrs cfg.desktop {
|
||||
wayland = enabled;
|
||||
shell.wayland = enabled;
|
||||
})
|
||||
#
|
||||
#
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue