From 6da16644413a95c0c39d111b42c1e69b125fa841 Mon Sep 17 00:00:00 2001 From: tastytea Date: Thu, 3 Dec 2020 21:42:55 +0100 Subject: [PATCH] Emacs: Read SSH/GPG agent environment variables from file. --- init.d/net/server.el | 5 ++++- init.d/programming/git.el | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/init.d/net/server.el b/init.d/net/server.el index 5a7ff8f..64c1ae5 100644 --- a/init.d/net/server.el +++ b/init.d/net/server.el @@ -1,6 +1,6 @@ ;;; server.el --- Set up network stuff.. -*- lexical-binding: t; -*- -;; Time-stamp: <2020-11-30T15:48:09+0100> +;; Time-stamp: <2020-12-03T21:37:48+0100> ;;; Commentary: @@ -61,5 +61,8 @@ (atomic-chrome-buffer-open-style 'frame)) :hook (atomic-chrome-edit-mode . (lambda () (set-fill-column 400)))) +;; Read SSH/GPG agent environment variables from file. +(use-package keychain-environment) + (provide 'net/server) ;;; server.el ends here diff --git a/init.d/programming/git.el b/init.d/programming/git.el index e156512..af7a4d7 100644 --- a/init.d/programming/git.el +++ b/init.d/programming/git.el @@ -1,6 +1,6 @@ ;;; git.el --- magit and stuff. -*- lexical-binding: t; -*- -;; Time-stamp: <2020-06-23T02:26:26+0200> +;; Time-stamp: <2020-12-03T21:40:09+0100> ;;; Commentary: @@ -18,13 +18,15 @@ (unless slow-computer (use-package magit + :after (keychain-environment) :custom (magit-diff-refine-hunk 'all) ; Show word-granularity differences. :bind (("C-x g" . nil) ; Disable default. ("C-c g" . magit-status) ("C-c M-g" . magit-dispatch) (:map magit-hunk-section-map ("RET" . magit-diff-visit-worktree-file-other-window))) - :hook (after-save . magit-after-save-refresh-status)) + :hook ((after-save . magit-after-save-refresh-status) + (magit-mode . keychain-refresh-environment))) ;; Use libgit rather than git. (use-package magit-libgit)