From 5f2172f2a59237b17cce6fb80795c4b2ff35c5b3 Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Sat, 6 Aug 2022 14:10:47 +0200 Subject: [PATCH] plasma: Attempt to use ksshaskpass --- modules/desktop/plasma.nix | 59 ++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/modules/desktop/plasma.nix b/modules/desktop/plasma.nix index 84ac99b..130059f 100644 --- a/modules/desktop/plasma.nix +++ b/modules/desktop/plasma.nix @@ -146,31 +146,40 @@ in { extraPortals = [ pkgs.xdg-desktop-portal-kde ]; }; - environment.systemPackages = let - plasmaMobilePackages = with pkgs.libsForQt5; with plasma5; with kdeApplications; with kdeFrameworks; [ - plasma-mobile - plasma-nano - pkgs.maliit-framework - pkgs.maliit-keyboard - ]; - kdePackages = with pkgs.libsForQt5; [ - okular - kdeconnect-kde - breeze-gtk - bismuth - gwenview - yakuake - ] ++ lib.optionals cfg.mobile.enable plasmaMobilePackages; - packages = with pkgs; [ - index-fm - rsibreak - kalendar - kate - okular + environment = { + systemPackages = let + plasmaMobilePackages = with pkgs.libsForQt5; with plasma5; with kdeApplications; with kdeFrameworks; [ + plasma-mobile + plasma-nano + pkgs.maliit-framework + pkgs.maliit-keyboard + ]; + kdePackages = with pkgs.libsForQt5; [ + okular + kdeconnect-kde + breeze-gtk + bismuth + gwenview + yakuake + ] ++ lib.optionals cfg.mobile.enable plasmaMobilePackages; + packages = with pkgs; [ + index-fm + rsibreak + kalendar + kate + okular - # Some Gnome software - gnome.totem - ]; - in kdePackages ++ packages; + # Some Gnome software + gnome.totem + ]; + in kdePackages ++ packages; + sessionVariables = let + askPass = "${pkgs.libsForQt5.ksshaskpass}/bin/ksshaskpass"; + in { + SSH_ASKPASS = askPass; + SSH_ASKPASS_REQUIRE = "prefer"; + GIT_ASKPASS = askPass; + }; + }; }; }