init.el

@@ -830,12 +830,11 @@
           ;; Keywords and Tags
 
           (setq org-todo-keywords
-                '((sequence "TODO(t)" "CONT(n!)" "REFINE(f!)"
-                            "|" "DONE(d@/!)" "CANC(c@/!)" "MRGD(m@/!)")
+                '((sequence "TODO(t)" "CONT(n!)" "REFINE(f!)" "|" "DONE(d@/!)" "CANC(c@/!)" "MRGD(m@/!)")
                   (sequence "GOTO(g)" "ATTN(a!)" "|" "DONE(d@/!)")
                   (sequence "READ(r)" "CONT(n!)" "|" "DONE(d@/!)")
                   (sequence "DELG(e@/!)" "WAIT(w@/!)" "HOLD(h@/!)"
-                            "|" "CANC(c@/!)"))
+                   "|" "CANC(c@/!)"))
 
                 org-todo-state-tags-triggers
                 '(("WAIT" ("HOLD") ("WAIT" . t))
@@ -904,20 +903,10 @@
                 org-outline-path-complete-in-steps nil
                 org-refile-target-verify-function 'db/verify-refile-target)
 
-          ;; Babel
+          ;; Bable
 
           (setq org-babel-load-languages '((shell . t)
-                                           (emacs-lisp . t)))
-
-          ;; Link shortcuts (some taken from the documentation)
-
-          (setq org-link-abbrev-alist
-                '(("wpen" . "https://en.wikipedia.org/wiki/")
-                  ("wpde" . "https://de.wikipedia.org/wiki/")
-                  ("ddg" . "https://duckduckgo.com/?q=%s")
-                  ("omap" . "https://nominatim.openstreetmap.org/search?q=%s&polygon=1")
-                  ("github" . "https://github.com/")
-                  ("gitlab" . "https://gitlab.com/"))))
+                                           (emacs-lisp . t))))
   :config (progn
 
             ;; Some hooks from text-mode-hook, Org mode does not seem to run those?
@@ -954,6 +943,20 @@
             ;; Link type for RFCs
             (org-link-set-parameters "rfc" :follow #'db/org-rfc-open)
 
+            ;; Link shortcuts (some taken from the documentation)
+            (add-to-list 'org-link-abbrev-alist
+                         '("wpen" . "https://en.wikipedia.org/wiki/"))
+            (add-to-list 'org-link-abbrev-alist
+                         '("wpde" . "https://de.wikipedia.org/wiki/"))
+            (add-to-list 'org-link-abbrev-alist
+                         '("ddg" . "https://duckduckgo.com/?q=%s"))
+            (add-to-list 'org-link-abbrev-alist
+                         '("omap" . "https://nominatim.openstreetmap.org/search?q=%s&polygon=1"))
+            (add-to-list 'org-link-abbrev-alist
+                         '("github" . "https://github.com/"))
+            (add-to-list 'org-link-abbrev-alist
+                         '("gitlab" . "https://gitlab.com/"))
+
             ;; Some timers
 
             (unless (memq #'org-clock-save