Reorder options and remove unnecessary function names

1 files changed, 64 insertions, 55 deletions

diff --git a/init.el b/init.el
index a2110db..5b21b27 100644
--- a/init.el
+++ b/init.el
@@ -329,17 +329,17 @@ https://yannherklotz.com"))
   (setq modus-themes-to-toggle
         '(modus-operandi-tinted modus-vivendi-tinted))
   :config
-  (defun ymh/modus-themes-coq-custom-faces ()
-    (modus-themes-with-colors
-      (custom-set-faces
-       `(proof-locked-face ((,c :background ,bg-cyan-nuanced :extend t)))
-       `(proof-queue-face ((,c :background ,bg-magenta-nuanced :extend t)))
-       `(proof-warning-face ((,c :inherit modus-themes-subtle-yellow)))
-       `(coq-solve-tactics-face ((,c :inherit modus-themes-fg-red)))
-       `(coq-cheat-face ((,c :inherit modus-themes-intense-red
-                             :box (:line-width -1 :color ,bg-red-intense :style nil)))))))
-  (add-hook 'modus-themes-after-load-theme-hook #'ymh/modus-themes-coq-custom-faces)
-  (load-theme 'modus-vivendi-tinted 'no-confirm))
+  (add-hook 'modus-themes-after-load-theme-hook
+            (lambda ()
+              (modus-themes-with-colors
+                (custom-set-faces
+                 `(proof-locked-face ((,c :background ,bg-cyan-nuanced :extend t)))
+                 `(proof-queue-face ((,c :background ,bg-magenta-nuanced :extend t)))
+                 `(proof-warning-face ((,c :inherit modus-themes-subtle-yellow)))
+                 `(coq-solve-tactics-face ((,c :inherit modus-themes-fg-red)))
+                 `(coq-cheat-face ((,c :inherit modus-themes-intense-red
+                                       :box (:line-width -1 :color ,bg-red-intense :style nil))))))))
+  (load-theme 'modus-vivendi-tinted :no-confirm))
 
 (use-package pass
   :ensure t
@@ -354,15 +354,40 @@ https://yannherklotz.com"))
 
 (use-package org
   :init
-  (setq org-startup-indented nil)
-  (setq org-src-window-setup 'current-window)
-  (setq org-return-follows-link t)
-  (setq org-confirm-babel-evaluate nil)
-  (setq org-use-speed-commands t)
-  (setq org-hide-emphasis-markers nil)
   (setq org-adapt-indentation nil)
+  (setq org-attach-auto-tag "attach")
+  (setq org-confirm-babel-evaluate nil)
   (setq org-cycle-separator-lines 2)
+  (setq org-export-with-broken-links t)
+  (setq org-fast-tag-selection-single-key 'expert)
+  (setq org-hide-emphasis-markers nil)
+
+  (setq org-html-container-element "section")
+  (setq org-html-doctype "html5")
+  (setq org-html-head-include-default-style nil)
+  (setq org-html-head-include-scripts nil)
+  (setq org-html-html5-fancy t)
+  (setq org-html-postamble t)
+  (setq org-html-postamble-format '(("en" "")))
+
+  (setq org-icalendar-include-bbdb-anniversaries t)
+  (setq org-icalendar-include-todo t)
+
+  (setq org-log-done 'time)
+  (setq org-log-into-drawer t)
+
+  (setq org-return-follows-link t)
+  (setq org-reverse-note-order t)
+  (setq org-src-window-setup 'current-window)
+
   (setq org-startup-folded 'content)
+  (setq org-startup-indented nil)
+
+  (setq org-use-speed-commands t)
+  (setq org-html-divs '((preamble "header" "header")
+                        (content "article" "content")
+                        (postamble "footer" "postamble")))
+
   (setq org-structure-template-alist '(("a" . "export ascii")
                                        ("c" . "center")
                                        ("C" . "comment")
@@ -376,15 +401,6 @@ https://yannherklotz.com"))
                                        ("el" . "src emacs-lisp")
                                        ("d" . "definition")
                                        ("t" . "theorem")))
-  (setq org-attach-auto-tag "attach")
-  (setq org-reverse-note-order t)
-  (setq org-fast-tag-selection-single-key 'expert)
-
-  (setq org-log-done 'time)
-  (setq org-log-into-drawer t)
-
-  (setq org-icalendar-include-todo t)
-  (setq org-icalendar-include-bbdb-anniversaries t)
 
   (setq org-refile-targets `((,(ymh/expand-org-file "main.org") :level . 1)
                              (,(ymh/expand-org-file "someday.org") :level . 1)
@@ -393,22 +409,23 @@ https://yannherklotz.com"))
 
   (setq org-todo-keywords
         '((sequence
-           "TODO(t)"  ; A task that needs doing & is ready to do
-           "PROJ(p)"  ; A project, which usually contains other tasks
-           "STRT(s)"  ; A task that is in progress
-           "WAIT(w)"  ; Something external is holding up this task
-           "HOLD(h)"  ; This task is paused/on hold because of me
-           "DELG(l)"  ; This task is delegated
-           "SMDY(m)" ; todo some day
+           "TODO(t)"
+           "PROJ(p)"
+           "STRT(s)"
+           "WAIT(w)"
+           "HOLD(h)"
+           "DELG(l)"
+           "SMDY(m)"
            "|"
-           "DONE(d!)"  ; Task successfully completed
-           "KILL(k)") ; Task was cancelled, aborted or is no longer applicable
+           "DONE(d!)"
+           "KILL(k)")
           (sequence
-           "[ ](T)"   ; A task that needs doing
-           "[-](S)"   ; Task is in progress
-           "[?](W)"   ; Task is being held up or paused
+           "[ ](T)"
+           "[-](S)"
+           "[?](W)"
            "|"
            "[X](D)")))
+
   (setq org-todo-keyword-faces '(("[-]" . "yellow")
                                  ("STRT" . (:background "aquamarine"))
                                  ("[?]" . (:weight bold))
@@ -419,18 +436,6 @@ https://yannherklotz.com"))
                                  ("PROJ" . (:background "sea green" :weight bold))
                                  ("NO" . (:background "dark salmon"))
                                  ("KILL" . "pale green")))
-  (setq org-html-head-include-default-style nil)
-  (setq org-html-head-include-scripts nil)
-  (setq org-html-doctype "html5")
-  (setq org-html-html5-fancy t)
-  (setq org-html-container-element "section")
-  (setq org-html-postamble-format '(("en" "")))
-  (setq org-html-postamble t)
-  (setq org-html-divs '((preamble "header" "header")
-                        (content "article" "content")
-                        (postamble "footer" "postamble")))
-
-  (setq org-export-with-broken-links t)
   :config
   (unbind-key "C-," org-mode-map))
 
@@ -451,14 +456,15 @@ https://yannherklotz.com"))
            ((org-agenda-overriding-header "Home")))
           ("u" "At uni" tags-todo "@uni"
            ((org-agenda-overriding-header "University")))))
-  (setq org-agenda-tag-filter '("-backed"))
-  (setq org-agenda-span 'week)
-  (setq org-agenda-start-day ".")
-  (setq org-agenda-start-on-weekday nil)
+
   (setq org-agenda-include-diary t)
+  (setq org-agenda-show-all-dates t))
   (setq org-agenda-skip-deadline-if-done t)
   (setq org-agenda-skip-scheduled-if-done t)
-  (setq org-agenda-show-all-dates t))
+  (setq org-agenda-span 'week)
+  (setq org-agenda-start-day ".")
+  (setq org-agenda-start-on-weekday nil)
+  (setq org-agenda-tag-filter '("-backed"))
 
 (use-package org-capture
   :bind ("C-c c" . org-capture)
@@ -735,6 +741,9 @@ https://yannherklotz.com"))
 (use-package haskell-mode
   :ensure t)
 
+(use-package tuareg
+  :ensure t)
+
 (use-package proof-general
   :ensure t
   :config