Load the modus-vivendi theme before installing packages

diff --git a/.emacs.d/esy.org b/.emacs.d/esy.org
index 9f019a81eb25b0d46d4e69606f97fe16ac5742ea..0649b8f88ebe9adb9a1122097ef3c9e0a3f26390 100644 (file)
--- a/.emacs.d/esy.org
+++ b/.emacs.d/esy.org
@@ -55,6 +55,13 @@ For further information, see [[info:elisp#Library Headers][elisp#Library Headers
               (lambda () (setq gc-cons-threshold normal-gc-cons-threshold))))
 #+end_src
 
+* Loading the =modus-vivendi= theme
+
+#+begin_src emacs-lisp
+  (load-theme 'modus-vivendi)
+  (modus-themes-load-vivendi)
+#+end_src
+
 * Package archives
 
 #+begin_src emacs-lisp
@@ -89,13 +96,6 @@ For further information, see [[info:elisp#Library Headers][elisp#Library Headers
   (setq native-comp-async-report-warnings-errors 'silent)
 #+end_src
 
-* Loading the =modus-vivendi= theme
-
-#+begin_src emacs-lisp
-  (load-theme 'modus-vivendi)
-  (modus-themes-load-vivendi)
-#+end_src
-
 * No littering!
 
 #+begin_src emacs-lisp
@@ -274,7 +274,7 @@ For further information, see [[info:elisp#Library Headers][elisp#Library Headers
        :exclude ".*"
        :include ("index.org")
        :publishing-function org-html-publish-to-html
-       :html-head "<link rel=\"stylesheet\" href=\"/style.css\" type=\"text/css\"/>"
+       :html-head ,esy/website-html-header
        :html-postamble ,(f-read-text
                          "~/checkouts/eshelyaron.com/org/html_postamble.html"))
     "Template for the index page of my website")
@@ -356,7 +356,8 @@ For further information, see [[info:elisp#Library Headers][elisp#Library Headers
     "History list for 'esy/org-capture-to-project-heading'.")
 
   (require 'savehist)
-  (setq savehist-additional-variables '(esy/org-capture-to-project-heading-history-list))
+  (setq savehist-additional-variables
+        '(esy/org-capture-to-project-heading-history-list))
 
   (defun esy/org-capture-to-project-heading ()
     "Prompt for a projects and capture a related task."
@@ -364,8 +365,15 @@ For further information, see [[info:elisp#Library Headers][elisp#Library Headers
     (let* ((projects
             (org-map-entries `(lambda () (nth 4 (org-heading-components)))
                              "+project+LEVEL=2" '(esy/inbox-path)))
-           (choice (completing-read "Project: " projects nil t nil 'esy/org-capture-to-project-heading-history-list))
-           (m (org-find-olp (cons (org-capture-expand-file esy/inbox-path) (list "Projects" choice)))))
+           (choice (completing-read "Project: "
+                                    projects
+                                    nil
+                                    t
+                                    nil
+                                    'esy/org-capture-to-project-heading-history-list))
+           (m (org-find-olp (cons
+                             (org-capture-expand-file esy/inbox-path)
+                             (list "Projects" choice)))))
       (set-buffer (marker-buffer m))
       (org-capture-put-target-region-and-position)
       (widen)
@@ -384,7 +392,9 @@ For further information, see [[info:elisp#Library Headers][elisp#Library Headers
                                      "\"")
                              (list esy/inbox-path)))
            (choice (car projects))
-           (m (org-find-olp (cons (org-capture-expand-file esy/inbox-path) (list "Projects" choice)))))
+           (m (org-find-olp (cons
+                             (org-capture-expand-file esy/inbox-path)
+                             (list "Projects" choice)))))
       (set-buffer (marker-buffer m))
       (org-capture-put-target-region-and-position)
       (widen)
@@ -394,83 +404,86 @@ For further information, see [[info:elisp#Library Headers][elisp#Library Headers
   (setq org-capture-templates '(("t" "Todo [inbox]" entry
                                  (file+headline esy/inbox-path "Tasks")
                                  "** TODO %^{Task}    %^g
-  :PROPERTIES:
-  :CreatedAt: %t
-  :CapturedAt: %a
-  :CapturedAs: Inbox Task
-  :END:
-  "
+    :PROPERTIES:
+    :CreatedAt: %t
+    :CapturedAt: %a
+    :CapturedAs: Inbox Task
+    :END:
+    "
                                  :prepend t
                                  :empty-lines 1
                                  :immediate-finish t)
                                 ("n" "New Project" entry
                                  (file+headline esy/inbox-path "Projects")
                                  "** %^{Name}    %^g
-  :PROPERTIES:
-  :CreatedAt: %t
-  :CapturedAt: %a
-  :CapturedAs: New Project
-  :SCM: file:%(project-prompt-project-dir)
-  :END:
-  "
+    :PROPERTIES:
+    :CreatedAt: %t
+    :CapturedAt: %a
+    :CapturedAs: New Project
+    :SCM: file:%(project-prompt-project-dir)
+    :END:
+    "
                                  :prepend t
                                  :empty-lines 1
                                  :immediate-finish t)
                                 ("c" "New Calendar Event" entry
                                  (file+headline esy/inbox-path "Calendar")
                                  "** %^{Title}    %^g
-  :PROPERTIES:
-  :CreatedAt: %t
-  :CapturedAt: %a
-  :CapturedAs: Calendar Event
-  :END:
-  %(format-time-string \"<%Y-%m-%d %H:%M\" (org-read-date t t))-%(format-time-string \"%H:%M>\" (org-read-date t t))
-  %i
-  "
+    :PROPERTIES:
+    :CreatedAt: %t
+    :CapturedAt: %a
+    :CapturedAs: Calendar Event
+    :END:
+    %(format-time-string \"<%Y-%m-%d %H:%M\" (org-read-date t t))-%(format-time-string \"%H:%M>\" (org-read-date t t))
+    %i
+    "
                                  :prepend t
                                  :empty-lines 1
                                  :immediate-finish t)
                                 ("p" "New Project Task" entry
-                                 (file+function esy/inbox-path esy/org-capture-to-project-heading)
+                                 (file+function esy/inbox-path
+                                                esy/org-capture-to-project-heading)
                                  "*** TODO %?
-  :PROPERTIES:
-  :CreatedAt: %t
-  :CapturedAt: %a
-  :CapturedAs: Project Task
-  :END:
-  %i
-  "
+    :PROPERTIES:
+    :CreatedAt: %t
+    :CapturedAt: %a
+    :CapturedAs: Project Task
+    :END:
+    %i
+    "
                                  :prepend t
                                  :empty-lines 1)
                                 ("Q" "Quick Project Task" entry
-                                 (file+function esy/inbox-path esy/org-capture-to-project-heading)
+                                 (file+function esy/inbox-path
+                                                esy/org-capture-to-project-heading)
                                  "*** TODO %^{Task}
-  :PROPERTIES:
-  :CreatedAt: %t
-  :CapturedAt: %a
-  :CaptuerdAs: Quick Project Task
-  :END:
-  %i
-  "
+    :PROPERTIES:
+    :CreatedAt: %t
+    :CapturedAt: %a
+    :CaptuerdAs: Quick Project Task
+    :END:
+    %i
+    "
                                  :prepend t
                                  :empty-lines 1
                                  :immediate-finish t)
                                 ("P" "Current Project Task" entry
-                                 (file+function esy/inbox-path esy/org-capture-to-current-project)
+                                 (file+function esy/inbox-path
+                                                esy/org-capture-to-current-project)
                                  "*** TODO %^{Task}
-  :PROPERTIES:
-  :CreatedAt: %t
-  :CapturedAt: %a
-  :CaptuerdAs: Current Project Task
-  :END:
-  %i
-  "
+    :PROPERTIES:
+    :CreatedAt: %t
+    :CapturedAt: %a
+    :CaptuerdAs: Current Project Task
+    :END:
+    %i
+    "
                                  :prepend t
                                  :empty-lines 1
                                  :immediate-finish t)))
 
-(setq org-capture-templates-contexts
-      '(("P" (list project-current))))
+  (setq org-capture-templates-contexts
+        '(("P" (list project-current))))
 #+end_src
 
 ** Unset =org-mode= binding of =C-,= to =org-cycle-agenda-files=       :kbd: