Default font is now Hack.

13 files changed, 225 insertions, 74 deletions

diff --git a/.gitignore b/.gitignore
index 3652490..5398774 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,5 @@ recentf
 srecode-map.el
 .org-id-locations
 network-security.data
-places
\ No newline at end of file
+places
+projectile.cache
diff --git a/blendoit/blendoit-init.org b/blendoit/blendoit-init.org
index acfff23..926cb79 100644
--- a/blendoit/blendoit-init.org
+++ b/blendoit/blendoit-init.org
@@ -1,12 +1,11 @@
 #+TITLE: My literate GNU Emacs config
 #+AUTHOR: Marius Peter
 #+DATE: <2020-07-23 Thu>
+#+EMAIL: blendoit@gmail.com
 
 #+STARTUP: showall customtime
-
-#+SETUPFILE: ~/.emacs.d/templates/documents/personal.org
-
-#+INCLUDE: ~/.emacs.d/templates/documents/personal.org_title
+#+SETUPFILE: ~/.emacs.d/templates/documents/general.org
+#+INCLUDE: ~/.emacs.d/templates/documents/general.org_title
 
 \begin{abstract}
 GNU Emacs is most often used as a text editor.
@@ -29,14 +28,6 @@ this is the endgame of \textit{literate programming}.
 # (org-babel-load-file "~/.emacs.d/blendoit/test.org")
 # #+END_SRC
 
-* README
-:PROPERTIES:
-:UNNUMBERED: t
-:END:
-
-The =README.org= was exported from the first section of my literate configuration
-file, [[file:blendoit-init.org]].
-
 * Document structure
 :PROPERTIES:
 :UNNUMBERED: t
@@ -44,12 +35,11 @@ file, [[file:blendoit-init.org]].
 
 ** Blending Linux and Windows
 
-The GNU Emacs cabal is attempting to create a complete OS out of a text editor.
-
-Microsoft has a notorious /embrace, extend, extinguish/ approach when it comes
-to rival technologies.
-
-Both are simultaneously possible.
+- The GNU Emacs cabal is attempting to create a complete OS out of a text
+  editor.
+- Microsoft has a notorious /embrace, extend, extinguish/ approach when it
+  comes to rival technologies.
+- Both are simultaneously possible.
 
 * TODO First-time setup
 
@@ -189,11 +179,30 @@ mode.
   (global-set-key (kbd "C-`") 'delete-other-windows)
   (global-set-key (kbd "C-s") 'save-buffer)
   (global-set-key (kbd "C-b") 'ibuffer-sidebar-toggle-sidebar)
-  (global-set-key (kbd "C-o") 'menu-find-file-existing)
   (global-set-key (kbd "C-r") 'counsel-recentf)
 ;  (global-set-key (kbd "C-n") 'make-frame) ; 7aram!
 #+END_SRC
 
+*** Graphical file open
+
+Open file with ~C-o~.
+
+#+BEGIN_SRC emacs-lisp
+  (global-set-key (kbd "C-o") 'menu-find-file-existing)
+#+END_SRC
+
+We trick Emacs into opening file dialog with ~C-o~ instead of prompting for a file
+in minibuffer.
+
+#+BEGIN_SRC emacs-lisp
+(defadvice find-file-read-args (around find-file-read-args-always-use-dialog-box act)
+  "Simulate invoking menu item as if by the mouse; see `use-dialog-box'."
+  (let ((last-nonmenu-event nil))
+     ad-do-it))
+#+END_SRC
+
+*** Exit behaviours
+
 The following bindings lead to more natural exit behaviors.
 
 #+BEGIN_SRC emacs-lisp
@@ -211,7 +220,7 @@ The following bindings lead to more natural exit behaviors.
 ** Mouse zoom
 
 The typical binding on both GNU/Linux and MS Windows is adequate here: ~C-=~ to
-zoom, ~C--~ to unzoom.
+zoom in, ~C--~ to zoom out.
 
 #+BEGIN_SRC emacs-lisp
 (global-set-key (kbd "C--") 'text-scale-decrease)
@@ -322,9 +331,12 @@ First, we hide markup symbols for *bold*, /italic/, _underlined_ and +strikethro
 text, and ensure our document appears indented upon loading:[fn::It /appears/
 indented, but the underlying plaintext file does not contain tab characters!]
 
+For the time being, I will in fact display emphasis markers, because hiding
+them corrupts tables.
+
 #+NAME: org-basic
 #+BEGIN_SRC emacs-lisp
-  (setq org-hide-emphasis-markers t)
+;;  (setq org-hide-emphasis-markers t)
   (setq org-startup-indented t)
 #+END_SRC
 
@@ -347,7 +359,9 @@ normally found in Word:
   - Of lists!
 - (Rendered with pretty bullets in Emacs)
 
-*** Org-bullets
+*** ~org-bullets~
+
+No need for ~org-bullets~. MS Windows garbles the 3^{rd} level bullet.
 
 The following prettifies Org mode heading bullets:
 
@@ -369,7 +383,7 @@ The following prettifies Org mode heading bullets:
 
 The agenda displays a chronological list of headings across all agenda files
 for which the heading or body contain a matching =org-time-stamp=.[fn::An
-=org-time-stamp= can be inserted with =C-c .= (period)]
+~org-time-stamp~ can be inserted with ~C-c .~ (period)]
 
 #+BEGIN_SRC emacs-lisp
 (global-set-key (kbd "C-c a") 'org-agenda-list)
@@ -483,7 +497,7 @@ LaTeX \rightarrow PDF.
 (add-hook 'xref-backend-functions #'dumb-jump-xref-activate)
 #+END_SRC
 
-** gnuplot
+** ~gnuplot~
 
 #+BEGIN_SRC emacs-lisp
 (use-package gnuplot)
@@ -515,7 +529,10 @@ LaTeX \rightarrow PDF.
 ;        (local-set-key (quote mouse-2) (quote ibuffer-mouse-toggle-mark))))
 #+END_SRC
 
-** Which-key
+** TODO Sidebar
+Get inspiration from ~ibuffer-sidebar~ and create a better sidebar.
+
+** ~which-key~
 
 #+BEGIN_SRC emacs-lisp
 (use-package which-key
@@ -528,14 +545,14 @@ LaTeX \rightarrow PDF.
 )
 #+END_SRC
 
-** Company
+** ~company~
 
 #+NAME: company
 #+BEGIN_SRC emacs-lisp
 ;  (add-hook 'after-init-hook 'global-company-mode)
 #+END_SRC
 
-** Flycheck
+** ~flycheck~
 
 #+NAME: flycheck
 #+BEGIN_SRC emacs-lisp
@@ -543,13 +560,13 @@ LaTeX \rightarrow PDF.
  :init (global-flycheck-mode))
 #+END_SRC
 
-** CSV
+** ~csv-mode~
 
 #+BEGIN_SRC emacs-lisp
   (use-package csv-mode)
 #+END_SRC
 
-** JSON
+** ~json-mode~
 
 Oí, Jason!
 
@@ -557,21 +574,21 @@ Oí, Jason!
   (use-package json-mode)
 #+END_SRC
 
-** Magit
+** ~magit~
 
 #+BEGIN_SRC emacs-lisp
   (use-package magit
    :bind ("C-c g" . magit-status))
 #+END_SRC
 
-** PDF-tools
+** ~pdf-tools~
 
 #+BEGIN_SRC emacs-lisp
 (use-package pdf-tools)
 ;; (pdf-tools-install)
 #+END_SRC
 
-** Dashboard
+** ~dashboard~
 
 We replace the standard welcome screen with our own.
 
@@ -586,7 +603,7 @@ We replace the standard welcome screen with our own.
     (setq dashboard-banner-logo-title "A modern professional text editor."))
 #+END_SRC
 
-** rainbow
+** ~rainbow-mode~
 
 This highlights hexadecimal numbers which look like colors, in that same color.
 
@@ -597,7 +614,7 @@ This highlights hexadecimal numbers which look like colors, in that same color.
     (add-hook 'prog-mode-hook 'rainbow-mode))
 #+END_SRC
 
-** Projectile
+** ~projectile~
 
 This enables us to better manage our =.git= projects.
 
@@ -608,6 +625,12 @@ This enables us to better manage our =.git= projects.
          (setq projectile-completion-system 'ivy))
 #+END_SRC
 
+** ~all-the-icons~
+
+#+BEGIN_SRC emacs-lisp
+(use-package all-the-icons)
+#+END_SRC
+
 ** Better parentheses
 
 #+BEGIN_SRC emacs-lisp
@@ -624,35 +647,50 @@ This enables us to better manage our =.git= projects.
 
 * Cosmetics
 
-** Faces & cursors
+** Cursors
 
-In order to imitate other modern text editors, we'll resort to a blinking bar
+In order to imitate other modern text editors, we resort to a blinking bar
 cursor. We choose red, the most captivating color, because the cursor is
 arguably the region on our screen:
 
 1. most often looked at;
 2. most often searched when lost.
 
-The default cursor already blinks.
-
 *** Default cursor
 
-In files containing only fixed-pitch fonts (i.e. files containing only code),
+In files containing only ~fixed-pitch~ fonts (i.e. files containing only code),
 the cursor becomes a high-visibility box.
 
+In files containing a mix of ~variable-pitch~ and ~fixed-pitch~ fonts, the
+cursor is a more MS Word-like bar.
+
 #+BEGIN_SRC emacs-lisp
 (setq-default cursor-type (quote box))
+(setq-default mixed-pitch-variable-pitch-cursor (quote bar))
 #+END_SRC
 
-*** Mixed pitch in Org mode
+** Faces
+
+- ~default~: Hack
+  - Legible, modern monospace font
+  - Strict, sharp, uncompromising
+- ~fixed-pitch~: Hack
+- ~variable-pitch~: Liberation Sans
+  - Libre alternative to Arial
+- ~org-block~: Hermit
+  - Slightly wider than Hack
+  - More opinionated shapes
+  - Very legible parentheses
+
+*** ~mixed-pitch~
 
-Fixed-pitch and variable-pitch fonts will be used intelligently in all hooked
+Fixed-pitch and variable-pitch faces will be used intelligently in all hooked
 modes.
 
 #+BEGIN_SRC emacs-lisp
   (use-package mixed-pitch
    :hook ((org-mode . mixed-pitch-mode)
-           (Info-mode . mixed-pitch-mode)))
+          (Info-mode . mixed-pitch-mode)))
 #+END_SRC
 
 ** Initial frame
@@ -668,17 +706,13 @@ GNU/Linux. Frame transparency increases when focus is lost.
 
 ** Theme
 
+My custom themes.
+
 #+BEGIN_SRC emacs-lisp
 (setq custom-theme-directory "~/.emacs.d/blendoit/themes/")
 (load-theme 'blendoit-light)
 #+END_SRC
 
-** All the icons
-
-#+BEGIN_SRC emacs-lisp
-(use-package all-the-icons)
-#+END_SRC
-
 * Editing preferences
 
 These customizations enhance editor usability.
@@ -707,15 +741,13 @@ Disable minibuffer scroll bar.
 Originally, I wished to inhibit certain entries in the GUI menus. Not worth the
 effort at this time.
 
-~menu-bar-mode~ is inhibited if on Linux.
-
 #+BEGIN_SRC emacs-lisp
 (setq menu-bar-mode t)
 #+END_SRC
 
 ** Coding standards
 
-This is just a better default.
+This is just a better default. Don't @ me.
 
 #+BEGIN_SRC emacs-lisp
 (setq c-default-style "linux"
@@ -753,6 +785,12 @@ Automatically break lines longer than =fill-column=.
   (run-at-time nil (* 5 60) 'recentf-save-list)
 #+END_SRC
 
+** ~pop-up-frames~
+
+#+BEGIN_SRC emacs-lisp
+;  (setq pop-up-frames (quote graphic-only))
+#+END_SRC
+
 * Late setup
 
 ** Profiling --- stop
diff --git a/blendoit/blendoit-init.pdf b/blendoit/blendoit-init.pdf
index 7d20fb5..99ca243 100644
--- a/blendoit/blendoit-init.pdf
+++ b/blendoit/blendoit-init.pdf
diff --git a/blendoit/themes/blendoit-light-theme.el b/blendoit/themes/blendoit-light-theme.el
index d9b93f4..6f1d59b 100644
--- a/blendoit/themes/blendoit-light-theme.el
+++ b/blendoit/themes/blendoit-light-theme.el
@@ -1,21 +1,20 @@
 (deftheme blendoit-light
-  "Created 2020-08-11.")
+  "Created 2020-08-12.")
 
 (custom-theme-set-faces
  'blendoit-light
- '(fixed-pitch ((t (:family "Dejavu Sans Mono"))))
  '(variable-pitch ((t (:family "Liberation Sans"))))
  '(escape-glyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown"))))
  '(homoglyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown"))))
  '(minibuffer-prompt ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "medium blue"))))
  '(highlight ((t (:underline nil :foreground "#ffffff" :background "#454545"))))
  '(region ((t (:background "light gray"))))
- '(shadow ((t (:foreground "dark gray"))))
+ '(shadow ((t (:foreground "dark slate gray"))))
  '(secondary-selection ((((class color) (min-colors 88) (background light)) (:background "yellow1")) (((class color) (min-colors 88) (background dark)) (:background "SkyBlue4")) (((class color) (min-colors 16) (background light)) (:background "yellow")) (((class color) (min-colors 16) (background dark)) (:background "SkyBlue4")) (((class color) (min-colors 8)) (:foreground "black" :background "cyan")) (t (:inverse-video t))))
  '(trailing-whitespace ((((class color) (background light)) (:background "red1")) (((class color) (background dark)) (:background "red1")) (t (:inverse-video t))))
  '(font-lock-builtin-face ((((class grayscale) (background light)) (:weight bold :foreground "LightGray")) (((class grayscale) (background dark)) (:weight bold :foreground "DimGray")) (((class color) (min-colors 88) (background light)) (:foreground "dark slate blue")) (((class color) (min-colors 88) (background dark)) (:foreground "LightSteelBlue")) (((class color) (min-colors 16) (background light)) (:foreground "Orchid")) (((class color) (min-colors 16) (background dark)) (:foreground "LightSteelBlue")) (((class color) (min-colors 8)) (:weight bold :foreground "blue")) (t (:weight bold))))
  '(font-lock-comment-delimiter-face ((t (:foreground "dim gray" :inherit font-lock-comment-face))))
- '(font-lock-comment-face ((t (:inherit variable-pitch :foreground "slate gray" :slant italic))))
+ '(font-lock-comment-face ((t (:slant italic :foreground "slate gray" :inherit variable-pitch))))
  '(font-lock-constant-face ((t (:foreground "dark cyan"))))
  '(font-lock-function-name-face ((((class color) (min-colors 88) (background light)) (:foreground "Blue1")) (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue")) (((class color) (min-colors 16) (background light)) (:foreground "Blue")) (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue")) (((class color) (min-colors 8)) (:weight bold :foreground "blue")) (t (:weight bold :inverse-video t))))
  '(font-lock-keyword-face ((t (:foreground "DodgerBlue4"))))
@@ -42,30 +41,31 @@
  '(match ((((class color) (min-colors 88) (background light)) (:background "yellow1")) (((class color) (min-colors 88) (background dark)) (:background "RoyalBlue3")) (((class color) (min-colors 8) (background light)) (:foreground "black" :background "yellow")) (((class color) (min-colors 8) (background dark)) (:foreground "white" :background "blue")) (((type tty) (class mono)) (:inverse-video t)) (t (:background "gray"))))
  '(next-error ((t (:inherit region))))
  '(query-replace ((t (:inherit (isearch)))))
- '(org-table ((t (:box (:line-width 2 :color "gainsboro" :style released-button)))))
  '(org-formula ((t (:inherit org-table))))
  '(org-meta-line ((t (:foreground "DodgerBlue3" :family "Hermit"))))
  '(org-document-title ((t (:width normal :height 2.0 :weight bold :slant normal :underline nil :inherit default))))
- '(org-level-1 ((t (:inherit fixed-pitch :height 1.6 :weight bold))))
- '(org-level-2 ((t (:inherit fixed-pitch :height 1.4 :weight bold))))
- '(org-level-3 ((t (:inherit fixed-pitch :weight bold :height 1.2))))
- '(org-level-4 ((t (:inherit fixed-pitch :weight bold :height 1.1))))
- '(org-date ((t (:family "Liberation Serif" :slant italic :foreground "DodgerBlue3" :inherit link))))
+ '(org-level-1 ((t (:weight bold :height 1.6 :inherit fixed-pitch))))
+ '(org-level-2 ((t (:weight bold :height 1.4 :inherit fixed-pitch))))
+ '(org-level-3 ((t (:height 1.2 :weight bold :inherit fixed-pitch))))
+ '(org-level-4 ((t (:height 1.1 :weight bold :inherit fixed-pitch))))
+ '(org-date ((t (:inherit link :foreground "DodgerBlue3" :slant italic :family "Liberation Serif"))))
  '(org-footnote ((t (:foreground "DodgerBlue3" :inherit link))))
- '(org-block ((t (:inherit nil :family "Hermit"))))
  '(org-tag ((t (:inherit link :weight bold :foreground "DodgerBlue3"))))
- '(org-document-info ((t (:inherit org-meta-line))))
  '(link ((t (:foreground "blue" :underline t))))
  '(org-document-info-keyword ((t (:inherit org-meta-line))))
  '(dashboard-heading ((t (:inherit font-lock-keyword-face))))
  '(org-todo ((t (:foreground "Red1" :box 2 :weight bold))))
  '(org-done ((t (:foreground "ForestGreen" :box 2 :weight bold))))
- '(org-code ((t (:inherit default :background "light grey" :foreground "black"))))
+ '(org-code ((t (:background "light grey" :foreground "black"))))
  '(org-checkbox-statistics-todo ((t (:inherit org-todo :box nil))))
  '(org-checkbox-statistics-done ((t (:inherit org-done :box nil))))
  '(org-verbatim ((t (:inherit shadow))))
  '(font-lock-doc-face ((t (:inherit font-lock-string-face))))
- '(default ((t (:background "white" :foreground "black" :height 120 :family "Liberation Mono"))))
- '(cursor ((t (:background "orange red")))))
+ '(cursor ((t (:background "red"))))
+ '(org-document-info ((t (:weight bold :inherit variable-pitch))))
+ '(fixed-pitch ((t (:family "Hack"))))
+ '(org-table ((t (:box (:line-width 1 :color "light slate gray") :foreground "dark slate gray" :inherit fixed-pitch))))
+ '(org-block ((t (:family "Hermit"))))
+ '(default ((t (:background "white" :foreground "black" :height 120 :family "Hermit")))))
 
 (provide-theme 'blendoit-light)
diff --git a/fonts/Hack/Hack-Bold.ttf b/fonts/Hack/Hack-Bold.ttf
new file mode 100644
index 0000000..7ff4975
--- /dev/null
+++ b/fonts/Hack/Hack-Bold.ttf
diff --git a/fonts/Hack/Hack-BoldItalic.ttf b/fonts/Hack/Hack-BoldItalic.ttf
new file mode 100644
index 0000000..3b137d9
--- /dev/null
+++ b/fonts/Hack/Hack-BoldItalic.ttf
diff --git a/fonts/Hack/Hack-Italic.ttf b/fonts/Hack/Hack-Italic.ttf
new file mode 100644
index 0000000..d26198a
--- /dev/null
+++ b/fonts/Hack/Hack-Italic.ttf
diff --git a/fonts/Hack/Hack-Regular.ttf b/fonts/Hack/Hack-Regular.ttf
new file mode 100644
index 0000000..92a90cb
--- /dev/null
+++ b/fonts/Hack/Hack-Regular.ttf
diff --git a/init-custom.el b/init-custom.el
index 0f4052f..934a04d 100644
--- a/init-custom.el
+++ b/init-custom.el
@@ -14,11 +14,11 @@
  '(company-quickhelp-color-background "#4F4F4F")
  '(company-quickhelp-color-foreground "#DCDCCC")
  '(cua-mode t nil (cua-base))
- '(cursor-type (quote bar))
+ '(cursor-type (quote box))
  '(custom-enabled-themes nil)
  '(custom-safe-themes
    (quote
-    ("f1fbfdf754abcb5750dab511234b09c032ce27d4fb9fd9ccadf1f6513f0a302f" "a8481da2702722465d02eb2e2fa64346efea54b56fca021b3a4bb08a2a6924d3" "6264d1df6969ac03691d2d2cf97ea094f18cef56aadf8bd7a49c5544fde875f0" "c00103d5b31a23fc69b34dfaa53f07b5cbf99140ba80b1c33a6cf591d852ac69" "92d2a65936bd89f546493d6b39cff290f07d6590e88bf783e49be344b26e2295" "3d9f10204f74e105d0f8740eeb8de0b12f0cae6a6ae05cbd09f8755dcf684a89" default)))
+    ("5905eb65478e7ae1ac993502481f8f3352d2c65f5c07930f901563d8dd7ab1dc" "3e4255b87df3114cb13315044d5bb5e91f53de4cdd64923f27e6eb6cc653dfb7" "8aa395f600d8957d85cf6de4eeb185aa08f87bc2186b8e3759c771b8731e51be" "653a2633bcfb22c7977c82420c39993bc797687bdeb8d842d28c1ed135874560" "351d80f016f726b9cd27ee79e636ee13e54bd6eb798c25bb33b114c7bbc38f66" "85781ac6bf70cb94379643b8ba3cb27ac5ffcc22842adcaae5ed64d54b91ce97" "d7ece026ead3a816996f4461c1bae8d9103e721777ed9debae2a43f5dfccb422" "5e39e3abf1b40630b886917e0aa26b34ad100b8f838d326f809053e7ac9cf1f0" "3b8d0b86c59b23202e7b3fe89ffdcdaab08871801aeb26022a6fea2926f29d65" "073f9f5ff9eadf602b83443a845067aea4323e474b7b4bb6fc1576c25bcdd5c3" "b954c5869a887bc9ef43dc5a85bb8c8603110eebddff08c4aa02d5a7f91ff03d" "95f9ae541265ff365afe5ef541cb7f368ac307b4c1f31d9ae6b0bad72ad38b66" "f6abee55f89679db94f5d819a000dcb957d2bb10097bf9d9c13b49f526c56aaf" "f25ac98a3f3a864dbd9055e52cd9b9372f9c25a1a0df0115f2f878d6d333c5a6" "1009a1caad8d054da999e6ee9d16aee3d793384a6baabc2576241724774d0322" "c5091f06090343124a99641f20f1568e30c077564d80a6ca56571b904c04010b" "286398d1be769c865473b94e83012423577c36fe5898308a56b15e1daccf96ea" "4ccd088b7b96c006c4cbcb47e87d6995e633d86eaf1edcc3eb3836d6ef0d0c96" "9c5262b007959013e7eb270ca136d68632963896269cb33b8ddf65678737a8c6" "6b16bb9a683713d4298a003fab718ba6619927558e05a500a2d1846201547ffa" "c8a7eb47263f0d2efb76b98a4d923ef50a563c300d2ae354cbea693f74523e8e" "c5f0718491c897f14f827dbb4076b64d18ef80c5303635b62b3e5fdf5eae27ec" "50f02bc9f6e48be88485985b0820318b124edd5609aff1663e602bc4a9648e8b" "67a1cc0bb3073bdc4b40116371c8d9568d9c85fb61ebcd439964bd86a3f7541f" "61a9f73cd7959c7c10c0587f6c9f6a606c9635c6e350cc725ac916f0c2be4e04" "f1fbfdf754abcb5750dab511234b09c032ce27d4fb9fd9ccadf1f6513f0a302f" "a8481da2702722465d02eb2e2fa64346efea54b56fca021b3a4bb08a2a6924d3" "6264d1df6969ac03691d2d2cf97ea094f18cef56aadf8bd7a49c5544fde875f0" "c00103d5b31a23fc69b34dfaa53f07b5cbf99140ba80b1c33a6cf591d852ac69" "92d2a65936bd89f546493d6b39cff290f07d6590e88bf783e49be344b26e2295" "3d9f10204f74e105d0f8740eeb8de0b12f0cae6a6ae05cbd09f8755dcf684a89" default)))
  '(custom-theme-directory "~/.emacs.d/blendoit/themes/")
  '(fci-rule-color "#383838")
  '(fill-column 79)
@@ -37,14 +37,11 @@
      ("budget" "%(binary) -f %(ledger-file) budget --exchange USD"))))
  '(line-number-mode nil)
  '(message-required-headers (quote ((optional . References) From)))
- '(mixed-pitch-variable-pitch-cursor (quote bar))
  '(nrepl-message-colors
    (quote
     ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3")))
  '(org-agenda-diary-file "~/org/PERSONAL/diary/diary.org")
- '(org-agenda-files
-   (quote
-    ("~/org/PERSONAL/workout/workout.org" "~/org/WORK/Safran/programs/MA700/notes/MA700-notes.org_archive" "~/org/WORK/Safran/programs/MA700/notes/MA700-notes.org" "~/org/PERSONAL/diary/log.org" "~/org/WORK/Safran/programs/B787/VIP/timeline.org" "~/org/PERSONAL/diary/diary.org" "~/org/WORK/Safran/programs/WFH/WFH-notes.org_archive" "~/org/WORK/Safran/programs/WFH/WFH-notes.org" "~/org/WORK/Safran/programs/PHM/PHM-notes.org_archive" "~/org/WORK/Safran/programs/MRJ/test-fixture-status.org" "~/org/WORK/Safran/programs/MRJ/MRJ-notes.org" "~/org/WORK/Safran/programs/A220/A220-notes.org" "~/org/PERSONAL/projects/projects.org" "~/org/PERSONAL/schedule-personal.org" "~/org/WORK/Safran/schedule-Safran.org" "~/org/people.org")))
+ '(org-agenda-files (quote ("~/org/PERSONAL/diary/diary.org")))
  '(org-agenda-include-diary t)
  '(org-agenda-insert-diary-strategy (quote date-tree-last))
  '(org-agenda-skip-scheduled-if-deadline-is-shown (quote not-today))
@@ -132,4 +129,4 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(default ((t (:family "Liberation Mono" :slant normal :weight normal :height 120 :width normal)))))
+ '(default ((t (:family "Hack" :slant normal :weight normal :height 122 :width normal)))))
diff --git a/templates/documents/general.org b/templates/documents/general.org
new file mode 100644
index 0000000..1bca0b2
--- /dev/null
+++ b/templates/documents/general.org
@@ -0,0 +1,34 @@
+# -*- mode: org; -*-
+
+#+OPTIONS: tags:nil
+
+#+LATEX_CLASS: article
+
+#+LATEX_HEADER: \usepackage[left=1in,right=1in,top=1in,bottom=1.75in]{geometry}
+#+LATEX_HEADER: \usepackage{fourier}
+
+#+LATEX_HEADER: \usepackage{caption} 
+#+LATEX_HEADER: \captionsetup[table]{skip=1ex}
+
+# #+LATEX_HEADER: \usepackage[compact]{titlesec}
+# #+LATEX_HEADER: \usepackage[section]{placeins}
+
+#+LATEX_HEADER: \usepackage{lastpage}
+#+LATEX_HEADER: \usepackage{titling}
+#+LATEX_HEADER: \usepackage{enumitem}
+#+LATEX_HEADER: \setlist{noitemsep}
+
+# Required to reset numbering of table rows from table to table.
+#+LATEX_HEADER: \usepackage{etoolbox}
+#+LATEX_HEADER: \makeatletter
+#+LATEX_HEADER: \gpreto\tabular{\renewcommand{\arraystretch}{1.4}\rownum=\z@}
+#+LATEX_HEADER: \makeatother
+
+#+LATEX_HEADER: \usepackage{fancyhdr}
+#+LATEX_HEADER: \setlength{\headheight}{40pt}
+#+LATEX_HEADER_EXTRA: \pagestyle{fancy}
+#+LATEX_HEADER_EXTRA: \fancyhead[L]{\rule[-12pt]{0pt}{0pt}\theauthor}
+#+LATEX_HEADER_EXTRA: \fancyhead[C]{\large\textbf{\thetitle}}
+#+LATEX_HEADER_EXTRA: \fancyhead[R]{\thedate}
+#+LATEX_HEADER_EXTRA: \renewcommand{\headrulewidth}{1.4pt}
+#+LATEX_HEADER_EXTRA: \fancyfoot[C]{Page \thepage/\pageref*{LastPage}\\ \hrulefill \\ \footnotesize Copyright \copyright~2020 Marius Peter. All rights reserved.}
diff --git a/templates/documents/general.org_title b/templates/documents/general.org_title
new file mode 100644
index 0000000..3cf4431
--- /dev/null
+++ b/templates/documents/general.org_title
@@ -0,0 +1,14 @@
+#+OPTIONS: title:nil toc:nil
+# Increase spacing between header rule and main text body
+#+LATEX: \rule[-2in]{0pt}{0pt}\\
+#+LATEX: \Huge\textbf{\thetitle}\\[1in]
+#+LATEX: \LARGE\theauthor\\
+#+LATEX: \thedate
+
+#+LATEX: \clearpage
+
+#+LATEX: \normalsize
+#+LATEX: \tableofcontents
+#+LATEX: \listoffigures
+#+LATEX: \listoftables
+#+LATEX: \clearpage
diff --git a/templates/documents/safran-report-MA700.org_title b/templates/documents/safran-report-MA700.org_title
new file mode 100644
index 0000000..25fa621
--- /dev/null
+++ b/templates/documents/safran-report-MA700.org_title
@@ -0,0 +1,43 @@
+# -*- mode: org; -*-
+
+# Document number and rev in top-right header
+#+LATEX_HEADER_EXTRA: \fancyhead[R]{80000-XXX Rev. A\\ \thedate}
+# Increase spacing between header rule and main text body
+#+LATEX: \rule[-16pt]{0pt}{16pt}\\
+#+LATEX: \huge
+#+LATEX: \bgroup
+#+LATEX: \def\arraystretch{1.4}
+#+LATEX: \noindent
+#+ATTR_LATEX: :center nil
+| \textsc{Document:} | 80000-XXX       |
+| \textsc{Revision:} | A               |
+| \textsc{Program:}  | XAC MA700       |
+| \textsc{Title:}    | \thetitle       |
+| \textsc{System:}   | Water and Waste |
+| \textsc{ATA No:}   | XXX             |
+| \textsc{ECCN:}     | XXX             |
+
+#+LATEX: \vfill
+#+LATEX: \noindent
+#+LATEX: \large
+*Original Signatures*
+#+LATEX: \vspace{1.0cm}
+
+#+LATEX: \noindent
+#+ATTR_LATEX: :center nil
+| *Prepared:* | \rule{7.0cm}{1pt}                   | *Date:* | \rule{3.0cm}{1pt} |
+|             | Marius Peter, Systems Test Engineer |         |                   |
+|             |                                     |         |                   |
+| *Checked:*  | \rule{7.0cm}{1pt}                   | *Date:* | \rule{3.0cm}{1pt} |
+|             | Richard Bourne, Sr Systems Engineer |         |                   |
+|             |                                     |         |                   |
+| *Approved:* | \rule{7.0cm}{1pt}                   | *Date:* | \rule{3.0cm}{1pt} |
+|             | Tim Morse, Chief Sr Engineer        |         |                   |
+#+LATEX: \egroup
+
+#+LATEX: \normalsize
+#+LATEX: \clearpage
+#+LATEX: \tableofcontents
+#+LATEX: \listoffigures
+#+LATEX: \listoftables
+#+LATEX: \clearpage
diff --git a/templates/documents/safran-report.org b/templates/documents/safran-report.org
new file mode 100644
index 0000000..d62bfff
--- /dev/null
+++ b/templates/documents/safran-report.org
@@ -0,0 +1,24 @@
+# -*- mode: org; -*-
+
+#+LATEX_CLASS: article
+
+#+LATEX_HEADER: \usepackage[left=1in,right=1in,top=1in,bottom=1.75in]{geometry}
+#+LATEX_HEADER: \usepackage{fourier}
+
+# For referencing the Org document title in the text body and fancy header
+#+LATEX_HEADER: \usepackage{titling}
+
+# For page numbering purposes
+#+LATEX_HEADER: \usepackage{lastpage}
+
+# Keep 'em lists compact!
+#+LATEX_HEADER: \usepackage{enumitem}
+#+LATEX_HEADER: \setlist{noitemsep}
+
+#+LATEX_HEADER: \usepackage{fancyhdr}
+#+LATEX_HEADER: \setlength{\headheight}{40pt}
+#+LATEX_HEADER_EXTRA: \pagestyle{fancy}
+#+LATEX_HEADER_EXTRA: \fancyhead[L]{\rule[-20pt]{0pt}{0pt} \includegraphics[height=20pt]{~/org/templates/documents/Safran_logo.png}}
+#+LATEX_HEADER_EXTRA: \fancyhead[R]{\thetitle \\ \thedate}
+#+LATEX_HEADER_EXTRA: \renewcommand{\headrulewidth}{1.2pt}
+#+LATEX_HEADER_EXTRA: \fancyfoot[C]{Page~\thepage~of~\pageref*{LastPage}\\ \hrulefill \\ \footnotesize This document contains proprietary information of \texttt{Safran Passenger Solutions}. This information may not, in whole or in part, be duplicated, reproduced, disclosed, or used in any way except as expressly authorized in writing by \texttt{Safran Passenger Solutions}.}