summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accounts/gkleen@sif/default.nix7
-rw-r--r--accounts/gkleen@sif/emacs.el2
2 files changed, 8 insertions, 1 deletions
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 {
579 }; 579 };
580 }; 580 };
581 }; 581 };
582 "emacs/init.el".source = ./emacs.el; 582 "emacs/init.el".source = pkgs.substitute {
583 src = ./emacs.el;
584 substitutions = [
585 "--subst-var-by" "ksshaskpass" (lib.getExe pkgs.kdePackages.ksshaskpass)
586 ];
587 };
583 "systemd/user/xdg-desktop-portal.service.d/after-graphical-session.conf".text = '' 588 "systemd/user/xdg-desktop-portal.service.d/after-graphical-session.conf".text = ''
584 [Unit] 589 [Unit]
585 After=graphical-session.target 590 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."
254(bind-key "C-x C-m" #'move-file) 254(bind-key "C-x C-m" #'move-file)
255 255
256(let ((ssh_auth_sock (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))) (setenv "SSH_AUTH_SOCK" ssh_auth_sock)) 256(let ((ssh_auth_sock (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))) (setenv "SSH_AUTH_SOCK" ssh_auth_sock))
257(setenv "SSH_ASKPASS_REQUIRE" "prefer")
258(setenv "SSH_ASKPASS" "@ksshaskpass@")