Emacs: Read SSH/GPG agent environment variables from file.
This commit is contained in:
parent
ccfe39c9f0
commit
6da1664441
|
@ -1,6 +1,6 @@
|
||||||
;;; server.el --- Set up network stuff.. -*- lexical-binding: t; -*-
|
;;; 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:
|
;;; Commentary:
|
||||||
|
|
||||||
|
@ -61,5 +61,8 @@
|
||||||
(atomic-chrome-buffer-open-style 'frame))
|
(atomic-chrome-buffer-open-style 'frame))
|
||||||
:hook (atomic-chrome-edit-mode . (lambda () (set-fill-column 400))))
|
: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)
|
(provide 'net/server)
|
||||||
;;; server.el ends here
|
;;; server.el ends here
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
;;; git.el --- magit and stuff. -*- lexical-binding: t; -*-
|
;;; 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:
|
;;; Commentary:
|
||||||
|
|
||||||
|
@ -18,13 +18,15 @@
|
||||||
|
|
||||||
(unless slow-computer
|
(unless slow-computer
|
||||||
(use-package magit
|
(use-package magit
|
||||||
|
:after (keychain-environment)
|
||||||
:custom (magit-diff-refine-hunk 'all) ; Show word-granularity differences.
|
:custom (magit-diff-refine-hunk 'all) ; Show word-granularity differences.
|
||||||
:bind (("C-x g" . nil) ; Disable default.
|
:bind (("C-x g" . nil) ; Disable default.
|
||||||
("C-c g" . magit-status)
|
("C-c g" . magit-status)
|
||||||
("C-c M-g" . magit-dispatch)
|
("C-c M-g" . magit-dispatch)
|
||||||
(:map magit-hunk-section-map
|
(:map magit-hunk-section-map
|
||||||
("RET" . magit-diff-visit-worktree-file-other-window)))
|
("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 libgit rather than git.
|
||||||
(use-package magit-libgit)
|
(use-package magit-libgit)
|
||||||
|
|
Loading…
Reference in New Issue