From 20b5b9181c083998e7bcc555234dcef8e4e25282 Mon Sep 17 00:00:00 2001 From: Blendoit Date: Sat, 5 Sep 2020 20:53:38 -0700 Subject: Significant logic reorg in literate config. --- blendoit/blendoit-init.org | 493 +++++++++++++++++++++-------------------- blendoit/blendoit-init.pdf | Bin 218887 -> 219662 bytes init-custom.el | 8 +- snippets/org-mode/org-basic | 4 +- themes/blendoit-light-theme.el | 17 +- 5 files changed, 266 insertions(+), 256 deletions(-) diff --git a/blendoit/blendoit-init.org b/blendoit/blendoit-init.org index 621b20f..fafaa5e 100644 --- a/blendoit/blendoit-init.org +++ b/blendoit/blendoit-init.org @@ -22,47 +22,40 @@ and comments in view of publication: this is the endgame of \textit{literate programming}. \end{abstract} -# * Test +* Introduction +:PROPERTIES: +:UNNUMBERED: t +:END: -# #+BEGIN_SRC emacs-lisp -# (org-babel-load-file "~/.emacs.d/blendoit/test.org") -# #+END_SRC - -# * 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 following sections were laid out very deliberately, so that our Emacs Lisp +environment loads in a logical fashion. For instance, we only begin loading +packages once we ensured ~use-package~ was working properly. * TODO First-time setup Spacemacs-like dialog for default settings. #+NAME: first-setup -#+BEGIN_SRC emacs-lisp - ;; Prompt enterprise or personal install. Create file in .emacs.d/ on Linux, - ;; AppData/ on Windows. Ask user for details and preferred bindings. - - ; Check if .emacs.d exists - - ; If it does, warn user - - ; Copy init-bootstrap.el from USB to where operating systems expects init.el - - ;; (defun blendoit/first-time-setup-windows-nt () - ;; "Execute the first-time setup on MS Windows. - ;; If no `.emacs.d/' config exists on local system, copy - ;; init-bootstrap.el to `~.emacs.d/'." - ;; (interactive) - ;; (find-file "~/.emacs.d/blendoit/blendoit-init.org")) - - - - ;; (cond ((string-equal system-type "windows-nt")blendoit/first-time-setup-windows-nt) - ;; ((string-equal system-type "gnu/linux") blendoit/first-time-setup-linux)) -#+END_SRC +# #+BEGIN_SRC emacs-lisp +# ;; Prompt enterprise or personal install. Create file in .emacs.d/ on Linux, +# ;; AppData/ on Windows. Ask user for details and preferred bindings. +# +# ; Check if .emacs.d exists +# +# ; If it does, warn user +# +# ; Copy init-bootstrap.el from USB to where operating systems expects init.el +# +# ;; (defun blendoit/first-time-setup-windows-nt () +# ;; "Execute the first-time setup on MS Windows. +# ;; If no `.emacs.d/' config exists on local system, copy +# ;; init-bootstrap.el to `~.emacs.d/'." +# ;; (interactive) +# ;; (find-file "~/.emacs.d/blendoit/blendoit-init.org")) +# +# ;; (cond ((string-equal system-type "windows-nt")blendoit/first-time-setup-windows-nt) +# ;; ((string-equal system-type "gnu/linux") blendoit/first-time-setup-linux)) +# #+END_SRC ** File system paths @@ -88,6 +81,16 @@ activated. (setq gc-cons-threshold 100000000) #+END_SRC +** Profiling --- start + +We start the profiler now , and will interrupt it in section [[Profiling --- +stop]]. We will then present profiling report in section [[Profiling --- report]]. + +#+NAME: profiler-start +#+BEGIN_SRC emacs-lisp +; (profiler-start) +#+END_SRC + ** Emacs client Makes opening emacs faster for following instances. @@ -111,19 +114,10 @@ user-emacs-directory (load custom-file) #+END_SRC -** Profiling --- start - -We start the profiler now , and will interrupt it in section [[Profiling --- -stop]]. We will then present profiling report in section [[Profiling --- report]]. - -#+NAME: profiler-start -#+BEGIN_SRC emacs-lisp -; (profiler-start) -#+END_SRC - ** Customization shortcuts -We begin by defining a user shortcut to this very file: +We begin by defining a user shortcut to this very file. We load this as early as +possible, this facilitates debugging. #+NAME: shortcut-config #+BEGIN_SRC emacs-lisp @@ -159,6 +153,29 @@ to this file. ) #+END_SRC +** Initial and default frames + +We set the dimensions of the inital and default frames. + +#+BEGIN_SRC emacs-lisp + (add-to-list 'default-frame-alist '(width . 100)) + (add-to-list 'default-frame-alist '(height . 32)) + + (add-to-list 'initial-frame-alist '(width . 100)) + (add-to-list 'initial-frame-alist '(height . 32)) +#+END_SRC + +*** GNU/Linux + +These settings affect the first and subsequent frames spawned by Emacs in +GNU/Linux. Frame transparency increases when focus is lost. + +#+BEGIN_SRC emacs-lisp + (when (and (display-graphic-p) (string-equal system-type "gnu/linux")) + (set-frame-parameter (selected-frame) 'alpha '(90 . 50)) + (add-to-list 'default-frame-alist '(alpha . (90 . 50)))) +#+END_SRC + ** Secrets #+INCLUDE: ./secrets.org @@ -210,6 +227,8 @@ The following bindings lead to more natural exit behaviors. The typical binding on both GNU/Linux and MS Windows is adequate here: ~C-=~ to zoom in, ~C--~ to zoom out. +It seems that starting with Emacs 27.1, Control + mousewheel works. + #+BEGIN_SRC emacs-lisp (global-set-key (kbd "C--") 'text-scale-decrease) (global-set-key (kbd "C-=") 'text-scale-increase) @@ -224,7 +243,7 @@ Packages are collections of =.el= files providing added functionality to Emacs. List of package archives. -#+NAME: packages +#+NAME: package-archives #+BEGIN_SRC emacs-lisp (require 'package) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) @@ -232,10 +251,18 @@ List of package archives. (package-initialize) #+END_SRC +** TODO Convenient package update + +One-function rollup of upgradeable package tagging, download and lazy install. + +#+BEGIN_SRC + +#+END_SRC + ** ~use-package~ -Ensure =use-package= is installed, as well as all packages described in this -configuration file. +First and foremost, we ensure =use-package= is installed, as well as all +packages described in this configuration file. #+BEGIN_SRC emacs-lisp (unless (package-installed-p 'use-package) @@ -247,56 +274,6 @@ configuration file. (require 'bind-key) #+END_SRC -** TODO Convenient package update - -One-function rollup of upgradeable package tagging, download and lazy install. - -#+BEGIN_SRC - -#+END_SRC - -** ~ivy~ - -Auto completion. - -#+BEGIN_SRC emacs-lisp - (use-package ivy - :config - (setq ivy-use-virtual-buffers t - ivy-count-format "%d/%d " - enable-recursive-minibuffers t)) - (ivy-mode t) -#+END_SRC - -*** ~counsel~ - - Wonderful counsellor! - -#+BEGIN_SRC emacs-lisp - (use-package counsel - :bind ("M-x" . counsel-M-x) - :config (counsel-mode t)) - - (global-set-key (kbd "C-f") 'counsel-grep-or-swiper) -#+END_SRC - -*** ~swiper~ - -#+BEGIN_SRC emacs-lisp -(use-package swiper - :bind (("C-f" . counsel-grep-or-swiper))) -#+END_SRC - -** TODO ~evil-mode~ - -Forgive me, for I have sinned. - -#+BEGIN_SRC emacs-lisp - (use-package evil) -; (setq evil-toggle-key "C-c d") ; devil... -; (evil-mode 1) -#+END_SRC - ** ~org-mode~ Phew, I can finally introduce Org mode! I am so *excited*. @@ -304,10 +281,10 @@ Phew, I can finally introduce Org mode! I am so *excited*. Org mode replaces aword processor, a presentation creator, and a spreadsheet editor. IMHO, the spreadsheet ability captures more than 80% use cases wherein one wishes to include a table in a text document destined for physical -publication. (It is clear that Excel spreadsheets are /not/ destined for physical -publication---simply attempt to print an Excel spreadsheet with the default -settings.) In my opinion, Org mode matches all /useful/ features of the -Microsoft Office suite 1-to-1. +publication. (It is clear that Excel spreadsheets are /not/ destined for +physical publication---simply attempt to print an Excel spreadsheet with the +default settings.) In my opinion, Org mode matches all /useful/ features of +the Microsoft Office suite 1-to-1. What follows are customizations designed to make Org mode behave more like Microsoft Word. The end goal is, once again, to draw as many new users to Emacs @@ -322,9 +299,10 @@ Org base directory is in user home on GNU/Linux, or in =AppData= in MS Windows. (setq org-directory (concat user-emacs-directory "~/org")) #+END_SRC -First, we hide markup symbols for *bold*, /italic/, _underlined_ and +strikethrough+ -text, and ensure our document appears indented upon loading:[fn::It /appears/ -indented, but the underlying plaintext file does not contain tab characters!] +First, we hide markup symbols for *bold*, /italic/, _underlined_ and ++strikethrough+ 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. @@ -375,12 +353,14 @@ format: *** LaTeX export -The following makes =CLOSED= items appear green in LaTeX. Very stylish, much -flair! +The following makes =TODO= items appear red and =CLOSED= items appear green in +Org's LaTeX exports. Very stylish, much flair! #+BEGIN_SRC emacs-lisp + (setq org-latex-active-timestamp-format + "\\textcolor{SteelBlue}{\\texttt{%s}}") (setq org-latex-inactive-timestamp-format - "\\textcolor{ForestGreen!60}{\\textit{%s}}") + "\\textcolor{ForestGreen}{\\texttt{%s}}") #+END_SRC *** Publish @@ -402,17 +382,14 @@ because an online tutorial recommended we do so. :auto-preamble t :auto-sitemap t :sitemap-title "" ) - ("Safran-VIP-static" :base-directory "~/org/WORK/Safran/programs/B787/VIP/doc/org/" :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|mp4\\|ogg\\|swf" :publishing-directory "~/org/WORK/Safran/programs/B787/VIP/doc/wiki/" :recursive t :publishing-function org-publish-attachment ) - ("Safran-VIP-all" :components ("Safran-VIP-html" "Safran-VIP-static")) - ("Safran-MA700-html" :base-directory "~/org/WORK/Safran/programs/MA700/doc/org/" :base-extension "org" @@ -422,23 +399,14 @@ because an online tutorial recommended we do so. :auto-preamble t :auto-sitemap t :sitemap-title "" ) - ("Safran-MA700-static" :base-directory "~/org/WORK/Safran/programs/MA700/doc/org/" :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|mp4\\|ogg\\|swf" :publishing-directory "~/org/WORK/Safran/programs/MA700/doc/wiki/" :recursive t :publishing-function org-publish-attachment ) - ("Safran-MA700-all" :components ("Safran-MA700-html" "Safran-MA700-static")))) - - (add-to-list 'org-latex-packages-alist '("table" "xcolor" - t ("pdflatex"))) - (add-to-list 'org-latex-packages-alist '("AUTO" "babel" - t ("pdflatex"))) - (add-to-list 'org-latex-packages-alist '("AUTO" "polyglossia" - t ("xelatex" "lualatex"))) #+END_SRC *** Export @@ -456,42 +424,80 @@ LaTeX \rightarrow PDF. (global-set-key (kbd "C-c e") 'my/org-quick-export) #+END_SRC -** ~undo-tree~ +** TODO ~evil-mode~ + +Forgive me, for I have sinned. + +This is the 2^{nd} most significant customization after ~org-mode~. Enabling +~evil-mode~ completely changes editing keys. For more information on =vi= +keybindings, visit [[https://hea-www.harvard.edu/~fine/Tech/vi.html]]. #+BEGIN_SRC emacs-lisp -(global-undo-tree-mode) + (use-package evil) +; (setq evil-toggle-key "C-c d") ; devil... +; (evil-mode 1) #+END_SRC -** ~dumb-jump~ +** Spelling, completion, and snippets +The following customizations open the doors to vastly increased typing speed +and accuracy. + +*** ~flycheck~ + +Syntax highlighting for Emacs. + +#+NAME: flycheck #+BEGIN_SRC emacs-lisp -(use-package dumb-jump) -(add-hook 'xref-backend-functions #'dumb-jump-xref-activate) + (use-package flycheck) + (global-flycheck-mode) #+END_SRC -** ~gnuplot~ +*** TODO ~flyspell~ +#+NAME: flyspell #+BEGIN_SRC emacs-lisp -(use-package gnuplot) + (add-hook 'text-mode-hook 'flyspell-mode) #+END_SRC -** ~ledger~ +*** ~yas-nippet~ +#+NAME: yasnippet #+BEGIN_SRC emacs-lisp - (use-package ledger-mode - :bind - ("C-c r" . ledger-report) - ("C-c C" . ledger-mode-clean-buffer)) +(use-package yasnippet) +(yas-global-mode 1) #+END_SRC -** TODO Sidebar -Get inspiration from ~ibuffer-sidebar~ and create a better sidebar. +*** ~company~ +#+NAME: company #+BEGIN_SRC emacs-lisp -;; (load-file) +; (add-hook 'after-init-hook 'global-company-mode) +#+END_SRC + +** Utilities +*** ~magit~ + +Wonderful Git porcelain for Emacs. Enables the administration of a Git +repository in a pain-free way. + +#+BEGIN_SRC emacs-lisp + (use-package magit + :bind ("C-c g" . magit-status)) +#+END_SRC + +*** ~projectile~ + +This enables us to better manage our =.git= projects. + +#+BEGIN_SRC emacs-lisp + (use-package projectile + :bind ("C-c p" . 'projectile-command-map) + :init (projectile-mode 1) + (setq projectile-completion-system 'ivy)) #+END_SRC -** ~which-key~ +*** ~which-key~ #+BEGIN_SRC emacs-lisp (use-package which-key @@ -504,75 +510,84 @@ Get inspiration from ~ibuffer-sidebar~ and create a better sidebar. ) #+END_SRC -** ~company~ +*** ~dumb-jump~ -#+NAME: company #+BEGIN_SRC emacs-lisp -; (add-hook 'after-init-hook 'global-company-mode) +(use-package dumb-jump) +(add-hook 'xref-backend-functions #'dumb-jump-xref-activate) #+END_SRC -** ~powerline~ +*** ~undo-tree~ -#+NAME: powerline #+BEGIN_SRC emacs-lisp -(use-package powerline) -(powerline-default-theme) +(global-undo-tree-mode) #+END_SRC -** ~yasnippet~ +*** ~ivy~ + +Auto completion. -#+NAME: yasnippet #+BEGIN_SRC emacs-lisp -(use-package yasnippet) -(yas-global-mode 1) + (use-package ivy + :config + (setq ivy-use-virtual-buffers t + ivy-count-format "%d/%d " + enable-recursive-minibuffers t)) + (ivy-mode t) #+END_SRC -** ~flycheck~ +**** ~counsel~ + + Wonderful counsellor! -#+NAME: flycheck #+BEGIN_SRC emacs-lisp -(use-package flycheck - :init (global-flycheck-mode)) + (use-package counsel + :bind ("M-x" . counsel-M-x) + :config (counsel-mode t)) + + (global-set-key (kbd "C-f") 'counsel-grep-or-swiper) #+END_SRC -** TODO ~flyspell~ +**** ~swiper~ -#+NAME: flyspell #+BEGIN_SRC emacs-lisp - +(use-package swiper + :bind (("C-f" . counsel-grep-or-swiper))) #+END_SRC -** ~csv-mode~ +** File formats + +*** ~csv-mode~ #+BEGIN_SRC emacs-lisp (use-package csv-mode) #+END_SRC -** ~json-mode~ - -Oí, Jason! - -Not needed in 27.1? +*** ~pdf-tools~ #+BEGIN_SRC emacs-lisp -; (use-package json-mode) +(use-package pdf-tools) +;; (pdf-tools-install) #+END_SRC -** ~magit~ +*** ~ledger~ #+BEGIN_SRC emacs-lisp - (use-package magit - :bind ("C-c g" . magit-status)) + (use-package ledger-mode + :bind + ("C-c r" . ledger-report) + ("C-c C" . ledger-mode-clean-buffer)) #+END_SRC -** ~pdf-tools~ +*** ~gnuplot~ #+BEGIN_SRC emacs-lisp -(use-package pdf-tools) -;; (pdf-tools-install) +(use-package gnuplot) #+END_SRC -** ~dashboard~ +** Cosmetics + +*** ~dashboard~ We replace the standard welcome screen with our own. @@ -587,7 +602,36 @@ We replace the standard welcome screen with our own. (setq dashboard-banner-logo-title "A modern professional text editor.")) #+END_SRC -** ~rainbow-mode~ +*** ~powerline~ + +#+NAME: powerline +#+BEGIN_SRC emacs-lisp +(use-package powerline) +(powerline-default-theme) +#+END_SRC + +*** TODO Sidebar +Get inspiration from ~ibuffer-sidebar~ and create a better sidebar. + +#+BEGIN_SRC emacs-lisp +;; (load-file) +#+END_SRC + +*** Better parentheses + +#+BEGIN_SRC emacs-lisp +(use-package rainbow-delimiters + :config (add-hook 'prog-mode-hook #'rainbow-delimiters-mode)) +(electric-pair-mode) +#+END_SRC + +*** ~all-the-icons~ + +#+BEGIN_SRC emacs-lisp +(use-package all-the-icons) +#+END_SRC + +*** ~rainbow-mode~ This highlights hexadecimal numbers which look like colors, in that same color. @@ -598,34 +642,48 @@ This highlights hexadecimal numbers which look like colors, in that same color. (add-hook 'prog-mode-hook 'rainbow-mode)) #+END_SRC -** ~projectile~ +* Theme -This enables us to better manage our =.git= projects. +We load my custom theme. #+BEGIN_SRC emacs-lisp - (use-package projectile - :bind ("C-c p" . 'projectile-command-map) - :init (projectile-mode 1) - (setq projectile-completion-system 'ivy)) +(setq custom-theme-directory (concat user-emacs-directory "themes/")) +(load-theme 'blendoit-light) +; (load-theme 'blendoit-dark) #+END_SRC -** ~all-the-icons~ +** My light and dark themes -#+BEGIN_SRC emacs-lisp -(use-package all-the-icons) -#+END_SRC +A highly legible unambiguous and thoughtful theme. -** Better parentheses +*** Colors -#+BEGIN_SRC emacs-lisp -(use-package rainbow-delimiters - :config (add-hook 'prog-mode-hook #'rainbow-delimiters-mode)) -(electric-pair-mode) -#+END_SRC +The default face is a black foreground on a white background, this matches MS +Word. We are striving for a simple, intuitive color scheme. + +Most of the visual cues derived from color are identical in both light and dark +themes (Table [[theme-color-1]]). -* Cosmetics +#+NAME: theme-color-1 +#+CAPTION[Light and dark themes' colors]: Light and dark themes' colors. +#+ATTR_LATEX: :booktabs t +| Color | ~blendoit-light~ | ~blendoit-dark~ | +|---------------------------------+---------------------------------+--------------------| +| Black | default text | default background | +| Lighter shades | lesser headers | /n/a/ | +| White | default background | default text | +| Darker shades | /n/a/ | lesser headers | +| \color{Red} Red | negative | /same/ | +| \color{Tomato} Tomato | timestamp `TODO' | /same/ | +| \color{Green} Green | positive | /same/ | +| \color{ForestGreen} ForestGreen | timestamp `DONE' | /same/ | +| \color{Blue} Blue | interactable content; links | /same/ | +| \color{SteelBlue} SteelBlue | anything Org mode; anchor color | /same/ | +| \color{DeepSkyBlue} DeepSkyBlue | ~highlight~ | /same/ | +| \color{DodgerBlue} DodgerBlue | ~isearch~ | /same/ | +| \color{Purple} Purple | | | -** Cursors +*** Cursors 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 @@ -634,8 +692,6 @@ arguably the region on our screen: 1. most often looked at; 2. most often searched when lost. -*** Default cursor - In files containing only ~fixed-pitch~ fonts (i.e. files containing only code), the cursor becomes a high-visibility box. @@ -647,7 +703,7 @@ cursor is a more MS Word-like bar. (setq-default mixed-pitch-variable-pitch-cursor (quote bar)) #+END_SRC -** Faces +*** Faces - ~default~: Hack - Legible, modern monospace font @@ -660,7 +716,7 @@ cursor is a more MS Word-like bar. - More opinionated shapes - Very legible parentheses -*** ~variable-pitch-mode~ +**** ~variable-pitch-mode~ We use ~variable-pitch-mode~ for appropriate modes. @@ -669,7 +725,7 @@ We use ~variable-pitch-mode~ for appropriate modes. (add-hook 'info-mode-hook 'variable-pitch-mode) #+END_SRC -*** TODO Default font size +**** TODO Default font size Make default font size larger on displays of which the resolution is greater than =1920x1080=. @@ -677,54 +733,7 @@ than =1920x1080=. #+BEGIN_SRC emacs-lisp #+END_SRC -** Initial and default frames - -We set the dimensions of the inital and default frames. - -#+BEGIN_SRC emacs-lisp - (add-to-list 'default-frame-alist '(width . 100)) - (add-to-list 'default-frame-alist '(height . 32)) - - (add-to-list 'initial-frame-alist '(width . 100)) - (add-to-list 'initial-frame-alist '(height . 32)) -#+END_SRC - -*** GNU/Linux - -These settings affect the first and subsequent frames spawned by Emacs in -GNU/Linux. Frame transparency increases when focus is lost. - -#+BEGIN_SRC emacs-lisp - (when (and (display-graphic-p) (string-equal system-type "gnu/linux")) - (set-frame-parameter (selected-frame) 'alpha '(90 . 50)) - (add-to-list 'default-frame-alist '(alpha . (90 . 50)))) -#+END_SRC - -** Theme - -My custom themes. - -#+BEGIN_SRC emacs-lisp -(setq custom-theme-directory (concat user-emacs-directory "themes/")) -(load-theme 'blendoit-light) -; (load-theme 'blendoit-dark) -#+END_SRC - -*** ~blendoit-light~ - -A highly legible and unambiguous theme. - -The default face is a black foreground on a white background, this matches with -MS Word. - -- Red :: TODO; cursor; negative; danger -- Green :: DONE; positive -- Blue :: document structure -- Purple :: ~org-mode~ elements - -*** ~blendoit-dark~ - -Same principle +** TODO ~minimal~ * Editing preferences @@ -776,7 +785,8 @@ Originally, I wished to inhibit certain entries in the GUI menus. Not worth the effort at this time. #+BEGIN_SRC emacs-lisp -(setq menu-bar-mode t) +(menu-bar-mode -1) +(tool-bar-mode -1) #+END_SRC ** Coding standards @@ -843,4 +853,3 @@ Automatically break lines longer than =fill-column=. In this configuration file, we described a series of customization steps taken to make Emacs more palatable to modern IDE users. - diff --git a/blendoit/blendoit-init.pdf b/blendoit/blendoit-init.pdf index 00ab603..9643b7b 100644 Binary files a/blendoit/blendoit-init.pdf and b/blendoit/blendoit-init.pdf differ diff --git a/init-custom.el b/init-custom.el index 277dc9e..9e0f331 100644 --- a/init-custom.el +++ b/init-custom.el @@ -17,7 +17,7 @@ '(cursor-type 'bar) '(custom-enabled-themes nil) '(custom-safe-themes - '("e13f430a7462956b953eacb259a8558fda5043084c12e4e2b9b62534908d6575" "fb619663af47b42fb6eeb117051ac1c827b153ebcd425f41722d565b5387b4e5" "f434afda3fc16eb7d628efef2414ae8aa6eb8309b1245a37d972e321631d8334" "b2d914b1952462044262bc8c4bbc4aa6dae640b44118e5593df9e1ecb95e1434" "95e6b5d5ca56d899fb1ea5f474cae8aeaf8a81872ca2c5e070232373e63de988" "dfa3d3a6f179247c16e468ff1b791f4ba5f7d5ec5796de2141a47f4170c30e2a" "3c49e59876fcd9d0965e55a9941baee724b42c1096a44ba7685b7245a4ef339e" "fce07010e29ad670e412206616bcd023004758b67803894269697da0ad3a63a2" "51e5535ada597084f080a49b4707baeb461b4e399e520cd50a29d69e0005f389" "40eb8a3e464cf4b7ff3bcf2f25f24c22da0ff236272d413b04a172ea9bc0e6f6" "af7460b1f78072dbfbb8c432fdb43c95d6b64d313f7920fc27cc6faf4c00a936" "e3dedf24ec055aad60b3b49e5a3051aaf43d615471f5645de20460dfe1a51c6b" "6a99ef169681d3631fa2d800bb038ca1a744dbcd9965ea4346d6c6b6ac5dc62a" "fe5baf44d1691c485e0dec144472da854da3aadf171652ff78054ced1ba4bf9b" "f642103827dc4d56c60544cf98009a8ce0be7d8c491666c0009be144a13e2eec" "73c55df5dcb37eb9f777100ba47c20c1b7fc01bcf17f52196d83cd5714eaf39e" "756e06c0c15123761a3f616970048b9a490116233f3e3bee1b74f1fcb03e7779" "a60651c51f0a2a5fd7ed0e6fb8f9f42ddf25341656e3afcd8bf33462d43f62eb" "ea3d6d1247dbbd11ff081f73afd49cb99f8a59e742289f61ccdc5d2fa11e0750" "5a4005ea22968a0e0ad4c8127d119a1b416eb769a5f02bf244d1ccf9b46ab53c" "4007b604ca3f34071894bc87f69809bbf5dabe39ce4eb1bf5543b7790bbd1d7f" "68689cb1c57cfbf8fbcb45b539619198e63dc0a81c6dd53cedf2f617131bb0ef" "9e689af66a5ed7ff00439d2e89e2deaf25974cfa9557657ea6cf3747bbf1345d" "9b1373e95251ef9c55ee3c21e7db812be4ba8130dacefce70b32ed913d825e33" "790275af019d70e936f3baa5f51ad45e2398954bf0b73e51e3f493eff68c5903" "fca386eb8dc6da33056ab7b55e84c48688ec2fda70cb3195ba36d62cd6f95a7a" "781bb8ce1d32132fb075a6b1cce011f51a2fce2a383676fe6d08149e0c22a862" "9d7e448c8c7bae4c111211c00189eb338845705948700f6ca9bfabc9994d3934" "7d982a0eb6c9a6c06594284983198627ce093b448e4c201b6b781285c7edceea" "3387da2b8189bea78b5c863611b28efe6de20486c4cfceae2985845e1990d6c3" "52925bca11b4d0f2ac0e712e808856af25fcb9cf860b087b6dcbe1add18c2726" "45f8e1ceeb674726e7bfc14337547940f2c427cb3796f81effcf2b14108e57f0" "2106dbf8bd277ab71041b0f38ac63c2a74761bf9614f48394d01cd3c098eb243" "ec667d7657248f7e9656827f0750866c550e73da156432db85269a2c124c6052" "aca2f2c0311645cda62453ddfffb9b3ef0ad74dd1ad7268065eeead5273451b7" "ea2743921f2dd39ee3545a6ca0f085621c05cf6bcd9880ae47447a3fb2d8ab42" "e262766638558b59b633a9560abad739de1de4e33072c1e0b4c597641b60891c" "d1451f828e95242f8eb7bd8c0929bfd9ad05034ffd6cefb2222bd1232ed26174" "8a497811dafe791a6cfa31dd9485ea69287e350b4942c50d707cbdb8b3417572" "2fcc8aed48ca82526bf5e2472283e380940129606339115198c94fc189b6ebcb" "c09a216cb1fcb1eea87e786834d349024296db74fb8e8ee8972ea234db78c634" "1c83c94cc258a5b0745b9694c2de9a2623beffa30f55b5cc85da9cef5a9a9fde" "85fc08e4729379cb2a8660b074479a1d324063b1f3654a8fb85eb87306ffa089" "5f1db7328ad4dbd4132a8646f3c6b22ee69996a6810cf1c3dff481f4c452cc15" "b2b31d36d4df3b21284ef15c4cb6aff885e3f38a8086b778473f840dc38133f7" "618973af16801ffd749afebbf8f2c8180fa9b7d295fd89505d1a3e21ebc4c199" "ba6fe375dbaeaf48e6b9c12bcf37b0919263406ccb13af38ef5ac78f289f4cf8" "6239d664331a316ff4fa0d5ec146250ab1a92c111c4b9484b94f4a901bd8c6c6" "197336a0ab2629ea10e5b8a7ca760186998bcaddb1df2b2c481a9a6e4efd0672" "469b1e88e25d070178650e330a4ebd2c6e3cc4621ea317c2255bca55ba6bfcf7" "be1230bf91ef156bd9914a5da9d64a9b4495faf9bc5e4e764791859581b4f2dc" "a634f6511a7f13aa0d2442dccd3f092e61bf0034447617f738c67e5ec8bc76c6" "fdf966f3cefb64d1b53036bb9eae98191734e94ee20767f0e6d248e10367a042" "88233d6ef424d0aed637b3ae12ae5c4718f06a937cac39a805f2a97dafd0b2bd" "6d21b2932725e3581fa4991402e8c24901614e2d1be432c6ce9f3de98059d034" "d644e76022e89c2f71ec5b1bbd5fa44330674b63054145ae389959fc43760de5" "23bcc7d0f92a7839e5857a645f9ac80ed79bce6ceae338a273339221f2c0eee3" "5b008d618c92a8d77debb928ef648bfb1350cb0839bbe82b1452d31987129bb9" "816693b20d322c628b8f79a08c91b7bf4d268f76beefbd608ebe58ebfa63bd62" "09f7e4a2e27bbb99757e78450ce78224294de142b5ad7a165e6b5fcd9af8e053" "320b7f18a0cd107684c5fe83468a9bbfcd9bfc0524b787b24e70fed338ebba48" "c32f5a4de4f87fee7f6bc714fcf146706e415320eb9dd2907d0edb3ab69faf0a" "b01e74cac6f312ab2fe6d8066f7cfb3d545a927b117e7cc53b192005cb04819e" "22366449c1933d9017679eb8d4265b3698b8459645618ac516eb1d9a509a5100" "6120047a082b82cba7759b57dbf77f635d16efd14c39ef53e84c1570916760c3" "1681d0164dd8cc5865de07e22d7c9b117aac84cbbee1cfc897c817b0dd329810" "f920fd74d8d90736e13c570ada1a761bfc76b792b660ac38948de5216421bf16" "acf50bc8b876556e34fe46bb282c4d81213f25da6ff99d8acd61ce6587a6fe00" "c7c1480dd97b3455efed608bcd3a07d82b938873c81211449f066f0c575ca5d4" "3f5051af32aa51e82d0a16c4bd9f8cea2e375732cc15f71b0c24f3c5acdc1f77" "e4d85ebd1bbf66b3fb3dc1041f2e59310b1acc134ba389c479b369b403cb47ae" "2979fa4f6be237521d789f1ccabdf78357d31bc015c4eecb0a56a46b7e5f76b2" "56169cef70f421123f9a94925e769fdabd2623917e1094d101ed27183255aa2c" "cb2bbbd371f93845e6c9e340a9f1de4a90bd3ea6d7ad834c1de16032830677d6" "f1b01bd088cfca8c4d153374940462771a80717c3d0f8c84da08f6d3d4ecf506" "26fed31eecc4571079d3adf4b17e39ba5078c5905f4a430d50cb0ee3d049e60f" "4662608f90dd9281f6c41f85cf2a18e92da88209d0ea6143eb851a422cf15d0e" "12ca380d0ebc2db6ca04d2c5ee0f1e17b17b44be4d0e39028b33ba1ef096ddf1" "33eafe92e663ab754f0c18f3aa35d44f90de5e45866a4e3dbedc9275c18a37b0" "ea3295557000d404db1c5b7ed28dbff111e1f6a895dad21df02619a5184cfad2" "a0dbaefbe0cc11ec26e44c2a85e86f69a389f514ca9e889a7e09c9e465adcbd0" "39ee0b1c8a650a34ab9ea56bba6f2791c61e08a7493a36241c04011896d208c7" "225754abbbab151563676a6932f6a30d85a146956b1d177f30acda0f6fa9edb5" "9f5e773e2e6f801143c3c45835f955e183e7a0ed913b67a9eb614c14a3a4ccc9" "368c0ca8c5b88e3d19c0c5e8de822934b7e18be792bd1b58112aa064dbcebaa7" "b4b9bd3e022c836c9cfd362da607a20eee5bb6d44b82e6da95fc6d0bbcb042f7" "244dca9b16c86f111de53d9630c7825574efe713b0d8f2cc52da1ccf6f373d87" "316c25dff649ae0230b8e04b26553a044b7ce7e15117aec45e1be5fa3cdb081d" "5c6b743494ddeffee6d79f776c39a3e6480d685dfef225e9cfcf6c1b7c88c322" "9f1b910295c248933e71176b79b3d27362d90700b95f28dc4701266605fdff2e" "976ef4086ddfafc99e74e1db6e7d93fca659cad5596f591a323fad2e2a27db59" "625ffa8fd77bd02ca8293aadd83ce25227e343976c87636b60b3e9fe291f423a" "c60907e8774c9fc0122b2dd3fa891b27c7fd01168d50f3f758bc226b3525ac7f" "ea44aa4ffe4cbbaa5ac6acb17ef247fccc2b4d5b8658f9714bfde2d91190542b" "ba745b626a5fe6b79c20a81d8c1b1c18b773836351387f778804ac7da1034494" "34913ce417d47ef561e3b9a5aa16c64843357c743cf217933c414ca7851c0df0" "cc27e2708a9d1736d3ebcc23496a5a74e964f3841deb66462d3e313229ebffad" "803873868125a64fe074e4cd27c7460216723df3018c54ae5aeeb8f564d21a35" "5e52fc8de36914cd89202c9eb7177d2ef3b7cec9ed8660a3a22c38fe5d457e9e" "e887eb20e1701944f697df7e00ff413b7c707a71a84b9281be37d9a894d33b5e" "018c02d3b059e6d1bd0d68c06d6448503cf7e0d6a93424f10f62221f99e4c5fd" "60aabe3167c59e66d005a648dd90fffcb0628137f72e9011834f379803d278eb" "4775ab624ed6e3a405f239c0b1b3adff2aa6fcbc401e050907293589dc0c42fc" "fd608fe9c9ddc684275baffcb8b8e1a250351ddeac80c35d9f35db35d723a299" "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)) + '("daa021c91484323a0e794d2dfcd5609370d64c6d942cb7826325fef97499b392" "afda4d0912bd73a6217a78047c4d60de38250a146ed5e39ea70ab5a9b41e1793" "b40fd6a3c5eefaaf4308c0a3bc82c1dca3551082119c91b2a77ce4266d188213" "e13f430a7462956b953eacb259a8558fda5043084c12e4e2b9b62534908d6575" "fb619663af47b42fb6eeb117051ac1c827b153ebcd425f41722d565b5387b4e5" "f434afda3fc16eb7d628efef2414ae8aa6eb8309b1245a37d972e321631d8334" "b2d914b1952462044262bc8c4bbc4aa6dae640b44118e5593df9e1ecb95e1434" "95e6b5d5ca56d899fb1ea5f474cae8aeaf8a81872ca2c5e070232373e63de988" "dfa3d3a6f179247c16e468ff1b791f4ba5f7d5ec5796de2141a47f4170c30e2a" "3c49e59876fcd9d0965e55a9941baee724b42c1096a44ba7685b7245a4ef339e" "fce07010e29ad670e412206616bcd023004758b67803894269697da0ad3a63a2" "51e5535ada597084f080a49b4707baeb461b4e399e520cd50a29d69e0005f389" "40eb8a3e464cf4b7ff3bcf2f25f24c22da0ff236272d413b04a172ea9bc0e6f6" "af7460b1f78072dbfbb8c432fdb43c95d6b64d313f7920fc27cc6faf4c00a936" "e3dedf24ec055aad60b3b49e5a3051aaf43d615471f5645de20460dfe1a51c6b" "6a99ef169681d3631fa2d800bb038ca1a744dbcd9965ea4346d6c6b6ac5dc62a" "fe5baf44d1691c485e0dec144472da854da3aadf171652ff78054ced1ba4bf9b" "f642103827dc4d56c60544cf98009a8ce0be7d8c491666c0009be144a13e2eec" "73c55df5dcb37eb9f777100ba47c20c1b7fc01bcf17f52196d83cd5714eaf39e" "756e06c0c15123761a3f616970048b9a490116233f3e3bee1b74f1fcb03e7779" "a60651c51f0a2a5fd7ed0e6fb8f9f42ddf25341656e3afcd8bf33462d43f62eb" "ea3d6d1247dbbd11ff081f73afd49cb99f8a59e742289f61ccdc5d2fa11e0750" "5a4005ea22968a0e0ad4c8127d119a1b416eb769a5f02bf244d1ccf9b46ab53c" "4007b604ca3f34071894bc87f69809bbf5dabe39ce4eb1bf5543b7790bbd1d7f" "68689cb1c57cfbf8fbcb45b539619198e63dc0a81c6dd53cedf2f617131bb0ef" "9e689af66a5ed7ff00439d2e89e2deaf25974cfa9557657ea6cf3747bbf1345d" "9b1373e95251ef9c55ee3c21e7db812be4ba8130dacefce70b32ed913d825e33" "790275af019d70e936f3baa5f51ad45e2398954bf0b73e51e3f493eff68c5903" "fca386eb8dc6da33056ab7b55e84c48688ec2fda70cb3195ba36d62cd6f95a7a" "781bb8ce1d32132fb075a6b1cce011f51a2fce2a383676fe6d08149e0c22a862" "9d7e448c8c7bae4c111211c00189eb338845705948700f6ca9bfabc9994d3934" "7d982a0eb6c9a6c06594284983198627ce093b448e4c201b6b781285c7edceea" "3387da2b8189bea78b5c863611b28efe6de20486c4cfceae2985845e1990d6c3" "52925bca11b4d0f2ac0e712e808856af25fcb9cf860b087b6dcbe1add18c2726" "45f8e1ceeb674726e7bfc14337547940f2c427cb3796f81effcf2b14108e57f0" "2106dbf8bd277ab71041b0f38ac63c2a74761bf9614f48394d01cd3c098eb243" "ec667d7657248f7e9656827f0750866c550e73da156432db85269a2c124c6052" "aca2f2c0311645cda62453ddfffb9b3ef0ad74dd1ad7268065eeead5273451b7" "ea2743921f2dd39ee3545a6ca0f085621c05cf6bcd9880ae47447a3fb2d8ab42" "e262766638558b59b633a9560abad739de1de4e33072c1e0b4c597641b60891c" "d1451f828e95242f8eb7bd8c0929bfd9ad05034ffd6cefb2222bd1232ed26174" "8a497811dafe791a6cfa31dd9485ea69287e350b4942c50d707cbdb8b3417572" "2fcc8aed48ca82526bf5e2472283e380940129606339115198c94fc189b6ebcb" "c09a216cb1fcb1eea87e786834d349024296db74fb8e8ee8972ea234db78c634" "1c83c94cc258a5b0745b9694c2de9a2623beffa30f55b5cc85da9cef5a9a9fde" "85fc08e4729379cb2a8660b074479a1d324063b1f3654a8fb85eb87306ffa089" "5f1db7328ad4dbd4132a8646f3c6b22ee69996a6810cf1c3dff481f4c452cc15" "b2b31d36d4df3b21284ef15c4cb6aff885e3f38a8086b778473f840dc38133f7" "618973af16801ffd749afebbf8f2c8180fa9b7d295fd89505d1a3e21ebc4c199" "ba6fe375dbaeaf48e6b9c12bcf37b0919263406ccb13af38ef5ac78f289f4cf8" "6239d664331a316ff4fa0d5ec146250ab1a92c111c4b9484b94f4a901bd8c6c6" "197336a0ab2629ea10e5b8a7ca760186998bcaddb1df2b2c481a9a6e4efd0672" "469b1e88e25d070178650e330a4ebd2c6e3cc4621ea317c2255bca55ba6bfcf7" "be1230bf91ef156bd9914a5da9d64a9b4495faf9bc5e4e764791859581b4f2dc" "a634f6511a7f13aa0d2442dccd3f092e61bf0034447617f738c67e5ec8bc76c6" "fdf966f3cefb64d1b53036bb9eae98191734e94ee20767f0e6d248e10367a042" "88233d6ef424d0aed637b3ae12ae5c4718f06a937cac39a805f2a97dafd0b2bd" "6d21b2932725e3581fa4991402e8c24901614e2d1be432c6ce9f3de98059d034" "d644e76022e89c2f71ec5b1bbd5fa44330674b63054145ae389959fc43760de5" "23bcc7d0f92a7839e5857a645f9ac80ed79bce6ceae338a273339221f2c0eee3" "5b008d618c92a8d77debb928ef648bfb1350cb0839bbe82b1452d31987129bb9" "816693b20d322c628b8f79a08c91b7bf4d268f76beefbd608ebe58ebfa63bd62" "09f7e4a2e27bbb99757e78450ce78224294de142b5ad7a165e6b5fcd9af8e053" "320b7f18a0cd107684c5fe83468a9bbfcd9bfc0524b787b24e70fed338ebba48" "c32f5a4de4f87fee7f6bc714fcf146706e415320eb9dd2907d0edb3ab69faf0a" "b01e74cac6f312ab2fe6d8066f7cfb3d545a927b117e7cc53b192005cb04819e" "22366449c1933d9017679eb8d4265b3698b8459645618ac516eb1d9a509a5100" "6120047a082b82cba7759b57dbf77f635d16efd14c39ef53e84c1570916760c3" "1681d0164dd8cc5865de07e22d7c9b117aac84cbbee1cfc897c817b0dd329810" "f920fd74d8d90736e13c570ada1a761bfc76b792b660ac38948de5216421bf16" "acf50bc8b876556e34fe46bb282c4d81213f25da6ff99d8acd61ce6587a6fe00" "c7c1480dd97b3455efed608bcd3a07d82b938873c81211449f066f0c575ca5d4" "3f5051af32aa51e82d0a16c4bd9f8cea2e375732cc15f71b0c24f3c5acdc1f77" "e4d85ebd1bbf66b3fb3dc1041f2e59310b1acc134ba389c479b369b403cb47ae" "2979fa4f6be237521d789f1ccabdf78357d31bc015c4eecb0a56a46b7e5f76b2" "56169cef70f421123f9a94925e769fdabd2623917e1094d101ed27183255aa2c" "cb2bbbd371f93845e6c9e340a9f1de4a90bd3ea6d7ad834c1de16032830677d6" "f1b01bd088cfca8c4d153374940462771a80717c3d0f8c84da08f6d3d4ecf506" "26fed31eecc4571079d3adf4b17e39ba5078c5905f4a430d50cb0ee3d049e60f" "4662608f90dd9281f6c41f85cf2a18e92da88209d0ea6143eb851a422cf15d0e" "12ca380d0ebc2db6ca04d2c5ee0f1e17b17b44be4d0e39028b33ba1ef096ddf1" "33eafe92e663ab754f0c18f3aa35d44f90de5e45866a4e3dbedc9275c18a37b0" "ea3295557000d404db1c5b7ed28dbff111e1f6a895dad21df02619a5184cfad2" "a0dbaefbe0cc11ec26e44c2a85e86f69a389f514ca9e889a7e09c9e465adcbd0" "39ee0b1c8a650a34ab9ea56bba6f2791c61e08a7493a36241c04011896d208c7" "225754abbbab151563676a6932f6a30d85a146956b1d177f30acda0f6fa9edb5" "9f5e773e2e6f801143c3c45835f955e183e7a0ed913b67a9eb614c14a3a4ccc9" "368c0ca8c5b88e3d19c0c5e8de822934b7e18be792bd1b58112aa064dbcebaa7" "b4b9bd3e022c836c9cfd362da607a20eee5bb6d44b82e6da95fc6d0bbcb042f7" "244dca9b16c86f111de53d9630c7825574efe713b0d8f2cc52da1ccf6f373d87" "316c25dff649ae0230b8e04b26553a044b7ce7e15117aec45e1be5fa3cdb081d" "5c6b743494ddeffee6d79f776c39a3e6480d685dfef225e9cfcf6c1b7c88c322" "9f1b910295c248933e71176b79b3d27362d90700b95f28dc4701266605fdff2e" "976ef4086ddfafc99e74e1db6e7d93fca659cad5596f591a323fad2e2a27db59" "625ffa8fd77bd02ca8293aadd83ce25227e343976c87636b60b3e9fe291f423a" "c60907e8774c9fc0122b2dd3fa891b27c7fd01168d50f3f758bc226b3525ac7f" "ea44aa4ffe4cbbaa5ac6acb17ef247fccc2b4d5b8658f9714bfde2d91190542b" "ba745b626a5fe6b79c20a81d8c1b1c18b773836351387f778804ac7da1034494" "34913ce417d47ef561e3b9a5aa16c64843357c743cf217933c414ca7851c0df0" "cc27e2708a9d1736d3ebcc23496a5a74e964f3841deb66462d3e313229ebffad" "803873868125a64fe074e4cd27c7460216723df3018c54ae5aeeb8f564d21a35" "5e52fc8de36914cd89202c9eb7177d2ef3b7cec9ed8660a3a22c38fe5d457e9e" "e887eb20e1701944f697df7e00ff413b7c707a71a84b9281be37d9a894d33b5e" "018c02d3b059e6d1bd0d68c06d6448503cf7e0d6a93424f10f62221f99e4c5fd" "60aabe3167c59e66d005a648dd90fffcb0628137f72e9011834f379803d278eb" "4775ab624ed6e3a405f239c0b1b3adff2aa6fcbc401e050907293589dc0c42fc" "fd608fe9c9ddc684275baffcb8b8e1a250351ddeac80c35d9f35db35d723a299" "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)) '(fci-rule-color "#383838") '(fill-column 79) '(fringe-mode 0 nil (fringe)) @@ -55,7 +55,6 @@ (ledger . t) (gnuplot . t) (latex . t))) - '(org-latex-active-timestamp-format "\\textcolor{RoyalBlue!80}{\\textit{%s}}") '(org-latex-classes '(("article" "\\documentclass[11pt]{article}" ("\\section{%s}" . "\\section*{%s}") @@ -80,13 +79,14 @@ ("\\section{%s}" . "\\section*{%s}") ("\\subsection*{%s}" . "\\subsection*{%s}") ("\\subsubsection*{%s}" . "\\subsubsection*{%s}")))) - '(org-latex-inactive-timestamp-format "\\textcolor{ForestGreen!80}{\\textit{%s}}") '(org-latex-packages-alist '(("AUTO" "polyglossia" t ("xelatex" "lualatex")) ("AUTO" "babel" t ("pdflatex")) - ("table,dvipsnames" "xcolor" t + ("AUTO" "booktabs" t + ("pdflatex")) + ("table,svgnames" "xcolor" t ("pdflatex")))) '(org-latex-pdf-process '("latexmk -pdf -f -interaction=nonstopmode -pdflatex=\"%latex\" -outdir=%o %f")) diff --git a/snippets/org-mode/org-basic b/snippets/org-mode/org-basic index 200dcef..81a3bdc 100644 --- a/snippets/org-mode/org-basic +++ b/snippets/org-mode/org-basic @@ -1,8 +1,8 @@ # -*- mode: snippet -*- # name: Org mode basic template -# key: org-basic +# key: /skel # -- #+TITLE: ${1:Default Title} #+AUTHOR: ${2:Marius Peter} -#+DATE: ${3:DATE} +#+DATE: `(org-time-stamp nil)` diff --git a/themes/blendoit-light-theme.el b/themes/blendoit-light-theme.el index e099943..880dd50 100644 --- a/themes/blendoit-light-theme.el +++ b/themes/blendoit-light-theme.el @@ -1,5 +1,5 @@ (deftheme blendoit-light - "Created 2020-09-04.") + "Created 2020-09-05.") (custom-theme-set-faces 'blendoit-light @@ -31,11 +31,11 @@ '(fringe ((t (:background "grey95")))) '(header-line ((t (:inherit mode-line :background "grey90" :foreground "grey20" :box nil)))) '(tooltip ((t (:foreground "black" :background "lightyellow" :inherit (variable-pitch))))) - '(mode-line ((t (:box (:line-width -1 :style released-button) :foreground "white" :background "steel blue" :family "Hermit")))) + '(mode-line ((t (:family "Hermit" :background "steel blue" :foreground "white" :box (:line-width -1 :style released-button))))) '(mode-line-buffer-id ((t (:weight bold)))) '(mode-line-emphasis ((t (:weight bold)))) '(mode-line-highlight ((t (:box (:line-width 2 :color "grey40" :style released-button))))) - '(mode-line-inactive ((t (:box (:line-width -1 :color "gainsboro") :foreground "gainsboro" :background "SteelBlue4" :family "Hermit")))) + '(mode-line-inactive ((t (:family "Hermit" :background "SteelBlue4" :foreground "gainsboro" :box (:line-width -1 :color "gainsboro"))))) '(isearch ((t (:background "DodgerBlue1" :foreground "white")))) '(isearch-fail ((t (:background "RosyBrown1")))) '(lazy-highlight ((t (:foreground "DodgerBlue1" :box 2)))) @@ -73,16 +73,17 @@ '(org-level-6 ((t (:inherit org-level-5)))) '(org-level-7 ((t (:inherit org-level-5)))) '(org-level-8 ((t (:inherit org-level-5)))) - '(org-checkbox ((t (:weight bold :inherit org-meta-line)))) + '(org-checkbox ((t (:inherit org-meta-line :weight bold)))) '(org-todo ((t (:background "tomato" :foreground "White" :weight bold :height 1.2 :family "Hermit")))) '(org-done ((t (:background "ForestGreen" :foreground "White" :weight bold :height 1.2 :family "Hermit")))) '(org-date ((t (:inherit org-tag)))) '(Info-quoted ((t (:inherit org-block)))) - '(org-priority ((t (:weight bold :inherit org-meta-line)))) - '(default ((t (:background "white" :foreground "black" :height 140 :family "Hack")))) - '(powerline-active1 ((t (:family "Hack" :foreground "white" :background "grey17" :inherit mode-line)))) + '(org-priority ((t (:inherit org-meta-line :weight bold)))) + '(powerline-active1 ((t (:inherit mode-line :background "grey17" :foreground "white" :family "Hack")))) '(powerline-active2 ((t (:inherit (mode-line) :foreground "white" :background "grey40")))) '(powerline-inactive1 ((t (:inherit mode-line-inactive :background "grey11" :family "Hack")))) - '(powerline-inactive2 ((t (:inherit (mode-line-inactive) :background "grey20"))))) + '(powerline-inactive2 ((t (:inherit (mode-line-inactive) :background "grey20")))) + '(default ((t (:background "white" :foreground "black" :height 140 :family "Hack")))) + '(org-drawer ((t (:inherit org-meta-line))))) (provide-theme 'blendoit-light) -- cgit v1.2.3