From 21604ca9941849a4f1149acf2ab22e49aa3272ae Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely@polonkai.eu>
Date: Thu, 9 Aug 2018 13:48:27 +0200
Subject: [PATCH] Refactor configuration of Org-mode

Now everything is set during :init (which may or may not be a good idea.)
---
 configuration.org | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/configuration.org b/configuration.org
index e5909ad..5bcee60 100644
--- a/configuration.org
+++ b/configuration.org
@@ -2273,7 +2273,25 @@ This is a big one; I use a lot of customisation here.
                 org-log-into-drawer t
                 org-tags-column 0
                 org-startup-indented t
-                org-special-ctrl-a/e t)
+                org-special-ctrl-a/e t
+                org-return-follows-link t
+                org-src-fontify-natively t
+                org-time-stamp-formats '("<%Y-%m-%d>" . "<%Y-%m-%d %H:%M>")
+                org-todo-keywords '((sequence "TODO(t)"
+                                              "DOING(w@/!)"
+                                              "BLOCKED(b@/!)"
+                                              "|"
+                                              "CANCELED(c@/!)"
+                                              "REVIEW(r@/!)"
+                                              "DONE(d@/!)"))
+                org-goto-interface 'outline-path-completion
+                org-goto-max-level 10
+                org-html-checkbox-type 'unicode
+                org-html-checkbox-types
+                '((unicode (on . "<span class=\"task-done\">☑</span>")
+                           (off . "<span class=\"task-todo\">☐</span>")
+                           (trans . "<span class=\"task-in-progress\">▣</span>")))
+                org-src-window-setup 'current-window)
   :config
   (require 'ox-md)
   (unless (boundp 'org-capture-templates)
@@ -2287,22 +2305,6 @@ This is a big one; I use a lot of customisation here.
                  entry (file+headline (concat org-directory "gt2-notes.org")
                                       "Captures")
                  "** %^{Title}\n   :PROPERTIES:\n   :on: %T\n   :END:\n   %i%?"))
-  (setq org-time-stamp-formats '("<%Y-%m-%d>" . "<%Y-%m-%d %H:%M>")
-        org-todo-keywords '((sequence "TODO(t)"
-                                      "DOING(w@/!)"
-                                      "BLOCKED(b@/!)"
-                                      "|"
-                                      "CANCELED(c@/!)"
-                                      "REVIEW(r@/!)"
-                                      "DONE(d@/!)"))
-        org-goto-interface 'outline-path-completion
-        org-goto-max-level 10
-        org-html-checkbox-type 'unicode
-        org-html-checkbox-types
-        '((unicode (on . "<span class=\"task-done\">☑</span>")
-            (off . "<span class=\"task-todo\">☐</span>")
-            (trans . "<span class=\"task-in-progress\">▣</span>")))
-        org-src-window-setup 'current-window)
   (add-hook 'ediff-select-hook 'f-ediff-org-unfold-tree-element)
   (add-hook 'ediff-unselect-hook 'f-ediff-org-fold-tree)
   :bind