nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Remove workaround for 316784

Browse source
This commit is contained in:
Natsu Kagami 2024-06-12 20:37:19 +02:00
parent f2dfe30ff3
commit 40bc313429
Signed by: nki
GPG key ID: 55A032EB38B49ADB
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
home/fish/fish.nix
View file

@ -23,7 +23,6 @@ let
systemctl --user unset-environment NIXOS_OZONE_WL systemctl --user unset-environment NIXOS_OZONE_WL
exec sway exec sway
case "KDE Plasma" case "KDE Plasma"
systemctl --user set-environment NIXOS_OZONE_WL=1
exec ${pkgs.kdePackages.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed startplasma-wayland exec ${pkgs.kdePackages.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed startplasma-wayland
case '*' case '*'
exec fish -i exec fish -i

1
home/modules/linux/graphical/wayland.nix
View file

@ -56,7 +56,6 @@ let
kmail-account-wizard kmail-account-wizard
akonadi-import-wizard akonadi-import-wizard
]; ];
# Not working yet, see #316784
xdg.configFile."plasma-workspace/env/wayland.sh".source = pkgs.writeScript "plasma-wayland-env.sh" '' xdg.configFile."plasma-workspace/env/wayland.sh".source = pkgs.writeScript "plasma-wayland-env.sh" ''
export NIXOS_OZONE_WL=1 export NIXOS_OZONE_WL=1
''; '';

2
modules/common/linux/default.nix
View file

@ -304,7 +304,7 @@ in
wlr.enable = true; wlr.enable = true;
xdgOpenUsePortal = true; xdgOpenUsePortal = true;
# gtk portal needed to make gtk apps happy # gtk portal needed to make gtk apps happy
extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde pkgs.xdg-desktop-portal-gtk ];
config.sway.default = [ "wlr" "kde" ]; config.sway.default = [ "wlr" "kde" ];
}; };