sxmo: simplify XDG_SESSION_TYPE fix
This commit is contained in:
parent
f350d7949c
commit
3d7ea75bfc
|
@ -288,11 +288,6 @@ in
|
||||||
# this sets XDG_CURRENT_DESKTOP=sway
|
# this sets XDG_CURRENT_DESKTOP=sway
|
||||||
# and makes sure that sway is launched dbus-run-session.
|
# and makes sure that sway is launched dbus-run-session.
|
||||||
wrapperFeatures.base = true;
|
wrapperFeatures.base = true;
|
||||||
extraSessionCommands = ''
|
|
||||||
# XXX(2023/12/04): fixes a bug where sxmo somehow doesn't set XDG_SESSION_TYPE, preventing apps like Komikku from launching.
|
|
||||||
# wlroots should set this: idk where/why it's failing
|
|
||||||
export XDG_SESSION_TYPE=wayland
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
programs.xwayland.enable = cfg.config.xwayland;
|
programs.xwayland.enable = cfg.config.xwayland;
|
||||||
# provide portals for:
|
# provide portals for:
|
||||||
|
|
|
@ -190,7 +190,5 @@ output "Unknown 0x0637 0x00000000" {
|
||||||
# - XDG_CURRENT_DESKTOP
|
# - XDG_CURRENT_DESKTOP
|
||||||
# for more, see: <repo:nixos/nixpkgs:nixos/modules/programs/wayland/sway.nix>
|
# for more, see: <repo:nixos/nixpkgs:nixos/modules/programs/wayland/sway.nix>
|
||||||
include /etc/sway/config.d/*
|
include /etc/sway/config.d/*
|
||||||
# XXX(2023/12/04): this shouldn't be necessary, but without this (and the other code which actually sets the variable) Komikku on moby fails to launch because XDG_SESSION_TYPE is unset
|
|
||||||
exec dbus-update-activation-environment --systemd XDG_SESSION_TYPE
|
|
||||||
|
|
||||||
@extra_lines@
|
@extra_lines@
|
||||||
|
|
|
@ -383,7 +383,12 @@ in
|
||||||
bindsym button2 kill
|
bindsym button2 kill
|
||||||
bindswitch lid:on exec sxmo_wm.sh dpms on
|
bindswitch lid:on exec sxmo_wm.sh dpms on
|
||||||
bindswitch lid:off exec sxmo_wm.sh dpms off
|
bindswitch lid:off exec sxmo_wm.sh dpms off
|
||||||
|
|
||||||
exec 'printf %s "$SWAYSOCK" > "$XDG_RUNTIME_DIR"/sxmo.swaysock'
|
exec 'printf %s "$SWAYSOCK" > "$XDG_RUNTIME_DIR"/sxmo.swaysock'
|
||||||
|
|
||||||
|
# XXX(2023/12/04): this shouldn't be necessary, but without this Komikku fails to launch because XDG_SESSION_TYPE is unset
|
||||||
|
|
||||||
|
exec dbus-update-activation-environment --systemd XDG_SESSION_TYPE
|
||||||
exec_always ${sxmo_init}
|
exec_always ${sxmo_init}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user