2 files changed, 41 insertions, 14 deletions
diff --git a/emacs-init.org b/emacs-init.org
index dfb1aec..4ed3f35 100644
--- a/emacs-init.org
+++ b/emacs-init.org
@@ -5,11 +5,11 @@ This files contains all the elisp code normally placed in the .emacs
 file. It and the =init.el= file are then symlinked to my =~/.emacs.d/=
 directory. Instead of symlinking the files could also be directly
 tangled to =~/.emacs.d/=.
-#+BEGIN_SRC shell :results silent
-ln -sf $(pwd)/emacs-init.org ~/.emacs.d/
-ln -sf $(pwd)/tangle/emacs-init.el ~/.emacs.d/
-ln -sf $(pwd)/emacs-private.el.gpg ~/.emacs.d/
-ln -sf $(pwd)/tangle/init.el ~/.emacs.d/
+#+BEGIN_SRC shell :results silent :tangle tangle/symlink.sh :shebang "#!/bin/bash"
+ln -siv $(pwd)/emacs-init.org ~/.emacs.d/
+ln -siv $(pwd)/tangle/emacs-init.el ~/.emacs.d/
+ln -siv $(pwd)/emacs-private.el.gpg ~/.emacs.d/
+ln -siv $(pwd)/tangle/init.el ~/.emacs.d/
 #+END_SRC
 
 An often seen setup is to use ~org-babel-load-file~ in =init.el= to
@@ -1251,7 +1251,6 @@ of src_shell{getconf "PATH"}. See [[elisp:(describe-variable
 #+end_src
 ** Git
 *** Magit
-
 #+BEGIN_SRC emacs-lisp
 (use-package magit
   :ensure t
@@ -1297,6 +1296,18 @@ Add support for [[https://nvie.com/posts/a-successful-git-branching-model/][gitf
    :ensure t
    :hook (magit-mode . turn-on-magit-gitflow))
 #+end_src
+*** git-identity
+Found it in this [[https://www.manueluberti.eu/emacs/2020/03/30/lockdown-beam-git-identity/][blog post]] from Manuel Uberti. An easy way to handle multiple git identities.
+
+#+begin_src emacs-lisp
+(use-package git-identity
+  :ensure t
+  :custom
+  (git-identity-verify t)
+  (git-identity-list private/git-identity-list)
+  :config (git-identity-magit-mode 1)
+  :bind (:map magit-status-mode-map ("I" . git-identity-info)))
+#+end_src
 *** diff-hl
 Indicates changed lines in the left fringe. The Hydra can be used to
 navigate and revert hunks directly from the buffer. Use =g= to open
@@ -1353,7 +1364,6 @@ some safe local variable values.
   (add-to-list 'safe-local-variable-values
                '(git-auto-commit-mode . t)))
 #+end_src
-
 ** Projectile
 
 #+BEGIN_SRC emacs-lisp
@@ -1850,7 +1860,7 @@ Switch projects and subprojects from NEXT back to TODO"
 (use-package org-screenshot)
 (use-package org-collector)
 (use-package ox)
-(use-package org-notmuch)
+(use-package ol-notmuch)
 (use-package org-expiry
   :custom
   (org-expiry-handler-function 'org-expiry-archive-subtree))
@@ -1922,10 +1932,10 @@ Use imagemagick and standalone class for latex preview.
 *** org-roam
 #+begin_src emacs-lisp
 (use-package org-roam
+  :ensure t
   :delight
   :hook
   (after-init . org-roam-mode)
-  :load-path "~/git/clone/org-roam"
   :custom
   (org-roam-directory "~/git/projects/zettel/")
   :bind (:map org-roam-mode-map
@@ -2187,17 +2197,34 @@ A small function to toggle the encryption state of the current entry.
            (org-encrypt-entry))))))
   (define-key fpi/toggle-map "e" #'fpi/org-toggle-crypt-entry))
 #+end_src
-*** org-ref
+*** Reference management
+**** Bibtex
+#+begin_src emacs-lisp
+(use-package bibtex
+  :custom
+  (bibtex-autokey-titlewords 3)
+  (bibtex-autokey-titlewords-stretch 1)
+  (bibtex-autokey-titleword-length 5)
+  :config
+  (bibtex-set-dialect 'BibTeX))
+
+(setq bibtex-completion-bibliography "~/git/projects/zettel/Lit/bib.bib")
+(setq bibtex-completion-notes-path "~/git/projects/zettel/Lit")
+(setq bibtex-completion-notes-extension ".org")
+
+#+end_src
+**** org-ref
 #+begin_src emacs-lisp
 (use-package org-ref
   :ensure t
   :custom
-  (org-ref-bibliography-notes "~/git/projects/personal/bib.org")
+  (org-ref-bibliography-notes nil)
+  (org-ref-notes-function 'org-ref-notes-function-many-files)
+  (org-ref-notes-directory "~/git/projects/zettel/Lit")
   (org-ref-default-bibliography '("~/git/projects/personal/bib.bib"))
-  (org-ref-pdf-directory "~/git/projects/personal/Lit/")
-  :config
-  (bibtex-set-dialect 'BibTeX))
+  (org-ref-pdf-directory "~/git/projects/personal/Lit/"))
 #+end_src
+***** Capturing entries
 I store my bibtex references in an org file together with my notes. In
 addition to saving the meta information in properties using the same
 functions as =doi-utils-doi-to-org-bibtex=, I also store them a second
diff --git a/emacs-private.el.gpg b/emacs-private.el.gpg
index 6b46930..b997400 100644
--- a/emacs-private.el.gpg
+++ b/emacs-private.el.gpg