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

sway: only import menu prefix if we have plasma

Browse source
This commit is contained in:
Natsu Kagami 2024-09-28 15:23:25 +02:00
parent 21947fd510
commit 2c54a0a9a1
Signed by: nki
GPG key ID: 55A032EB38B49ADB
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
home/modules/programs/my-sway/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, options, config, ... }: { pkgs, lib, options, config, osConfig, ... }:
with lib; with lib;
let let
cfg = config.programs.my-sway; cfg = config.programs.my-sway;
@ -129,9 +129,11 @@ in
"PATH" # for portals "PATH" # for portals
"XDG_DATA_DIRS" # For extra icons "XDG_DATA_DIRS" # For extra icons
"XDG_DATA_HOME" # For extra icons "XDG_DATA_HOME" # For extra icons
] ++ lib.optionals osConfig.services.desktopManager.plasma6.enable [
"XDG_MENU_PREFIX"
]; ];
systemd.extraCommands = options.wayland.windowManager.sway.systemd.extraCommands.default ++ [ systemd.extraCommands = options.wayland.windowManager.sway.systemd.extraCommands.default
"systemctl --user set-environment XDG_MENU_PREFIX=plasma-" ++ [
"systemctl --user restart xdg-desktop-portal.service" "systemctl --user restart xdg-desktop-portal.service"
]; ];
@ -359,7 +361,9 @@ in
eval `gnome-keyring-daemon` eval `gnome-keyring-daemon`
export SSH_AUTH_SOCK export SSH_AUTH_SOCK
fi fi
'' else ""); '' else "") + lib.optionalString osConfig.services.desktopManager.plasma6.enable ''
export XDG_MENU_PREFIX=plasma-
'';
# Extra # Extra
wrapperFeatures.base = true; wrapperFeatures.base = true;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;