mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-07 22:05:58 +01:00
Nix HM module: add XDG_SESSION_TYPE, fix reload
This commit is contained in:
parent
28867758c4
commit
ed1b72f37d
1 changed files with 6 additions and 4 deletions
|
@ -65,9 +65,11 @@ in {
|
||||||
|
|
||||||
xdg.configFile."hypr/hyprland.conf" = {
|
xdg.configFile."hypr/hyprland.conf" = {
|
||||||
text =
|
text =
|
||||||
(lib.optionalString cfg.systemdIntegration "
|
(lib.optionalString cfg.systemdIntegration ''
|
||||||
exec-once=${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP; systemctl --user start hyprland-session.target
|
exec-once=export XDG_SESSION_TYPE=wayland
|
||||||
")
|
exec-once=${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP
|
||||||
|
exec-once=systemctl --user start hyprland-session.target
|
||||||
|
'')
|
||||||
+ cfg.extraConfig;
|
+ cfg.extraConfig;
|
||||||
|
|
||||||
onChange = let
|
onChange = let
|
||||||
|
@ -75,7 +77,7 @@ in {
|
||||||
if cfg.package == null
|
if cfg.package == null
|
||||||
then defaultHyprlandPackage
|
then defaultHyprlandPackage
|
||||||
else cfg.package;
|
else cfg.package;
|
||||||
in "${hyprlandPackage}/bin/hyprctl reload";
|
in "HYPRLAND_INSTANCE_SIGNATURE=$(ls -w 1 /tmp/hypr | tail -1) ${hyprlandPackage}/bin/hyprctl reload";
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.targets.hyprland-session = lib.mkIf cfg.systemdIntegration {
|
systemd.user.targets.hyprland-session = lib.mkIf cfg.systemdIntegration {
|
||||||
|
|
Loading…
Reference in a new issue