From c13f4ab61565b57562e41dcadb8dffb76b2160cf Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 21 May 2025 12:50:36 +0200 Subject: ... --- accounts/gkleen@sif/default.nix | 7 ++++++- accounts/gkleen@sif/emacs.el | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'accounts/gkleen@sif') diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index a0e9d6cf..1c92fd51 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -579,7 +579,12 @@ in { }; }; }; - "emacs/init.el".source = ./emacs.el; + "emacs/init.el".source = pkgs.substitute { + src = ./emacs.el; + substitutions = [ + "--subst-var-by" "ksshaskpass" (lib.getExe pkgs.kdePackages.ksshaskpass) + ]; + }; "systemd/user/xdg-desktop-portal.service.d/after-graphical-session.conf".text = '' [Unit] After=graphical-session.target diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el index 563c5d0b..3beefba6 100644 --- a/accounts/gkleen@sif/emacs.el +++ b/accounts/gkleen@sif/emacs.el @@ -254,3 +254,5 @@ necessarily running." (bind-key "C-x C-m" #'move-file) (let ((ssh_auth_sock (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))) (setenv "SSH_AUTH_SOCK" ssh_auth_sock)) +(setenv "SSH_ASKPASS_REQUIRE" "prefer") +(setenv "SSH_ASKPASS" "@ksshaskpass@") -- cgit v1.2.3