From 126528935bb71449df251970fe367849a62beb92 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 12:50:44 -0500
Subject: [emacs][wip] begin migration to straight.el

comment out just about all packages; will add them back gradually to
make sure everything works as expected
---
 .gitignore                   |   3 ++
 init.org                     | 103 ++++++++++++++++++++++++++++++++++---------
 straight/versions/default.el |  24 ++++++++++
 3 files changed, 110 insertions(+), 20 deletions(-)
 create mode 100644 straight/versions/default.el

diff --git a/.gitignore b/.gitignore
index c5f850f..0a959bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@
 /early-init.el
 /init.el
 
+/straight/*
+!/straight/versions
+
 /var/*
 /var/eshell/history
 
diff --git a/init.org b/init.org
index d8563fd..42fba09 100644
--- a/init.org
+++ b/init.org
@@ -184,9 +184,9 @@ but for now I've decided to keep them enabled. See documentation for
 
 *** No =package.el=
 
-I can do all my package management things with Borg, and don't need
-Emacs' built-in =package.el=. Emacs 27 lets us disable =package.el= in
-the =early-init-file= (see [[https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b][here]]).
+I can do all my package management things with =straight.el=, and
+don't need Emacs' built-in =package.el=.  Emacs 27 lets us disable
+=package.el= in the =early-init-file= (see [[https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b][here]]).
 
 #+begin_src emacs-lisp :tangle early-init.el
 (setq package-enable-at-startup nil)
@@ -197,12 +197,36 @@ right now), and even when released it'll be long before most distros
 ship in their repos, I'll still put the old workaround with the
 commented call to ~package-initialize~ here anyway.
 
-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle no
 (setq package-enable-at-startup nil)
 ;; (package-initialize)
 #+end_src
 
-*** Borg
+Update: the above is not necessary, since =straight.el= automatically
+does that (and more).  See =straight-package-neutering-mode=.
+
+*** =straight.el=
+
+#+begin_src emacs-lisp
+(setq straight-repository-branch "develop")
+
+(defvar bootstrap-version)
+(let ((bootstrap-file
+       (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
+      (bootstrap-version 5))
+  (unless (file-exists-p bootstrap-file)
+    (with-current-buffer
+        (url-retrieve-synchronously
+         "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
+         'silent 'inhibit-cookies)
+      (goto-char (point-max))
+      (eval-print-last-sexp)))
+  (load bootstrap-file nil 'nomessage))
+
+(setq straight-use-package-by-default t)
+#+end_src
+
+*** COMMENT Borg
 
 #+begin_quote
 Assimilate Emacs packages as Git submodules
@@ -244,7 +268,7 @@ packages (in our case especially the latter) in a neatly organized way
 and without compromising on performance.
 
 #+begin_src emacs-lisp
-(require 'use-package)
+(straight-use-package 'use-package)
 (if nil  ; set to t when need to debug init
     (setq use-package-verbose t
           use-package-expand-minimally nil
@@ -254,7 +278,7 @@ and without compromising on performance.
         use-package-expand-minimally t))
 #+end_src
 
-*** Epkg
+*** COMMENT Epkg
 
 #+begin_quote
 Browse the Emacsmirror package database
@@ -307,6 +331,7 @@ it it's own file. While at it, treat themes as safe.
 
 #+begin_src emacs-lisp
 (use-package custom
+  :straight nil
   :no-require t
   :config
   (setq custom-file (no-littering-expand-etc-file-name "custom.el"))
@@ -361,6 +386,7 @@ See [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.htm
 
 #+begin_src emacs-lisp
 (use-package server
+  :straight nil
   :defer 1
   :config (or (server-running-p) (server-mode)))
 #+end_src
@@ -724,7 +750,44 @@ customizing it.
             'auto-compile-inhibit-compile-detached-git-head))
 #+end_src
 
-*** [[https://orgmode.org/][Org mode]]
+*** Org
+
+#+begin_src emacs-lisp
+  (use-package git)
+
+  (defun org-git-version ()
+    "The Git version of org-mode.
+  Inserted by installing org-mode or when a release is made."
+    (require 'git)
+    (let ((git-repo (expand-file-name
+                     "straight/repos/org/" user-emacs-directory)))
+      (string-trim
+       (git-run "describe"
+                "--match=release\*"
+                "--abbrev=6"
+                "HEAD"))))
+
+  (defun org-release ()
+    "The release version of org-mode.
+  Inserted by installing org-mode or when a release is made."
+    (require 'git)
+    (let ((git-repo (expand-file-name
+                     "straight/repos/org/" user-emacs-directory)))
+      (string-trim
+       (string-remove-prefix
+        "release_"
+        (git-run "describe"
+                 "--match=release\*"
+                 "--abbrev=0"
+                 "HEAD")))))
+
+  (provide 'org-version)
+
+  (use-package org
+    :defer 0.8) ; or org-plus-contrib if desired
+#+end_src
+
+*** COMMENT [[https://orgmode.org/][Org mode]]
 
 #+begin_quote
 Org mode is for keeping notes, maintaining TODO lists, planning
@@ -868,7 +931,7 @@ Not just how I do git, but /the/ way to do git.
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 #+end_src
 
-*** [[https://github.com/abo-abo/swiper][Ivy]] (and friends)
+*** COMMENT [[https://github.com/abo-abo/swiper][Ivy]] (and friends)
 
 #+begin_quote
 Ivy - a generic completion frontend for Emacs, Swiper - isearch with
@@ -924,7 +987,7 @@ There's no way I could top that, so I won't attempt to.
   (defalias 'locate #'counsel-locate))
 #+end_src
 
-*** eshell
+*** COMMENT eshell
 
 #+begin_src emacs-lisp
 (use-package eshell
@@ -961,7 +1024,7 @@ There's no way I could top that, so I won't attempt to.
   (eshell-input-filter 'eshell-input-filter-initial-space))
 #+end_src
 
-*** Ibuffer
+*** COMMENT Ibuffer
 
 #+begin_src emacs-lisp
 (use-package ibuffer
@@ -1032,7 +1095,7 @@ There's no way I could top that, so I won't attempt to.
   :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
 #+end_src
 
-*** Outline
+*** COMMENT Outline
 
 #+begin_src emacs-lisp
 (use-package outline
@@ -1054,7 +1117,7 @@ There's no way I could top that, so I won't attempt to.
    ("s"   . outline-show-subtree)))
 #+end_src
 
-* Borg's =layer/essentials=
+* COMMENT Borg's =layer/essentials=
 :PROPERTIES:
 :CUSTOM_ID: borg-essentials
 :END:
@@ -1175,7 +1238,7 @@ TODO: break this giant source block down into individual org sections.
 
 #+end_src
 
-* Editing
+* COMMENT Editing
 :PROPERTIES:
 :CUSTOM_ID: editing
 :END:
@@ -1199,7 +1262,7 @@ TODO: break this giant source block down into individual org sections.
   (global-company-mode t))
 #+end_src
 
-* Syntax and spell checking
+* COMMENT Syntax and spell checking
 :PROPERTIES:
 :CUSTOM_ID: syntax-spell-checking
 :END:
@@ -1246,7 +1309,7 @@ TODO: break this giant source block down into individual org sections.
               #'endless/replace-quote))
 #+end_src
 
-* Programming modes
+* COMMENT Programming modes
 :PROPERTIES:
 :CUSTOM_ID: programming-modes
 :END:
@@ -1618,7 +1681,7 @@ treemacs
   :load-path "lib/guix/elisp")
 #+end_src
 
-* Emacs enhancements
+* COMMENT Emacs enhancements
 :PROPERTIES:
 :CUSTOM_ID: emacs-enhancements
 :END:
@@ -1955,7 +2018,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
                ("a" . mc/mark-all-like-this))))
 #+end_src
 
-* Email
+* COMMENT Email
 :PROPERTIES:
 :CUSTOM_ID: email
 :END:
@@ -2242,7 +2305,7 @@ Convenient footnotes in =message-mode=.
     (gnus-harvest-install)))
 #+end_src
 
-* Blogging
+* COMMENT Blogging
 :PROPERTIES:
 :CUSTOM_ID: blogging
 :END:
@@ -2281,6 +2344,6 @@ Display how long it took to load the init file.
 
 * COMMENT Local Variables                                           :ARCHIVE:
 # Local Variables:
-# eval: (add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)
+# eval: ;; (add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)
 # eval: (typo-mode -1)
 # End:
diff --git a/straight/versions/default.el b/straight/versions/default.el
new file mode 100644
index 0000000..2df0a79
--- /dev/null
+++ b/straight/versions/default.el
@@ -0,0 +1,24 @@
+(("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f")
+ ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04")
+ ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584")
+ ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029")
+ ("epkgs" . "3e2b3cbada81bdb5e9b3f4bf185c7258f656b021")
+ ("exec-path-from-shell" . "9bc0f4a762f16d488376fb52409c58239a86d75d")
+ ("f.el" . "de6d4d40ddc844eee643e92d47b9d6a63fbebb48")
+ ("ghub" . "db15d00d01b8bd9187079a0b538d878d241743a8")
+ ("git.el" . "a3396a7027a7d986598c6a2d6d5599bac918f3da")
+ ("gnu-elpa-mirror" . "db6dd0677f0adac536ec6c575865770aa902c0a1")
+ ("graphql.el" . "e2b309689f4faf9225f290080f836e988c5a576d")
+ ("let-alist" . "4a7693b678c59a148660c736cc0bb26a5032ee9a")
+ ("magit" . "d866fb3624bdeb87f0c56e359239e4474362d0af")
+ ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642")
+ ("melpa" . "5487adde3bbb1bfd875c51932c63ceef541d6b6f")
+ ("no-littering" . "4e7ecf017140bc522629cd2c977160f7cc2b8020")
+ ("org" . "495c7c6a5774a4d3035c582a3b4c95eb04e83dd5")
+ ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa")
+ ("s.el" . "03410e6a7a2b11e47e1fea3b7d9899c7df26435e")
+ ("straight.el" . "13d019dfc72e69cce58b510766e197b044ea823b")
+ ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
+ ("use-package" . "39a8b8812c2c9f6f0b299e6a04e504ef393694ce")
+ ("with-editor" . "9dd9f176d96abc60365369de6d08c26c414ef1f3"))
+:saturn
-- 
cgit v1.2.3-60-g2f50


From f59c27809dfc5d1417863d686bfdccabbbf7ef7e Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 13:02:34 -0500
Subject: [emacs][wip] enable the rest of my org customizations

---
 init.org | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/init.org b/init.org
index 42fba09..5f1b7df 100644
--- a/init.org
+++ b/init.org
@@ -750,7 +750,18 @@ customizing it.
             'auto-compile-inhibit-compile-detached-git-head))
 #+end_src
 
-*** Org
+*** [[https://orgmode.org/][Org]]
+
+#+begin_quote
+Org mode is for keeping notes, maintaining TODO lists, planning
+projects, and authoring documents with a fast and effective plain-text
+system.
+#+end_quote
+
+In short, my favourite way of life.
+
+First, we have to resort to a [[https://github.com/raxod502/straight.el#installing-org-with-straightel][hack]] to be able to use the correct
+latest version of Org from upstream.
 
 #+begin_src emacs-lisp
   (use-package git)
@@ -781,24 +792,13 @@ customizing it.
                  "--abbrev=0"
                  "HEAD")))))
 
-  (provide 'org-version)
-
-  (use-package org
-    :defer 0.8) ; or org-plus-contrib if desired
+(provide 'org-version)
 #+end_src
 
-*** COMMENT [[https://orgmode.org/][Org mode]]
-
-#+begin_quote
-Org mode is for keeping notes, maintaining TODO lists, planning
-projects, and authoring documents with a fast and effective plain-text
-system.
-#+end_quote
-
-In short, my favourite way of life.
+And here's where my actual Org configurations begin:
 
 #+begin_src emacs-lisp
-(use-package org
+(use-package org-plus-contrib
   :defer 1
   :config
   (setq org-src-tab-acts-natively t
@@ -830,6 +830,7 @@ In short, my favourite way of life.
   '(org-latex-and-related ((t (:foreground "#b294bb")))))
 
 (use-package ox-latex
+  :straight nil
   :after ox
   :config
   (setq org-latex-listings 'listings
@@ -847,6 +848,7 @@ In short, my favourite way of life.
                t))
 
 (use-package ox-beamer
+  :straight nil
   :after ox)
 
 (use-package orgalist
-- 
cgit v1.2.3-60-g2f50


From 2ec331fcb08163313f9eb0490f7d7dbd6d9ded0a Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 13:28:54 -0500
Subject: [emacs][wip] fix Org configurations

---
 init.org | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/init.org b/init.org
index 5f1b7df..4e3ee52 100644
--- a/init.org
+++ b/init.org
@@ -795,11 +795,18 @@ latest version of Org from upstream.
 (provide 'org-version)
 #+end_src
 
+We will use the =org-plus-contrib= package to get the whole deal:
+
+#+begin_src emacs-lisp
+(straight-use-package 'org-plus-contrib)
+#+end_src
+
 And here's where my actual Org configurations begin:
 
 #+begin_src emacs-lisp
-(use-package org-plus-contrib
-  :defer 1
+(use-package org
+  :straight nil
+  :defer 0.5
   :config
   (setq org-src-tab-acts-natively t
         org-src-preserve-indentation nil
-- 
cgit v1.2.3-60-g2f50


From 74c5f3534391f9703c8d7a2fa77a1921277806f8 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 13:44:56 -0500
Subject: [emacs][wip] define use-feature for use-package without straight.el

---
 init.org | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/init.org b/init.org
index 4e3ee52..6f38d73 100644
--- a/init.org
+++ b/init.org
@@ -207,6 +207,13 @@ does that (and more).  See =straight-package-neutering-mode=.
 
 *** =straight.el=
 
+#+begin_quote
+Next-generation, purely functional package manager for the Emacs
+hacker.
+#+end_quote
+
+=straight.el= allows me to have a fully reproducible Emacs setup.
+
 #+begin_src emacs-lisp
 (setq straight-repository-branch "develop")
 
@@ -226,6 +233,19 @@ does that (and more).  See =straight-package-neutering-mode=.
 (setq straight-use-package-by-default t)
 #+end_src
 
+Since we enable =straight.el='s =straight-use-package-by-default=
+integration, we will define a =use-feature= for plain ole
+=use-package= without any of the =straight.el= stuff.
+
+#+begin_src emacs-lisp
+(defmacro use-feature (name &rest args)
+  "Like `use-package', but with `straight-use-package-by-default' disabled."
+  (declare (indent defun))
+  `(use-package ,name
+     :straight nil
+,@args))
+#+end_src
+
 *** COMMENT Borg
 
 #+begin_quote
@@ -330,8 +350,7 @@ definitely don't want it mixing with =init.el=. So, here; let's give
 it it's own file. While at it, treat themes as safe.
 
 #+begin_src emacs-lisp
-(use-package custom
-  :straight nil
+(use-feature custom
   :no-require t
   :config
   (setq custom-file (no-littering-expand-etc-file-name "custom.el"))
@@ -385,8 +404,7 @@ login; so starting the server from inside Emacs is good enough for me.
 See [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server][Using Emacs as a Server]].
 
 #+begin_src emacs-lisp
-(use-package server
-  :straight nil
+(use-feature server
   :defer 1
   :config (or (server-running-p) (server-mode)))
 #+end_src
@@ -804,8 +822,7 @@ We will use the =org-plus-contrib= package to get the whole deal:
 And here's where my actual Org configurations begin:
 
 #+begin_src emacs-lisp
-(use-package org
-  :straight nil
+(use-feature org
   :defer 0.5
   :config
   (setq org-src-tab-acts-natively t
@@ -836,8 +853,7 @@ And here's where my actual Org configurations begin:
   '(org-block ((t (:background "#1d1f21"))))
   '(org-latex-and-related ((t (:foreground "#b294bb")))))
 
-(use-package ox-latex
-  :straight nil
+(use-feature ox-latex
   :after ox
   :config
   (setq org-latex-listings 'listings
@@ -854,8 +870,7 @@ And here's where my actual Org configurations begin:
                  ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
                t))
 
-(use-package ox-beamer
-  :straight nil
+(use-feature ox-beamer
   :after ox)
 
 (use-package orgalist
-- 
cgit v1.2.3-60-g2f50


From cca52a26fc1bf6a5bc79285c1b05457f3f1be54f Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 13:45:49 -0500
Subject: [emacs][wip] move orgalist to enhancements section

---
 init.org | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/init.org b/init.org
index 6f38d73..a1ba40b 100644
--- a/init.org
+++ b/init.org
@@ -872,10 +872,6 @@ And here's where my actual Org configurations begin:
 
 (use-feature ox-beamer
   :after ox)
-
-(use-package orgalist
-  :after message
-  :hook (message-mode . orgalist-mode))
 #+end_src
 
 **** asynchronous tangle
@@ -1921,6 +1917,14 @@ Make =*scratch*= and =*Messages*= unkillable.
 
 Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 
+** orgalist
+
+#+begin_src emacs-lisp
+(use-package orgalist
+  :after message
+  :hook (message-mode . orgalist-mode))
+#+end_src
+
 ** typo.el
 
 #+begin_src emacs-lisp
-- 
cgit v1.2.3-60-g2f50


From 69b24a1e3574f2cf2b61b9bc9c267541c10fe02b Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 13:49:04 -0500
Subject: [emacs][wip] enable ivy (and friends) & the rest of my core packages

---
 init.org | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/init.org b/init.org
index a1ba40b..1e97ebc 100644
--- a/init.org
+++ b/init.org
@@ -951,7 +951,7 @@ Not just how I do git, but /the/ way to do git.
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 #+end_src
 
-*** COMMENT [[https://github.com/abo-abo/swiper][Ivy]] (and friends)
+*** [[https://github.com/abo-abo/swiper][Ivy]] (and friends)
 
 #+begin_quote
 Ivy - a generic completion frontend for Emacs, Swiper - isearch with
@@ -964,7 +964,7 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-package ivy
-  :defer 1
+  :defer 0.6
   :bind
   (:map ivy-minibuffer-map
    ([escape] . keyboard-escape-quit)
@@ -985,6 +985,7 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-package swiper
+  :after ivy
   :bind (("C-s"   . swiper)
          ("C-r"   . swiper)
          ("C-S-s" . isearch-forward)))
@@ -994,7 +995,7 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-package counsel
-  :defer 1
+  :after ivy
   :bind (([remap execute-extended-command] . counsel-M-x)
          ([remap find-file]                . counsel-find-file)
          ("s-r"                            . counsel-recentf)
@@ -1007,10 +1008,10 @@ There's no way I could top that, so I won't attempt to.
   (defalias 'locate #'counsel-locate))
 #+end_src
 
-*** COMMENT eshell
+*** eshell
 
 #+begin_src emacs-lisp
-(use-package eshell
+(use-feature eshell
   :defer 1
   :commands eshell
   :bind ("C-c a s e" . eshell)
@@ -1044,10 +1045,10 @@ There's no way I could top that, so I won't attempt to.
   (eshell-input-filter 'eshell-input-filter-initial-space))
 #+end_src
 
-*** COMMENT Ibuffer
+*** Ibuffer
 
 #+begin_src emacs-lisp
-(use-package ibuffer
+(use-feature ibuffer
   :defer t
   :bind
   (("C-x C-b" . ibuffer-other-window)
@@ -1115,10 +1116,10 @@ There's no way I could top that, so I won't attempt to.
   :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
 #+end_src
 
-*** COMMENT Outline
+*** Outline
 
 #+begin_src emacs-lisp
-(use-package outline
+(use-feature outline
   :defer t
   :hook (prog-mode . outline-minor-mode)
   :bind
-- 
cgit v1.2.3-60-g2f50


From 633dee4dc61935600273cf5035d05eda15ebc792 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 13:52:48 -0500
Subject: [emacs][wip] enable Borg's layer/essentials packages

---
 init.org | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/init.org b/init.org
index 1e97ebc..08b1404 100644
--- a/init.org
+++ b/init.org
@@ -1138,7 +1138,7 @@ There's no way I could top that, so I won't attempt to.
    ("s"   . outline-show-subtree)))
 #+end_src
 
-* COMMENT Borg's =layer/essentials=
+* Borg's =layer/essentials=
 :PROPERTIES:
 :CUSTOM_ID: borg-essentials
 :END:
@@ -1155,10 +1155,10 @@ TODO: break this giant source block down into individual org sections.
   (global-diff-hl-mode)
   (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t))
 
-(use-package ls-lisp
+(use-feature ls-lisp
   :custom (ls-lisp-dirs-first t))
 
-(use-package dired
+(use-feature dired
   :defer t
   :config
   (setq dired-listing-switches "-alh"
@@ -1195,11 +1195,11 @@ TODO: break this giant source block down into individual org sections.
                         (a/dired-start-process "zathura"))))
   :hook (dired-mode . dired-hide-details-mode))
 
-(use-package eldoc
+(use-feature eldoc
   :when (version< "25" emacs-version)
   :config (global-eldoc-mode))
 
-(use-package help
+(use-feature help
   :defer t
   :config
   (temp-buffer-resize-mode)
@@ -1208,7 +1208,7 @@ TODO: break this giant source block down into individual org sections.
 (progn ;    `isearch'
   (setq isearch-allow-scroll t))
 
-(use-package lisp-mode
+(use-feature lisp-mode
   :config
   (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode)
   (add-hook 'emacs-lisp-mode-hook 'reveal-mode)
@@ -1216,40 +1216,40 @@ TODO: break this giant source block down into individual org sections.
     (setq indent-tabs-mode nil))
   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
 
-(use-package man
+(use-feature man
   :defer t
   :config (setq Man-width 80))
 
-(use-package paren
+(use-feature paren
   :config (show-paren-mode))
 
-(use-package prog-mode
+(use-feature prog-mode
   :config (global-prettify-symbols-mode)
   (defun indicate-buffer-boundaries-left ()
     (setq indicate-buffer-boundaries 'left))
   (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
 
-(use-package recentf
+(use-feature recentf
   :defer 0.5
   :config
   (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
   (setq recentf-max-saved-items 40))
 
-(use-package savehist
+(use-feature savehist
   :config (savehist-mode))
 
-(use-package saveplace
+(use-feature saveplace
   :when (version< "25" emacs-version)
   :config (save-place-mode))
 
-(use-package simple
+(use-feature simple
   :config (column-number-mode))
 
 (progn ;    `text-mode'
   (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left)
   (add-hook 'text-mode-hook #'abbrev-mode))
 
-(use-package tramp
+(use-feature tramp
   :defer t
   :config
   (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
-- 
cgit v1.2.3-60-g2f50


From 41d73018804a062cb1cdd328a6f0f8230e98b080 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 14:24:27 -0500
Subject: [emacs][wip] bring layer/essentials under Core and break out Dired

---
 init.org | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/init.org b/init.org
index 08b1404..c0078b4 100644
--- a/init.org
+++ b/init.org
@@ -1138,23 +1138,9 @@ There's no way I could top that, so I won't attempt to.
    ("s"   . outline-show-subtree)))
 #+end_src
 
-* Borg's =layer/essentials=
-:PROPERTIES:
-:CUSTOM_ID: borg-essentials
-:END:
-
-TODO: break this giant source block down into individual org sections.
+*** Dired
 
 #+begin_src emacs-lisp
-(use-package dash
-  :config (dash-enable-font-lock))
-
-(use-package diff-hl
-  :config
-  (setq diff-hl-draw-borders nil)
-  (global-diff-hl-mode)
-  (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t))
-
 (use-feature ls-lisp
   :custom (ls-lisp-dirs-first t))
 
@@ -1194,6 +1180,24 @@ TODO: break this giant source block down into individual org sections.
                         (interactive)
                         (a/dired-start-process "zathura"))))
   :hook (dired-mode . dired-hide-details-mode))
+#+end_src
+
+*** Borg's =layer/essentials=
+:PROPERTIES:
+:CUSTOM_ID: borg-essentials
+:END:
+
+TODO: break this giant source block down into individual org sections.
+
+#+begin_src emacs-lisp
+(use-package dash
+  :config (dash-enable-font-lock))
+
+(use-package diff-hl
+  :config
+  (setq diff-hl-draw-borders nil)
+  (global-diff-hl-mode)
+  (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t))
 
 (use-feature eldoc
   :when (version< "25" emacs-version)
-- 
cgit v1.2.3-60-g2f50


From d2cb5b82a9008909778edb9bd79585bf1e5b6034 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 14:28:15 -0500
Subject: [emacs][wip] break out recentf and diff-hl

---
 init.org | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/init.org b/init.org
index c0078b4..074b892 100644
--- a/init.org
+++ b/init.org
@@ -951,6 +951,18 @@ Not just how I do git, but /the/ way to do git.
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 #+end_src
 
+*** recentf
+
+Recently opened files.
+
+#+begin_src emacs-lisp
+(use-feature recentf
+  :defer 0.5
+  :config
+  (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
+  (setq recentf-max-saved-items 40))
+#+end_src
+
 *** [[https://github.com/abo-abo/swiper][Ivy]] (and friends)
 
 #+begin_quote
@@ -1182,6 +1194,18 @@ There's no way I could top that, so I won't attempt to.
   :hook (dired-mode . dired-hide-details-mode))
 #+end_src
 
+*** =diff-hl=
+
+Highlight uncommitted changes in the left fringe.
+
+#+begin_src emacs-lisp
+(use-package diff-hl
+  :config
+  (setq diff-hl-draw-borders nil)
+  (global-diff-hl-mode)
+  (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t))
+#+end_src
+
 *** Borg's =layer/essentials=
 :PROPERTIES:
 :CUSTOM_ID: borg-essentials
@@ -1193,12 +1217,6 @@ TODO: break this giant source block down into individual org sections.
 (use-package dash
   :config (dash-enable-font-lock))
 
-(use-package diff-hl
-  :config
-  (setq diff-hl-draw-borders nil)
-  (global-diff-hl-mode)
-  (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t))
-
 (use-feature eldoc
   :when (version< "25" emacs-version)
   :config (global-eldoc-mode))
@@ -1233,12 +1251,6 @@ TODO: break this giant source block down into individual org sections.
     (setq indicate-buffer-boundaries 'left))
   (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
 
-(use-feature recentf
-  :defer 0.5
-  :config
-  (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
-  (setq recentf-max-saved-items 40))
-
 (use-feature savehist
   :config (savehist-mode))
 
-- 
cgit v1.2.3-60-g2f50


From f8e11b0e6f2d8dfe7a65d407288576f556241708 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 14:39:33 -0500
Subject: [emacs][wip] break out savehist and saveplace

---
 init.org | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/init.org b/init.org
index 074b892..c341674 100644
--- a/init.org
+++ b/init.org
@@ -1251,13 +1251,6 @@ TODO: break this giant source block down into individual org sections.
     (setq indicate-buffer-boundaries 'left))
   (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
 
-(use-feature savehist
-  :config (savehist-mode))
-
-(use-feature saveplace
-  :when (version< "25" emacs-version)
-  :config (save-place-mode))
-
 (use-feature simple
   :config (column-number-mode))
 
@@ -1275,12 +1268,31 @@ TODO: break this giant source block down into individual org sections.
 
 #+end_src
 
-* COMMENT Editing
+* Editing
 :PROPERTIES:
 :CUSTOM_ID: editing
 :END:
 
-** Company
+** =savehist=
+
+Save minibuffer history.
+
+#+begin_src emacs-lisp
+(use-feature savehist
+  :config (savehist-mode))
+#+end_src
+
+** =saveplace=
+
+Automatically save place in each file.
+
+#+begin_src emacs-lisp
+(use-feature saveplace
+  :when (version< "25" emacs-version)
+  :config (save-place-mode))
+#+end_src
+
+** COMMENT Company
 
 #+begin_src emacs-lisp
 (use-package company
-- 
cgit v1.2.3-60-g2f50


From 5023c31042541667f71ce802dc1c79fe24eedee1 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 14:42:01 -0500
Subject: [emacs][wip] move diff-hl to Editing

---
 init.org | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/init.org b/init.org
index c341674..8484b7b 100644
--- a/init.org
+++ b/init.org
@@ -1194,18 +1194,6 @@ There's no way I could top that, so I won't attempt to.
   :hook (dired-mode . dired-hide-details-mode))
 #+end_src
 
-*** =diff-hl=
-
-Highlight uncommitted changes in the left fringe.
-
-#+begin_src emacs-lisp
-(use-package diff-hl
-  :config
-  (setq diff-hl-draw-borders nil)
-  (global-diff-hl-mode)
-  (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t))
-#+end_src
-
 *** Borg's =layer/essentials=
 :PROPERTIES:
 :CUSTOM_ID: borg-essentials
@@ -1273,6 +1261,18 @@ TODO: break this giant source block down into individual org sections.
 :CUSTOM_ID: editing
 :END:
 
+** =diff-hl=
+
+Highlight uncommitted changes in the left fringe.
+
+#+begin_src emacs-lisp
+(use-package diff-hl
+  :config
+  (setq diff-hl-draw-borders nil)
+  (global-diff-hl-mode)
+  :hook (magit-post-refresh . diff-hl-magit-post-refresh))
+#+end_src
+
 ** =savehist=
 
 Save minibuffer history.
-- 
cgit v1.2.3-60-g2f50


From a8d0c7ad0aa7d9355117337046763e620b908907 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 14:45:06 -0500
Subject: [emacs][wip] break out Help and ElDoc

---
 init.org | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/init.org b/init.org
index 8484b7b..dc1e7dd 100644
--- a/init.org
+++ b/init.org
@@ -1194,6 +1194,16 @@ There's no way I could top that, so I won't attempt to.
   :hook (dired-mode . dired-hide-details-mode))
 #+end_src
 
+*** Help
+
+#+begin_src emacs-lisp
+(use-feature help
+  :defer t
+  :config
+  (temp-buffer-resize-mode)
+  (setq help-window-select t))
+#+end_src
+
 *** Borg's =layer/essentials=
 :PROPERTIES:
 :CUSTOM_ID: borg-essentials
@@ -1205,16 +1215,6 @@ TODO: break this giant source block down into individual org sections.
 (use-package dash
   :config (dash-enable-font-lock))
 
-(use-feature eldoc
-  :when (version< "25" emacs-version)
-  :config (global-eldoc-mode))
-
-(use-feature help
-  :defer t
-  :config
-  (temp-buffer-resize-mode)
-  (setq help-window-select t))
-
 (progn ;    `isearch'
   (setq isearch-allow-scroll t))
 
@@ -1273,6 +1273,16 @@ Highlight uncommitted changes in the left fringe.
   :hook (magit-post-refresh . diff-hl-magit-post-refresh))
 #+end_src
 
+** ElDoc
+
+Display Lisp objects at point in the echo area.
+
+#+begin_src emacs-lisp
+(use-feature eldoc
+  :when (version< "25" emacs-version)
+  :config (global-eldoc-mode))
+#+end_src
+
 ** =savehist=
 
 Save minibuffer history.
-- 
cgit v1.2.3-60-g2f50


From 6540f2c44d2948362e052c0048751d2bbfd2729a Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 14:49:04 -0500
Subject: [emacs][wip] break out isearch and paren

---
 init.org | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/init.org b/init.org
index dc1e7dd..2c534da 100644
--- a/init.org
+++ b/init.org
@@ -718,6 +718,12 @@ for this.
 (setq-default cursor-type 'bar)
 #+end_src
 
+*** Allow scrolling in Isearch
+
+#+begin_src emacs-lisp
+(setq isearch-allow-scroll t)
+#+end_src
+
 ** Bindings
 
 #+begin_src emacs-lisp
@@ -1215,9 +1221,6 @@ TODO: break this giant source block down into individual org sections.
 (use-package dash
   :config (dash-enable-font-lock))
 
-(progn ;    `isearch'
-  (setq isearch-allow-scroll t))
-
 (use-feature lisp-mode
   :config
   (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode)
@@ -1230,9 +1233,6 @@ TODO: break this giant source block down into individual org sections.
   :defer t
   :config (setq Man-width 80))
 
-(use-feature paren
-  :config (show-paren-mode))
-
 (use-feature prog-mode
   :config (global-prettify-symbols-mode)
   (defun indicate-buffer-boundaries-left ()
@@ -1283,6 +1283,15 @@ Display Lisp objects at point in the echo area.
   :config (global-eldoc-mode))
 #+end_src
 
+** paren
+
+Highlight matching parens.
+
+#+begin_src emacs-lisp
+(use-feature paren
+  :config (show-paren-mode))
+#+end_src
+
 ** =savehist=
 
 Save minibuffer history.
-- 
cgit v1.2.3-60-g2f50


From 5097c774acfc92aaa442371ea20e558901781bdd Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 14:54:18 -0500
Subject: [emacs][wip] break out prog-mode, text-mode, and lisp-mode

---
 init.org | 48 ++++++++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/init.org b/init.org
index 2c534da..0d3760b 100644
--- a/init.org
+++ b/init.org
@@ -1221,31 +1221,13 @@ TODO: break this giant source block down into individual org sections.
 (use-package dash
   :config (dash-enable-font-lock))
 
-(use-feature lisp-mode
-  :config
-  (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode)
-  (add-hook 'emacs-lisp-mode-hook 'reveal-mode)
-  (defun indent-spaces-mode ()
-    (setq indent-tabs-mode nil))
-  (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
-
 (use-feature man
   :defer t
   :config (setq Man-width 80))
 
-(use-feature prog-mode
-  :config (global-prettify-symbols-mode)
-  (defun indicate-buffer-boundaries-left ()
-    (setq indicate-buffer-boundaries 'left))
-  (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
-
 (use-feature simple
   :config (column-number-mode))
 
-(progn ;    `text-mode'
-  (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left)
-  (add-hook 'text-mode-hook #'abbrev-mode))
-
 (use-feature tramp
   :defer t
   :config
@@ -1311,6 +1293,36 @@ Automatically save place in each file.
   :config (save-place-mode))
 #+end_src
 
+** =prog-mode=
+
+#+begin_src emacs-lisp
+(use-feature prog-mode
+  :config (global-prettify-symbols-mode)
+  (defun indicate-buffer-boundaries-left ()
+    (setq indicate-buffer-boundaries 'left))
+  (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left))
+#+end_src
+
+** =text-mode=
+
+#+begin_src emacs-lisp
+(use-feature text-mode
+  :hook ((text-mode . indicate-buffer-boundaries-left)
+         (text-mode . abbrev-mode)))
+#+end_src
+
+** =lisp-mode=
+
+#+begin_src emacs-lisp
+(use-feature lisp-mode
+  :config
+  (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode)
+  (add-hook 'emacs-lisp-mode-hook 'reveal-mode)
+  (defun indent-spaces-mode ()
+    (setq indent-tabs-mode nil))
+  (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
+#+end_src
+
 ** COMMENT Company
 
 #+begin_src emacs-lisp
-- 
cgit v1.2.3-60-g2f50


From 9f120b4f64519184aa763042042e06010cdc380d Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 14:59:32 -0500
Subject: [emacs][wip] move out the rest of Borg layer/essentials

---
 init.org | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/init.org b/init.org
index 0d3760b..7a75546 100644
--- a/init.org
+++ b/init.org
@@ -1210,24 +1210,9 @@ There's no way I could top that, so I won't attempt to.
   (setq help-window-select t))
 #+end_src
 
-*** Borg's =layer/essentials=
-:PROPERTIES:
-:CUSTOM_ID: borg-essentials
-:END:
-
-TODO: break this giant source block down into individual org sections.
+*** Tramp
 
 #+begin_src emacs-lisp
-(use-package dash
-  :config (dash-enable-font-lock))
-
-(use-feature man
-  :defer t
-  :config (setq Man-width 80))
-
-(use-feature simple
-  :config (column-number-mode))
-
 (use-feature tramp
   :defer t
   :config
@@ -1235,7 +1220,14 @@ TODO: break this giant source block down into individual org sections.
   (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))
   (add-to-list 'tramp-default-proxies-alist
                (list (regexp-quote (system-name)) nil nil)))
+#+end_src
 
+*** Dash
+
+#+begin_src emacs-lisp
+(use-package dash
+  :defer t
+  :config (dash-enable-font-lock))
 #+end_src
 
 * Editing
@@ -1766,6 +1758,14 @@ treemacs
 :CUSTOM_ID: emacs-enhancements
 :END:
 
+** man
+
+#+begin_src emacs-lisp
+(use-feature man
+  :defer t
+  :config (setq Man-width 80))
+#+end_src
+
 ** [[https://github.com/justbur/emacs-which-key][which-key]]
 
 #+begin_quote
-- 
cgit v1.2.3-60-g2f50


From ab0674a210ad15c260261259076d00d5507b6e28 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 15:01:17 -0500
Subject: [emacs][wip] enable company

---
 init.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.org b/init.org
index 7a75546..f68f5dd 100644
--- a/init.org
+++ b/init.org
@@ -1315,7 +1315,7 @@ Automatically save place in each file.
   (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
 #+end_src
 
-** COMMENT Company
+** Company
 
 #+begin_src emacs-lisp
 (use-package company
-- 
cgit v1.2.3-60-g2f50


From de000e57d29fb5fb0f4f77531189039c4d88bf3a Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 15:17:59 -0500
Subject: [emacs][wip] move Syntax and Spell checking under Editing

---
 init.org | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/init.org b/init.org
index f68f5dd..1d6b1f9 100644
--- a/init.org
+++ b/init.org
@@ -1334,10 +1334,7 @@ Automatically save place in each file.
   (global-company-mode t))
 #+end_src
 
-* COMMENT Syntax and spell checking
-:PROPERTIES:
-:CUSTOM_ID: syntax-spell-checking
-:END:
+** Flycheck
 
 #+begin_src emacs-lisp
 (use-package flycheck
-- 
cgit v1.2.3-60-g2f50


From 520aebd55edb4f467b4d86228ecf8cd640525c78 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 15:33:17 -0500
Subject: [emacs][wip] enable some programming modes and update versions

---
 init.org                     | 38 +++++++++++++++++++-------------------
 straight/versions/default.el | 17 ++++++++++++++++-
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/init.org b/init.org
index 1d6b1f9..d3f3a64 100644
--- a/init.org
+++ b/init.org
@@ -1303,18 +1303,6 @@ Automatically save place in each file.
          (text-mode . abbrev-mode)))
 #+end_src
 
-** =lisp-mode=
-
-#+begin_src emacs-lisp
-(use-feature lisp-mode
-  :config
-  (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode)
-  (add-hook 'emacs-lisp-mode-hook 'reveal-mode)
-  (defun indent-spaces-mode ()
-    (setq indent-tabs-mode nil))
-  (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
-#+end_src
-
 ** Company
 
 #+begin_src emacs-lisp
@@ -1378,15 +1366,28 @@ Automatically save place in each file.
               #'endless/replace-quote))
 #+end_src
 
-* COMMENT Programming modes
+* Programming modes
 :PROPERTIES:
 :CUSTOM_ID: programming-modes
 :END:
 
+** Lisp
+
+#+begin_src emacs-lisp
+(use-feature lisp-mode
+  :config
+  (add-hook 'emacs-lisp-mode-hook 'outline-minor-mode)
+  (add-hook 'emacs-lisp-mode-hook 'reveal-mode)
+  (defun indent-spaces-mode ()
+    (setq indent-tabs-mode nil))
+  (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
+#+end_src
+
 ** [[http://alloytools.org][Alloy]] (with [[https://github.com/dwwmmn/alloy-mode][alloy-mode]])
 
 #+begin_src emacs-lisp
 (use-package alloy-mode
+  :straight (:host github :repo "dwwmmn/alloy-mode")
   :defer t
   :config (setq alloy-basic-offset 2))
 #+end_src
@@ -1394,9 +1395,8 @@ Automatically save place in each file.
 ** [[https://coq.inria.fr][Coq]] (with [[https://github.com/ProofGeneral/PG][Proof General]])
 
 #+begin_src emacs-lisp
-(use-package proof-site  ; Proof General
-  :defer t
-  :load-path "lib/proof-site/generic/")
+(use-package proof-general
+  :defer t)
 #+end_src
 
 ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]])
@@ -1606,7 +1606,7 @@ instead.
               ("C-c l l" . hs-lint)))
 #+end_src
 
-** Web dev
+** COMMENT Web dev
 
 *** SGML and HTML
 
@@ -1733,7 +1733,7 @@ treemacs
   :after (treemacs))
 #+end_src
 
-** geiser
+** COMMENT geiser
 
 #+begin_src emacs-lisp
 (use-package geiser)
@@ -1743,7 +1743,7 @@ treemacs
   (setq geiser-guile-load-path "~/src/git/guix"))
 #+end_src
 
-** guix
+** COMMENT guix
 
 #+begin_src emacs-lisp
 (use-package guix
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 2df0a79..33d04d1 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -1,14 +1,26 @@
-(("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f")
+(("PG" . "f7cc8f1f76baf5e517e51f1db47510ed605064e8")
+ ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f")
+ ("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f")
  ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04")
+ ("company-mode" . "b696b3943d2a55aed937cb0ba971d6e29b2e3a8b")
+ ("dante" . "8d5e00d268aa37d91baaa675cead953e58f19c6d")
  ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584")
+ ("diff-hl" . "2cddce48d472111f178da84d44656f92012aa64b")
  ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029")
  ("epkgs" . "3e2b3cbada81bdb5e9b3f4bf185c7258f656b021")
+ ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
  ("exec-path-from-shell" . "9bc0f4a762f16d488376fb52409c58239a86d75d")
  ("f.el" . "de6d4d40ddc844eee643e92d47b9d6a63fbebb48")
+ ("flycheck" . "baf96df4d1c3e61bf62f15fbea05a880d1e49e45")
+ ("flycheck-haskell" . "32ddff87165a7d3a35e7318bee997b5b4bd41278")
  ("ghub" . "db15d00d01b8bd9187079a0b538d878d241743a8")
  ("git.el" . "a3396a7027a7d986598c6a2d6d5599bac918f3da")
  ("gnu-elpa-mirror" . "db6dd0677f0adac536ec6c575865770aa902c0a1")
  ("graphql.el" . "e2b309689f4faf9225f290080f836e988c5a576d")
+ ("haskell-mode" . "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b")
+ ("hlint-refactor-mode" . "92c69aa01c65968e86c15db087bb1ea785e4736c")
+ ("lcr" . "c14f40692292d59156c7632dbdd2867c086aa75f")
+ ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499")
  ("let-alist" . "4a7693b678c59a148660c736cc0bb26a5032ee9a")
  ("magit" . "d866fb3624bdeb87f0c56e359239e4474362d0af")
  ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642")
@@ -16,8 +28,11 @@
  ("no-littering" . "4e7ecf017140bc522629cd2c977160f7cc2b8020")
  ("org" . "495c7c6a5774a4d3035c582a3b4c95eb04e83dd5")
  ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa")
+ ("pkg-info.el" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
  ("s.el" . "03410e6a7a2b11e47e1fea3b7d9899c7df26435e")
+ ("seq" . "095fb15a3baa082079799dd36b6caccdb062cb90")
  ("straight.el" . "13d019dfc72e69cce58b510766e197b044ea823b")
+ ("swiper" . "201c5d78c4985fb803eb681cca0ccc5a4f90b717")
  ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
  ("use-package" . "39a8b8812c2c9f6f0b299e6a04e504ef393694ce")
  ("with-editor" . "9dd9f176d96abc60365369de6d08c26c414ef1f3"))
-- 
cgit v1.2.3-60-g2f50


From 42b1fa9b023f964d566a74adc01376529d3e4e5a Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 15:41:51 -0500
Subject: [emacs][wip] enable web packages

---
 init.org                     | 7 +++----
 straight/versions/default.el | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/init.org b/init.org
index d3f3a64..9927089 100644
--- a/init.org
+++ b/init.org
@@ -1606,7 +1606,7 @@ instead.
               ("C-c l l" . hs-lint)))
 #+end_src
 
-** COMMENT Web dev
+** Web
 
 *** SGML and HTML
 
@@ -1738,7 +1738,7 @@ treemacs
 #+begin_src emacs-lisp
 (use-package geiser)
 
-(use-package geiser-guile
+(use-feature geiser-guile
   :config
   (setq geiser-guile-load-path "~/src/git/guix"))
 #+end_src
@@ -1746,8 +1746,7 @@ treemacs
 ** COMMENT guix
 
 #+begin_src emacs-lisp
-(use-package guix
-  :load-path "lib/guix/elisp")
+(use-package guix)
 #+end_src
 
 * COMMENT Emacs enhancements
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 33d04d1..e4b9a3b 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -7,6 +7,7 @@
  ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584")
  ("diff-hl" . "2cddce48d472111f178da84d44656f92012aa64b")
  ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029")
+ ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
  ("epkgs" . "3e2b3cbada81bdb5e9b3f4bf185c7258f656b021")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
  ("exec-path-from-shell" . "9bc0f4a762f16d488376fb52409c58239a86d75d")
@@ -35,5 +36,6 @@
  ("swiper" . "201c5d78c4985fb803eb681cca0ccc5a4f90b717")
  ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
  ("use-package" . "39a8b8812c2c9f6f0b299e6a04e504ef393694ce")
+ ("web-mode" . "5da977bec7714c09d41b556e2d651ccb269a14a2")
  ("with-editor" . "9dd9f176d96abc60365369de6d08c26c414ef1f3"))
 :saturn
-- 
cgit v1.2.3-60-g2f50


From e738f03b3599a28b260f6b0f502e886564994a41 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 15:52:55 -0500
Subject: [emacs][wip] enable Emacs Enhancements

---
 init.org                     |  4 ++--
 straight/versions/default.el | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/init.org b/init.org
index 9927089..9985ae5 100644
--- a/init.org
+++ b/init.org
@@ -1749,7 +1749,7 @@ treemacs
 (use-package guix)
 #+end_src
 
-* COMMENT Emacs enhancements
+* Emacs enhancements
 :PROPERTIES:
 :CUSTOM_ID: emacs-enhancements
 :END:
@@ -1864,7 +1864,7 @@ Emacs package that displays available keybindings in popup
 ** [[https://github.com/bbatsov/crux][crux]]
 
 #+begin_src emacs-lisp
-(use-package crux
+(use-package crux                       ; results in Waiting for git... [2 times]
   :defer 1
   :bind (("C-c b k" . crux-kill-other-buffers)
          ("C-c d"   . crux-duplicate-current-line-or-region)
diff --git a/straight/versions/default.el b/straight/versions/default.el
index e4b9a3b..a6b6713 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -1,16 +1,25 @@
 (("PG" . "f7cc8f1f76baf5e517e51f1db47510ed605064e8")
+ ("all-the-icons.el" . "52d1f2d36468146c93aaf11399f581401a233306")
  ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f")
  ("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f")
+ ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5")
  ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04")
  ("company-mode" . "b696b3943d2a55aed937cb0ba971d6e29b2e3a8b")
+ ("crux" . "308f17d914e2cd79cbc809de66d02b03ceb82859")
  ("dante" . "8d5e00d268aa37d91baaa675cead953e58f19c6d")
  ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584")
  ("diff-hl" . "2cddce48d472111f178da84d44656f92012aa64b")
+ ("elisp-refs" . "a8900dab9f8e2925ce5dea0f97bdac4ce47714d9")
  ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029")
+ ("emacs-doom-themes" . "2f4a0cdf287a086d45a1d9e8536ace6a2e152318")
+ ("emacs-memoize" . "9a561268ffb550b257a08710489a95cd087998b6")
+ ("emacs-which-key" . "43e3e3d7641a8e1c298b37e6a277612bf0898708")
  ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
  ("epkgs" . "3e2b3cbada81bdb5e9b3f4bf185c7258f656b021")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
+ ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519")
  ("exec-path-from-shell" . "9bc0f4a762f16d488376fb52409c58239a86d75d")
+ ("expand-region.el" . "ed3292473035dc8f3d2f321e82974ef87327808f")
  ("f.el" . "de6d4d40ddc844eee643e92d47b9d6a63fbebb48")
  ("flycheck" . "baf96df4d1c3e61bf62f15fbea05a880d1e49e45")
  ("flycheck-haskell" . "32ddff87165a7d3a35e7318bee997b5b4bd41278")
@@ -19,22 +28,37 @@
  ("gnu-elpa-mirror" . "db6dd0677f0adac536ec6c575865770aa902c0a1")
  ("graphql.el" . "e2b309689f4faf9225f290080f836e988c5a576d")
  ("haskell-mode" . "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b")
+ ("helpful" . "039345ef60b4722d050c94ab1978540137df35f9")
+ ("hl-todo" . "24b9925b1b2c7ad6bf7b66800395f74abf035c5f")
  ("hlint-refactor-mode" . "92c69aa01c65968e86c15db087bb1ea785e4736c")
  ("lcr" . "c14f40692292d59156c7632dbdd2867c086aa75f")
  ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499")
  ("let-alist" . "4a7693b678c59a148660c736cc0bb26a5032ee9a")
+ ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c")
  ("magit" . "d866fb3624bdeb87f0c56e359239e4474362d0af")
  ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642")
  ("melpa" . "5487adde3bbb1bfd875c51932c63ceef541d6b6f")
+ ("multi-term" . "f954e4e18b0a035151d34852387e724d87a3316f")
+ ("multiple-cursors.el" . "6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff")
+ ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
  ("no-littering" . "4e7ecf017140bc522629cd2c977160f7cc2b8020")
  ("org" . "495c7c6a5774a4d3035c582a3b4c95eb04e83dd5")
+ ("orgalist" . "f70a65da3a9bf3d0c1a9c769b77821d2a79c42cb")
  ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa")
+ ("page-break-lines" . "87e801efb816b24e83ebf84c052001e178e180bc")
  ("pkg-info.el" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
+ ("projectile" . "d625ecb09e3a9fb319740686402197bdf6fc109b")
+ ("rich-minority" . "a50d9b2fd059f6a0e5b22063a5375851a087f61a")
  ("s.el" . "03410e6a7a2b11e47e1fea3b7d9899c7df26435e")
  ("seq" . "095fb15a3baa082079799dd36b6caccdb062cb90")
+ ("shrink-path.el" . "9d06c453d1537df46a4b703a29213cc7f7857aa0")
+ ("shut-up" . "081d6b01e3ba0e60326558e545c4019219e046ce")
+ ("smart-mode-line" . "b79f4fa5f2380b0d726a895dd7199e5483004490")
  ("straight.el" . "13d019dfc72e69cce58b510766e197b044ea823b")
  ("swiper" . "201c5d78c4985fb803eb681cca0ccc5a4f90b717")
  ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
+ ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294")
+ ("unkillable-scratch" . "d805ee0570c218559cd972788c2d7f77704282b9")
  ("use-package" . "39a8b8812c2c9f6f0b299e6a04e504ef393694ce")
  ("web-mode" . "5da977bec7714c09d41b556e2d651ccb269a14a2")
  ("with-editor" . "9dd9f176d96abc60365369de6d08c26c414ef1f3"))
-- 
cgit v1.2.3-60-g2f50


From d4b2a7ef4e846259edb37593e399d4260afe168f Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 15:59:57 -0500
Subject: [emacs][wip] enable Email

---
 init.org                     | 30 +++++++++++++++---------------
 straight/versions/default.el |  2 ++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/init.org b/init.org
index 9985ae5..16351aa 100644
--- a/init.org
+++ b/init.org
@@ -2102,7 +2102,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
                ("a" . mc/mark-all-like-this))))
 #+end_src
 
-* COMMENT Email
+* Email
 :PROPERTIES:
 :CUSTOM_ID: email
 :END:
@@ -2121,7 +2121,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
  mail-user-agent   'gnus-user-agent
  read-mail-command 'gnus)
 
-(use-package gnus
+(use-feature gnus
   :bind (("s-m"   . gnus)
          ("s-M"   . gnus-unplugged))
   :init
@@ -2154,7 +2154,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
    gnus-interactive-exit nil
    gnus-gcc-mark-as-read t))
 
-(use-package gnus-art
+(use-feature gnus-art
   :config
   (setq
    gnus-visible-headers
@@ -2183,7 +2183,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
    ("R"   . gnus-article-wide-reply-with-original)
    ("M-L" . org-store-link)))
 
-(use-package gnus-sum
+(use-feature gnus-sum
   :bind (:map gnus-summary-mode-map
               :prefix-map a/gnus-summary-prefix-map
               :prefix "v"
@@ -2198,7 +2198,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
    ("M-L" . org-store-link))
   :hook (gnus-summary-mode . a/no-mouse-autoselect-window))
 
-(use-package gnus-msg
+(use-feature gnus-msg
   :config
   (setq gnus-posting-styles
         '((".*"
@@ -2215,19 +2215,19 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
            (address "abandali@uwaterloo.ca")
            (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
 
-(use-package gnus-topic
+(use-feature gnus-topic
   :hook (gnus-group-mode . gnus-topic-mode))
 
-(use-package gnus-agent
+(use-feature gnus-agent
   :config
   (setq gnus-agent-synchronize-flags 'ask)
   :hook (gnus-group-mode . gnus-agent-mode))
 
-(use-package gnus-group
+(use-feature gnus-group
   :config
   (setq gnus-permanently-visible-groups "\\((INBOX\\|gnu$\\)"))
 
-(use-package mm-decode
+(use-feature mm-decode
   :config
   (setq mm-discouraged-alternatives '("text/html" "text/richtext")))
 #+end_src
@@ -2235,7 +2235,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 ** sendmail
 
 #+begin_src emacs-lisp
-(use-package sendmail
+(use-feature sendmail
   :config
   (setq sendmail-program "/usr/bin/msmtp"
         ;; message-sendmail-extra-arguments '("-v" "-d")
@@ -2246,7 +2246,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 ** message
 
 #+begin_src emacs-lisp
-(use-package message
+(use-feature message
   :config
   (defconst a/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:")
   (defconst message-cite-style-bandali
@@ -2291,7 +2291,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 Convenient footnotes in =message-mode=.
 
 #+begin_src emacs-lisp
-(use-package footnote
+(use-feature footnote
   :after message
   :bind
   (:map message-mode-map
@@ -2321,7 +2321,7 @@ Convenient footnotes in =message-mode=.
   (with-eval-after-load 'swiper
     (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
 
-(use-package ebdb-com
+(use-feature ebdb-com
   :after ebdb)
 
 ;; (use-package ebdb-complete
@@ -2338,7 +2338,7 @@ Convenient footnotes in =message-mode=.
                     (add-to-list (make-local-variable 'company-backends)
                                  'company-ebdb))))
 
-(use-package ebdb-gnus
+(use-feature ebdb-gnus
   :after ebdb
   :custom
   (ebdb-gnus-window-configuration
@@ -2349,7 +2349,7 @@ Convenient footnotes in =message-mode=.
                            (article 1.0)
                            (ebdb-gnus 0.3))))))
 
-(use-package ebdb-mua
+(use-feature ebdb-mua
   :after ebdb
   ;; :custom (ebdb-mua-pop-up nil)
   )
diff --git a/straight/versions/default.el b/straight/versions/default.el
index a6b6713..e5e1e48 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -4,11 +4,13 @@
  ("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f")
  ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5")
  ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04")
+ ("company-ebdb" . "3b463fe1236ac6445657f3a1df20357a7a2fa8f6")
  ("company-mode" . "b696b3943d2a55aed937cb0ba971d6e29b2e3a8b")
  ("crux" . "308f17d914e2cd79cbc809de66d02b03ceb82859")
  ("dante" . "8d5e00d268aa37d91baaa675cead953e58f19c6d")
  ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584")
  ("diff-hl" . "2cddce48d472111f178da84d44656f92012aa64b")
+ ("ebdb" . "51733ece51fcae699e977703d61f2f2ebaea70b1")
  ("elisp-refs" . "a8900dab9f8e2925ce5dea0f97bdac4ce47714d9")
  ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029")
  ("emacs-doom-themes" . "2f4a0cdf287a086d45a1d9e8536ace6a2e152318")
-- 
cgit v1.2.3-60-g2f50


From cc7b1957e09ef7847db5bbf0e1628b80cc386944 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 16:00:21 -0500
Subject: [emacs][wip] add smex

---
 init.org                     | 13 +++++++++++++
 straight/versions/default.el |  1 +
 2 files changed, 14 insertions(+)

diff --git a/init.org b/init.org
index 16351aa..8240b51 100644
--- a/init.org
+++ b/init.org
@@ -969,6 +969,19 @@ Recently opened files.
   (setq recentf-max-saved-items 40))
 #+end_src
 
+*** smex
+
+#+begin_quote
+A smart M-x enhancement for Emacs.
+#+end_quote
+
+Mostly because =counsel= needs it to remember history.
+
+#+begin_src emacs-lisp
+(use-package smex
+  :defer t)
+#+end_src
+
 *** [[https://github.com/abo-abo/swiper][Ivy]] (and friends)
 
 #+begin_quote
diff --git a/straight/versions/default.el b/straight/versions/default.el
index e5e1e48..224dd6e 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -56,6 +56,7 @@
  ("shrink-path.el" . "9d06c453d1537df46a4b703a29213cc7f7857aa0")
  ("shut-up" . "081d6b01e3ba0e60326558e545c4019219e046ce")
  ("smart-mode-line" . "b79f4fa5f2380b0d726a895dd7199e5483004490")
+ ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c")
  ("straight.el" . "13d019dfc72e69cce58b510766e197b044ea823b")
  ("swiper" . "201c5d78c4985fb803eb681cca0ccc5a4f90b717")
  ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
-- 
cgit v1.2.3-60-g2f50


From c27a9ad6470c6be15d2f6ec5fdb54842eba24068 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 16:08:24 -0500
Subject: [emacs][wip] enable Blogging

---
 init.org                     | 6 +++---
 straight/versions/default.el | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/init.org b/init.org
index 8240b51..42487ee 100644
--- a/init.org
+++ b/init.org
@@ -2402,7 +2402,7 @@ Convenient footnotes in =message-mode=.
     (gnus-harvest-install)))
 #+end_src
 
-* COMMENT Blogging
+* Blogging
 :PROPERTIES:
 :CUSTOM_ID: blogging
 :END:
@@ -2413,8 +2413,8 @@ Convenient footnotes in =message-mode=.
 (use-package ox-hugo
   :after ox)
 
-(use-package ox-hugo-auto-export
-  :load-path "lib/ox-hugo")
+(use-feature ox-hugo-auto-export
+  :after ox-hugo)
 #+end_src
 
 * Post initialization
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 224dd6e..74548a0 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -46,6 +46,7 @@
  ("no-littering" . "4e7ecf017140bc522629cd2c977160f7cc2b8020")
  ("org" . "495c7c6a5774a4d3035c582a3b4c95eb04e83dd5")
  ("orgalist" . "f70a65da3a9bf3d0c1a9c769b77821d2a79c42cb")
+ ("ox-hugo" . "00186ff8d7ae13fab6707b0e2e7665e055db558f")
  ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa")
  ("page-break-lines" . "87e801efb816b24e83ebf84c052001e178e180bc")
  ("pkg-info.el" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
-- 
cgit v1.2.3-60-g2f50


From 04a268e34909e76750d4a41ea5e042c4903bf8a5 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 16:10:31 -0500
Subject: [emacs][wip] (setq use-package-always-defer t)

---
 init.org | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/init.org b/init.org
index 42487ee..52c1437 100644
--- a/init.org
+++ b/init.org
@@ -296,6 +296,8 @@ and without compromising on performance.
           debug-on-error t)
   (setq use-package-verbose nil
         use-package-expand-minimally t))
+
+(setq use-package-always-defer t)
 #+end_src
 
 *** COMMENT Epkg
@@ -978,8 +980,7 @@ A smart M-x enhancement for Emacs.
 Mostly because =counsel= needs it to remember history.
 
 #+begin_src emacs-lisp
-(use-package smex
-  :defer t)
+(use-package smex)
 #+end_src
 
 *** [[https://github.com/abo-abo/swiper][Ivy]] (and friends)
@@ -1080,7 +1081,6 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-feature ibuffer
-  :defer t
   :bind
   (("C-x C-b" . ibuffer-other-window)
    :map ibuffer-mode-map
@@ -1151,7 +1151,6 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-feature outline
-  :defer t
   :hook (prog-mode . outline-minor-mode)
   :bind
   (:map
@@ -1176,7 +1175,6 @@ There's no way I could top that, so I won't attempt to.
   :custom (ls-lisp-dirs-first t))
 
 (use-feature dired
-  :defer t
   :config
   (setq dired-listing-switches "-alh"
         ls-lisp-use-insert-directory-program nil)
@@ -1217,7 +1215,6 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-feature help
-  :defer t
   :config
   (temp-buffer-resize-mode)
   (setq help-window-select t))
@@ -1227,7 +1224,6 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-feature tramp
-  :defer t
   :config
   (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
   (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))
@@ -1239,7 +1235,6 @@ There's no way I could top that, so I won't attempt to.
 
 #+begin_src emacs-lisp
 (use-package dash
-  :defer t
   :config (dash-enable-font-lock))
 #+end_src
 
@@ -1401,15 +1396,13 @@ Automatically save place in each file.
 #+begin_src emacs-lisp
 (use-package alloy-mode
   :straight (:host github :repo "dwwmmn/alloy-mode")
-  :defer t
   :config (setq alloy-basic-offset 2))
 #+end_src
 
 ** [[https://coq.inria.fr][Coq]] (with [[https://github.com/ProofGeneral/PG][Proof General]])
 
 #+begin_src emacs-lisp
-(use-package proof-general
-  :defer t)
+(use-package proof-general)
 #+end_src
 
 ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]])
@@ -1436,7 +1429,6 @@ Automatically save place in each file.
 
 #+begin_src emacs-lisp
 (use-package haskell-mode
-  :defer t
   :config
   (setq haskell-indentation-layout-offset 4
         haskell-indentation-left-offset 4
@@ -1625,7 +1617,6 @@ instead.
 
 #+begin_src emacs-lisp
 (use-package sgml-mode
-  :defer t
   :config
   (setq sgml-basic-offset 2))
 #+end_src
@@ -1634,7 +1625,6 @@ instead.
 
 #+begin_src emacs-lisp
 (use-package css-mode
-  :defer t
   :config
   (setq css-indent-offset 2))
 #+end_src
@@ -1643,7 +1633,6 @@ instead.
 
 #+begin_src emacs-lisp
 (use-package web-mode
-  :defer t
   :mode "\\.html\\'"
   :config
   (a/setq-every 2
@@ -1771,7 +1760,6 @@ treemacs
 
 #+begin_src emacs-lisp
 (use-feature man
-  :defer t
   :config (setq Man-width 80))
 #+end_src
 
@@ -1903,7 +1891,6 @@ Emacs package that displays available keybindings in popup
 
 #+begin_src emacs-lisp
 (use-package projectile
-  :defer t
   :bind-keymap ("C-c p" . projectile-command-map)
   :config
   (projectile-mode)
@@ -2327,7 +2314,7 @@ Convenient footnotes in =message-mode=.
 
 #+begin_src emacs-lisp
 (use-package ebdb
-  :defer 1
+  :after gnus
   :bind (:map gnus-group-mode-map ("e" . ebdb))
   :config
   (setq ebdb-sources (no-littering-expand-var-file-name "ebdb"))
-- 
cgit v1.2.3-60-g2f50


From 74626963731ccceba54e7a26cce8ea342e0fc646 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 16:15:53 -0500
Subject: [emacs][wip] remove all the package submodules

---
 .gitignore               |   4 +-
 .gitmodules              | 280 -----------------------------------------------
 lib/alert                |   1 -
 lib/all-the-icons        |   1 -
 lib/alloy-mode           |   1 -
 lib/async                |   1 -
 lib/auto-compile         |   1 -
 lib/boogie-friends       |   1 -
 lib/borg                 |   1 -
 lib/boxquote             |   1 -
 lib/bui                  |   1 -
 lib/closql               |   1 -
 lib/company              |   1 -
 lib/company-ebdb         |   1 -
 lib/crux                 |   1 -
 lib/dante                |   1 -
 lib/dash                 |   1 -
 lib/diff-hl              |   1 -
 lib/doom-themes          |   1 -
 lib/ebdb                 |   1 -
 lib/ebdb-gnorb           |   1 -
 lib/edit-indirect        |   1 -
 lib/eldoc-eval           |   1 -
 lib/elisp-refs           |   1 -
 lib/emacsql              |   1 -
 lib/emmet-mode           |   1 -
 lib/epkg                 |   1 -
 lib/epl                  |   1 -
 lib/eshell-up            |   1 -
 lib/exec-path-from-shell |   1 -
 lib/expand-region        |   1 -
 lib/f                    |   1 -
 lib/flycheck             |   1 -
 lib/flycheck-haskell     |   1 -
 lib/geiser               |   1 -
 lib/ghub                 |   1 -
 lib/git-modes            |   1 -
 lib/gnorb                |   1 -
 lib/graphql              |   1 -
 lib/guix                 |   1 -
 lib/haskell-mode         |   1 -
 lib/helm                 |   1 -
 lib/helpful              |   1 -
 lib/hl-todo              |   1 -
 lib/hlint-refactor       |   1 -
 lib/ht                   |   1 -
 lib/hydra                |   1 -
 lib/ivy                  |   1 -
 lib/lcr                  |   1 -
 lib/lean-mode            |   1 -
 lib/loop                 |   1 -
 lib/magit                |   1 -
 lib/magit-popup          |   1 -
 lib/markdown-mode        |   1 -
 lib/memoize              |   1 -
 lib/multi-term           |   1 -
 lib/multiple-cursors     |   1 -
 lib/mwim                 |   1 -
 lib/no-littering         |   1 -
 lib/org                  |   1 -
 lib/orgalist             |   1 -
 lib/other-frame-window   |   1 -
 lib/ox-hugo              |   1 -
 lib/packed               |   1 -
 lib/page-break-lines     |   1 -
 lib/pkg-info             |   1 -
 lib/popup                |   1 -
 lib/projectile           |   1 -
 lib/proof-site           |   1 -
 lib/rich-minority        |   1 -
 lib/s                    |   1 -
 lib/shrink-path          |   1 -
 lib/shut-up              |   1 -
 lib/smart-mode-line      |   1 -
 lib/smex                 |   1 -
 lib/treepy               |   1 -
 lib/typo                 |   1 -
 lib/unkillable-scratch   |   1 -
 lib/use-package          |   1 -
 lib/web-mode             |   1 -
 lib/which-key            |   1 -
 lib/winum                |   1 -
 lib/with-editor          |   1 -
 lib/yaml-mode            |   1 -
 lib/yasnippet            |   1 -
 85 files changed, 1 insertion(+), 366 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 lib/alert
 delete mode 160000 lib/all-the-icons
 delete mode 160000 lib/alloy-mode
 delete mode 160000 lib/async
 delete mode 160000 lib/auto-compile
 delete mode 160000 lib/boogie-friends
 delete mode 160000 lib/borg
 delete mode 160000 lib/boxquote
 delete mode 160000 lib/bui
 delete mode 160000 lib/closql
 delete mode 160000 lib/company
 delete mode 160000 lib/company-ebdb
 delete mode 160000 lib/crux
 delete mode 160000 lib/dante
 delete mode 160000 lib/dash
 delete mode 160000 lib/diff-hl
 delete mode 160000 lib/doom-themes
 delete mode 160000 lib/ebdb
 delete mode 160000 lib/ebdb-gnorb
 delete mode 160000 lib/edit-indirect
 delete mode 160000 lib/eldoc-eval
 delete mode 160000 lib/elisp-refs
 delete mode 160000 lib/emacsql
 delete mode 160000 lib/emmet-mode
 delete mode 160000 lib/epkg
 delete mode 160000 lib/epl
 delete mode 160000 lib/eshell-up
 delete mode 160000 lib/exec-path-from-shell
 delete mode 160000 lib/expand-region
 delete mode 160000 lib/f
 delete mode 160000 lib/flycheck
 delete mode 160000 lib/flycheck-haskell
 delete mode 160000 lib/geiser
 delete mode 160000 lib/ghub
 delete mode 160000 lib/git-modes
 delete mode 160000 lib/gnorb
 delete mode 160000 lib/graphql
 delete mode 160000 lib/guix
 delete mode 160000 lib/haskell-mode
 delete mode 160000 lib/helm
 delete mode 160000 lib/helpful
 delete mode 160000 lib/hl-todo
 delete mode 160000 lib/hlint-refactor
 delete mode 160000 lib/ht
 delete mode 160000 lib/hydra
 delete mode 160000 lib/ivy
 delete mode 160000 lib/lcr
 delete mode 160000 lib/lean-mode
 delete mode 160000 lib/loop
 delete mode 160000 lib/magit
 delete mode 160000 lib/magit-popup
 delete mode 160000 lib/markdown-mode
 delete mode 160000 lib/memoize
 delete mode 160000 lib/multi-term
 delete mode 160000 lib/multiple-cursors
 delete mode 160000 lib/mwim
 delete mode 160000 lib/no-littering
 delete mode 160000 lib/org
 delete mode 160000 lib/orgalist
 delete mode 160000 lib/other-frame-window
 delete mode 160000 lib/ox-hugo
 delete mode 160000 lib/packed
 delete mode 160000 lib/page-break-lines
 delete mode 160000 lib/pkg-info
 delete mode 160000 lib/popup
 delete mode 160000 lib/projectile
 delete mode 160000 lib/proof-site
 delete mode 160000 lib/rich-minority
 delete mode 160000 lib/s
 delete mode 160000 lib/shrink-path
 delete mode 160000 lib/shut-up
 delete mode 160000 lib/smart-mode-line
 delete mode 160000 lib/smex
 delete mode 160000 lib/treepy
 delete mode 160000 lib/typo
 delete mode 160000 lib/unkillable-scratch
 delete mode 160000 lib/use-package
 delete mode 160000 lib/web-mode
 delete mode 160000 lib/which-key
 delete mode 160000 lib/winum
 delete mode 160000 lib/with-editor
 delete mode 160000 lib/yaml-mode
 delete mode 160000 lib/yasnippet

diff --git a/.gitignore b/.gitignore
index 0a959bc..4303fd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,12 +7,10 @@
 !/straight/versions
 
 /var/*
+/var/eshell/lastdir
 /var/eshell/history
 
 !/var/eshell
 !/var/eshell/alias
 
 !/var/abbrev.el
-
-!/lisp/bbdb/bbdb-autoloads.el
-/var/eshell/lastdir
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 69acabf..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,280 +0,0 @@
-[borg]
-	pushDefault = aminb
-	collective = emacsg
-[submodule "alert"]
-	path = lib/alert
-	url = git@github.com:jwiegley/alert.git
-[submodule "all-the-icons"]
-	path = lib/all-the-icons
-	url = git@github.com:domtronn/all-the-icons.el.git
-[submodule "alloy-mode"]
-	path = lib/alloy-mode
-	url = git@github.com:dwwmmn/alloy-mode.git
-[submodule "async"]
-	path = lib/async
-	url = git@github.com:jwiegley/emacs-async.git
-[submodule "auto-compile"]
-	path = lib/auto-compile
-	url = git@github.com:emacscollective/auto-compile.git
-[submodule "boogie-friends"]
-	path = lib/boogie-friends
-	url = git@github.com:boogie-org/boogie-friends.git
-	load-path = emacs
-[submodule "borg"]
-	path = lib/borg
-	url = git@github.com:emacscollective/borg.git
-[submodule "boxquote"]
-	path = lib/boxquote
-	url = git@github.com:davep/boxquote.el.git
-[submodule "bui"]
-	path = lib/bui
-	url = git@github.com:alezost/bui.el.git
-[submodule "closql"]
-	path = lib/closql
-	url = git@github.com:emacscollective/closql.git
-[submodule "company"]
-	path = lib/company
-	url = git@github.com:company-mode/company-mode.git
-[submodule "company-ebdb"]
-	path = lib/company-ebdb
-	url = git@github.com:emacsmirror/company-ebdb.git
-[submodule "crux"]
-	path = lib/crux
-	url = git@github.com:bbatsov/crux.git
-[submodule "dante"]
-	path = lib/dante
-	url = git@github.com:jyp/dante.git
-[submodule "dash"]
-	path = lib/dash
-	url = git@github.com:magnars/dash.el.git
-	no-makeinfo = dash-template.texi
-	# dash creates a `dir' dash info file, which makes git think
-	# that the submodule is dirty. so, let's ignore the untracked
-	# files of dash's submodule
-	ignore = untracked
-[submodule "diff-hl"]
-	path = lib/diff-hl
-	url = git@github.com:dgutov/diff-hl.git
-[submodule "doom-themes"]
-	path = lib/doom-themes
-	url = git@github.com:hlissner/emacs-doom-themes.git
-[submodule "ebdb"]
-	path = lib/ebdb
-	url = git@github.com:girzel/ebdb.git
-[submodule "ebdb-gnorb"]
-	path = lib/ebdb-gnorb
-	url = git@github.com:emacsmirror/ebdb-gnorb.git
-[submodule "edit-indirect"]
-	path = lib/edit-indirect
-	url = git@github.com:Fanael/edit-indirect.git
-[submodule "eldoc-eval"]
-	path = lib/eldoc-eval
-	url = git@github.com:thierryvolpiatto/eldoc-eval.git
-[submodule "elisp-refs"]
-	path = lib/elisp-refs
-	url = git@github.com:Wilfred/elisp-refs.git
-[submodule "emacsql"]
-	path = lib/emacsql
-	url = git@github.com:skeeto/emacsql.git
-	no-byte-compile = emacsql-pg.el
-[submodule "emmet-mode"]
-	path = lib/emmet-mode
-	url = git@github.com:smihica/emmet-mode.git
-[submodule "epkg"]
-	path = lib/epkg
-	url = git@github.com:emacscollective/epkg.git
-[submodule "epl"]
-	path = lib/epl
-	url = git@github.com:cask/epl.git
-[submodule "eshell-up"]
-	path = lib/eshell-up
-	url = git@github.com:peterwvj/eshell-up.git
-[submodule "exec-path-from-shell"]
-	path = lib/exec-path-from-shell
-	url = git@github.com:purcell/exec-path-from-shell.git
-[submodule "expand-region"]
-	path = lib/expand-region
-	url = git@github.com:magnars/expand-region.el.git
-[submodule "f"]
-	path = lib/f
-	url = git@github.com:rejeep/f.el.git
-[submodule "flycheck"]
-	path = lib/flycheck
-	url = git@github.com:flycheck/flycheck.git
-[submodule "flycheck-haskell"]
-	path = lib/flycheck-haskell
-	url = git@github.com:flycheck/flycheck-haskell.git
-[submodule "geiser"]
-	path = lib/geiser
-	url = git@gitlab.com:jaor/geiser.git
-	info-path = doc
-	load-path = elisp
-	build-step = ./autogen.sh
-	build-step = ./configure
-	build-step = make
-[submodule "ghub"]
-	path = lib/ghub
-	url = git@github.com:magit/ghub.git
-[submodule "git-modes"]
-	path = lib/git-modes
-	url = git@github.com:magit/git-modes.git
-[submodule "gnorb"]
-	path = lib/gnorb
-	url = git@github.com:girzel/gnorb.git
-	no-byte-compile = gnorb-bbdb.el
-[submodule "graphql"]
-	path = lib/graphql
-	url = git@github.com:vermiculus/graphql.el.git
-[submodule "guix"]
-	path = lib/guix
-	url = git@github.com:alezost/guix.el.git
-	info-path = doc
-	load-path = elisp
-	build-step = ./autogen.sh
-	build-step = ./configure
-	build-step = make
-[submodule "haskell-mode"]
-	path = lib/haskell-mode
-	url = git@github.com:haskell/haskell-mode.git
-[submodule "helm"]
-	path = lib/helm
-	url = git@github.com:emacs-helm/helm.git
-[submodule "helpful"]
-	path = lib/helpful
-	url = git@github.com:Wilfred/helpful.git
-[submodule "hl-todo"]
-	path = lib/hl-todo
-	url = git@github.com:tarsius/hl-todo.git
-[submodule "hlint-refactor"]
-	path = lib/hlint-refactor
-	url = git@github.com:mpickering/hlint-refactor-mode.git
-[submodule "ht"]
-	path = lib/ht
-	url = git@github.com:Wilfred/ht.el.git
-[submodule "hydra"]
-	path = lib/hydra
-	url = git@github.com:abo-abo/hydra.git
-[submodule "ivy"]
-	path = lib/ivy
-	url = git@github.com:abo-abo/swiper.git
-	info-path = doc
-[submodule "lcr"]
-	path = lib/lcr
-	url = git@github.com:jyp/lcr.git
-[submodule "lean-mode"]
-	path = lib/lean-mode
-	url = git@github.com:leanprover/lean-mode.git
-[submodule "loop"]
-	path = lib/loop
-	url = git@github.com:Wilfred/loop.el.git
-[submodule "magit"]
-	path = lib/magit
-	url = git@github.com:magit/magit.git
-	recursive-byte-compile = true
-	info-path = Documentation
-[submodule "magit-popup"]
-	path = lib/magit-popup
-	url = git@github.com:magit/magit-popup.git
-[submodule "markdown-mode"]
-	path = lib/markdown-mode
-	url = git@github.com:jrblevin/markdown-mode.git
-[submodule "memoize"]
-	path = lib/memoize
-	url = git@github.com:skeeto/emacs-memoize.git
-[submodule "multi-term"]
-	path = lib/multi-term
-	url = git@github.com:emacsorphanage/multi-term.git
-[submodule "multiple-cursors"]
-	path = lib/multiple-cursors
-	url = git@github.com:magnars/multiple-cursors.el.git
-[submodule "mwim"]
-	path = lib/mwim
-	url = git@github.com:alezost/mwim.el.git
-[submodule "no-littering"]
-	path = lib/no-littering
-	url = git@github.com:emacscollective/no-littering.git
-[submodule "org"]
-	path = lib/org
-	url = git@code.orgmode.org:bzg/org-mode.git
-	load-path = lisp
-	info-path = doc
-	build-step = make compile autoloads info # ORG_ADD_CONTRIB="org-notmuch"
-	# setting ORG_ADD_CONTRIB results in copying of files from contrib/
-	# into lisp/, which git will pick up.  so, let's ignore untracked files
-	# from org's submodule; at least for now
-	# ignore = untracked
-[submodule "orgalist"]
-	path = lib/orgalist
-	url = git@github.com:emacsmirror/orgalist.git
-[submodule "other-frame-window"]
-	path = lib/other-frame-window
-	url = git@github.com:emacsmirror/other-frame-window.git
-[submodule "ox-hugo"]
-	path = lib/ox-hugo
-	url = git@github.com:kaushalmodi/ox-hugo.git
-[submodule "packed"]
-	path = lib/packed
-	url = git@github.com:emacscollective/packed.git
-[submodule "page-break-lines"]
-	path = lib/page-break-lines
-	url = git@github.com:purcell/page-break-lines.git
-[submodule "pkg-info"]
-	path = lib/pkg-info
-	url = git@github.com:lunaryorn/pkg-info.el.git
-[submodule "popup"]
-	path = lib/popup
-	url = git@github.com:auto-complete/popup-el.git
-[submodule "projectile"]
-	path = lib/projectile
-	url = git@github.com:bbatsov/projectile.git
-[submodule "proof-site"]  # Proof General
-	path = lib/proof-site
-	url = git@github.com:ProofGeneral/PG.git
-[submodule "rich-minority"]
-	path = lib/rich-minority
-	url = git@github.com:Malabarba/rich-minority.git
-[submodule "s"]
-	path = lib/s
-	url = git@github.com:magnars/s.el.git
-[submodule "shrink-path"]
-	path = lib/shrink-path
-	url = git@gitlab.com:bennya/shrink-path.el.git
-[submodule "shut-up"]
-	path = lib/shut-up
-	url = git@github.com:cask/shut-up.git
-[submodule "smart-mode-line"]
-	path = lib/smart-mode-line
-	url = git@github.com:Malabarba/smart-mode-line.git
-[submodule "smex"]  # used by counsel-M-x
-	path = lib/smex
-	url = git@github.com:nonsequitur/smex.git
-[submodule "treepy"]
-	path = lib/treepy
-	url = git@github.com:volrath/treepy.el.git
-[submodule "typo"]
-	path = lib/typo
-	url = git@github.com:jorgenschaefer/typoel.git
-[submodule "unkillable-scratch"]
-	path = lib/unkillable-scratch
-	url = git@github.com:EricCrosson/unkillable-scratch.git
-[submodule "use-package"]
-	path = lib/use-package
-	url = git@github.com:jwiegley/use-package.git
-[submodule "web-mode"]
-	path = lib/web-mode
-	url = git@github.com:fxbois/web-mode.git
-[submodule "which-key"]
-	path = lib/which-key
-	url = git@github.com:justbur/emacs-which-key.git
-[submodule "winum"]
-	path = lib/winum
-	url = git@github.com:deb0ch/emacs-winum.git
-[submodule "with-editor"]
-	path = lib/with-editor
-	url = git@github.com:magit/with-editor.git
-[submodule "yaml-mode"]
-	path = lib/yaml-mode
-	url = git@github.com:yoshiki/yaml-mode.git
-[submodule "yasnippet"]
-	path = lib/yasnippet
-	url = git@github.com:joaotavora/yasnippet.git
diff --git a/lib/alert b/lib/alert
deleted file mode 160000
index 9f329be..0000000
--- a/lib/alert
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9f329be87820474925f29b52a1131084c8ea95b9
diff --git a/lib/all-the-icons b/lib/all-the-icons
deleted file mode 160000
index 52d1f2d..0000000
--- a/lib/all-the-icons
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 52d1f2d36468146c93aaf11399f581401a233306
diff --git a/lib/alloy-mode b/lib/alloy-mode
deleted file mode 160000
index 0d05bdd..0000000
--- a/lib/alloy-mode
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0d05bdd10c77ec04c3d61eccf67e68c08284951f
diff --git a/lib/async b/lib/async
deleted file mode 160000
index 81dc034..0000000
--- a/lib/async
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 81dc034572e963550c5403a2b3c28047e46b4029
diff --git a/lib/auto-compile b/lib/auto-compile
deleted file mode 160000
index 6ce4255..0000000
--- a/lib/auto-compile
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f
diff --git a/lib/boogie-friends b/lib/boogie-friends
deleted file mode 160000
index ff99037..0000000
--- a/lib/boogie-friends
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff9903783013f3598b6f44c99d47b25c5cdbed00
diff --git a/lib/borg b/lib/borg
deleted file mode 160000
index 99d1667..0000000
--- a/lib/borg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 99d166796f181741ebd79542b96824b096bcb36c
diff --git a/lib/boxquote b/lib/boxquote
deleted file mode 160000
index 7e47e0e..0000000
--- a/lib/boxquote
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7e47e0e2853bc1215739b2e28f260e9eed93b2c5
diff --git a/lib/bui b/lib/bui
deleted file mode 160000
index 508577a..0000000
--- a/lib/bui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 508577a7225b3d07eaefa9444064410af2518675
diff --git a/lib/closql b/lib/closql
deleted file mode 160000
index 012b94f..0000000
--- a/lib/closql
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 012b94f8695e194455111fd54eff0b94dd0dd0db
diff --git a/lib/company b/lib/company
deleted file mode 160000
index b696b39..0000000
--- a/lib/company
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b696b3943d2a55aed937cb0ba971d6e29b2e3a8b
diff --git a/lib/company-ebdb b/lib/company-ebdb
deleted file mode 160000
index 692a272..0000000
--- a/lib/company-ebdb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 692a272a47d4f48d0ea38ced4375f9eb2cd47ff6
diff --git a/lib/crux b/lib/crux
deleted file mode 160000
index 308f17d..0000000
--- a/lib/crux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 308f17d914e2cd79cbc809de66d02b03ceb82859
diff --git a/lib/dante b/lib/dante
deleted file mode 160000
index 8d5e00d..0000000
--- a/lib/dante
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8d5e00d268aa37d91baaa675cead953e58f19c6d
diff --git a/lib/dash b/lib/dash
deleted file mode 160000
index 6514359..0000000
--- a/lib/dash
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6514359b8606a6a9a94068ccd601fcd6379d6584
diff --git a/lib/diff-hl b/lib/diff-hl
deleted file mode 160000
index 2cddce4..0000000
--- a/lib/diff-hl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2cddce48d472111f178da84d44656f92012aa64b
diff --git a/lib/doom-themes b/lib/doom-themes
deleted file mode 160000
index 2f4a0cd..0000000
--- a/lib/doom-themes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2f4a0cdf287a086d45a1d9e8536ace6a2e152318
diff --git a/lib/ebdb b/lib/ebdb
deleted file mode 160000
index 980927f..0000000
--- a/lib/ebdb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 980927ff3dfdb238e7b168f0088353fec29db86e
diff --git a/lib/ebdb-gnorb b/lib/ebdb-gnorb
deleted file mode 160000
index 461a6b3..0000000
--- a/lib/ebdb-gnorb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 461a6b35dc9322d1ec59547ad845d26a6c65a698
diff --git a/lib/edit-indirect b/lib/edit-indirect
deleted file mode 160000
index de645d8..0000000
--- a/lib/edit-indirect
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit de645d8144e8a08f039a9c88185121ec81d957ef
diff --git a/lib/eldoc-eval b/lib/eldoc-eval
deleted file mode 160000
index f59a1ae..0000000
--- a/lib/eldoc-eval
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f59a1ae7ecfa97ef659c7adb93e0673419acc485
diff --git a/lib/elisp-refs b/lib/elisp-refs
deleted file mode 160000
index a8900da..0000000
--- a/lib/elisp-refs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a8900dab9f8e2925ce5dea0f97bdac4ce47714d9
diff --git a/lib/emacsql b/lib/emacsql
deleted file mode 160000
index f8c3d9f..0000000
--- a/lib/emacsql
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f8c3d9fce28ab7d5b0c9fcf2c1236151ca7add24
diff --git a/lib/emmet-mode b/lib/emmet-mode
deleted file mode 160000
index 1acb821..0000000
--- a/lib/emmet-mode
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1acb821e0142136344ccf40c1e5fb664d7db2e70
diff --git a/lib/epkg b/lib/epkg
deleted file mode 160000
index c42bc98..0000000
--- a/lib/epkg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c42bc98a711ffa8d2a7b9096b563ac0edb0b9bf3
diff --git a/lib/epl b/lib/epl
deleted file mode 160000
index 78ab7a8..0000000
--- a/lib/epl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 78ab7a85c08222cd15582a298a364774e3282ce6
diff --git a/lib/eshell-up b/lib/eshell-up
deleted file mode 160000
index 9c100ba..0000000
--- a/lib/eshell-up
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9c100bae5c3020e8d9307e4332d3b64e7dc28519
diff --git a/lib/exec-path-from-shell b/lib/exec-path-from-shell
deleted file mode 160000
index 9bc0f4a..0000000
--- a/lib/exec-path-from-shell
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9bc0f4a762f16d488376fb52409c58239a86d75d
diff --git a/lib/expand-region b/lib/expand-region
deleted file mode 160000
index ed32924..0000000
--- a/lib/expand-region
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ed3292473035dc8f3d2f321e82974ef87327808f
diff --git a/lib/f b/lib/f
deleted file mode 160000
index de6d4d4..0000000
--- a/lib/f
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit de6d4d40ddc844eee643e92d47b9d6a63fbebb48
diff --git a/lib/flycheck b/lib/flycheck
deleted file mode 160000
index baf96df..0000000
--- a/lib/flycheck
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit baf96df4d1c3e61bf62f15fbea05a880d1e49e45
diff --git a/lib/flycheck-haskell b/lib/flycheck-haskell
deleted file mode 160000
index 32ddff8..0000000
--- a/lib/flycheck-haskell
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 32ddff87165a7d3a35e7318bee997b5b4bd41278
diff --git a/lib/geiser b/lib/geiser
deleted file mode 160000
index a6a2f2c..0000000
--- a/lib/geiser
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a6a2f2c2194cdef97d67945aa1e7df81763ec34e
diff --git a/lib/ghub b/lib/ghub
deleted file mode 160000
index db15d00..0000000
--- a/lib/ghub
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit db15d00d01b8bd9187079a0b538d878d241743a8
diff --git a/lib/git-modes b/lib/git-modes
deleted file mode 160000
index 5546831..0000000
--- a/lib/git-modes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 55468314a5f6b77d2c96be62c7005ac94545e217
diff --git a/lib/gnorb b/lib/gnorb
deleted file mode 160000
index 17fd6e9..0000000
--- a/lib/gnorb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 17fd6e9ca6f116e2d0d70ab1e9d7132b3a8bfd47
diff --git a/lib/graphql b/lib/graphql
deleted file mode 160000
index e2b3096..0000000
--- a/lib/graphql
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e2b309689f4faf9225f290080f836e988c5a576d
diff --git a/lib/guix b/lib/guix
deleted file mode 160000
index 495baed..0000000
--- a/lib/guix
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 495baedc983070f0158442173bdef0a35c2a1e9d
diff --git a/lib/haskell-mode b/lib/haskell-mode
deleted file mode 160000
index 4aa8875..0000000
--- a/lib/haskell-mode
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4aa88752ab23bca3ded36a9c9fd9c34cffbb129b
diff --git a/lib/helm b/lib/helm
deleted file mode 160000
index 598992f..0000000
--- a/lib/helm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 598992f3490f8fa1b90dbf01e76b6e916de294bb
diff --git a/lib/helpful b/lib/helpful
deleted file mode 160000
index 039345e..0000000
--- a/lib/helpful
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 039345ef60b4722d050c94ab1978540137df35f9
diff --git a/lib/hl-todo b/lib/hl-todo
deleted file mode 160000
index 24b9925..0000000
--- a/lib/hl-todo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 24b9925b1b2c7ad6bf7b66800395f74abf035c5f
diff --git a/lib/hlint-refactor b/lib/hlint-refactor
deleted file mode 160000
index 92c69aa..0000000
--- a/lib/hlint-refactor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 92c69aa01c65968e86c15db087bb1ea785e4736c
diff --git a/lib/ht b/lib/ht
deleted file mode 160000
index 8ec3eb9..0000000
--- a/lib/ht
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8ec3eb96ee63430fb24257e4aa8169b50cb7be12
diff --git a/lib/hydra b/lib/hydra
deleted file mode 160000
index 67098cc..0000000
--- a/lib/hydra
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 67098cc9149854a95b589c3763843eabc82c9b2d
diff --git a/lib/ivy b/lib/ivy
deleted file mode 160000
index 201c5d7..0000000
--- a/lib/ivy
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 201c5d78c4985fb803eb681cca0ccc5a4f90b717
diff --git a/lib/lcr b/lib/lcr
deleted file mode 160000
index c14f406..0000000
--- a/lib/lcr
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c14f40692292d59156c7632dbdd2867c086aa75f
diff --git a/lib/lean-mode b/lib/lean-mode
deleted file mode 160000
index 9d6b847..0000000
--- a/lib/lean-mode
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9d6b8471e2044310b4cd7cd3213b1fc8f78ec499
diff --git a/lib/loop b/lib/loop
deleted file mode 160000
index e22807f..0000000
--- a/lib/loop
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e22807f83a0890dc8a904c51ee0742c34efccc6c
diff --git a/lib/magit b/lib/magit
deleted file mode 160000
index d866fb3..0000000
--- a/lib/magit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d866fb3624bdeb87f0c56e359239e4474362d0af
diff --git a/lib/magit-popup b/lib/magit-popup
deleted file mode 160000
index 8eaa0be..0000000
--- a/lib/magit-popup
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8eaa0becc2370484a432a8a19f40ce5e8d0f1642
diff --git a/lib/markdown-mode b/lib/markdown-mode
deleted file mode 160000
index 906e97d..0000000
--- a/lib/markdown-mode
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 906e97d6e211129d4b7674a5efc416849bc7e43e
diff --git a/lib/memoize b/lib/memoize
deleted file mode 160000
index 9a56126..0000000
--- a/lib/memoize
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9a561268ffb550b257a08710489a95cd087998b6
diff --git a/lib/multi-term b/lib/multi-term
deleted file mode 160000
index f954e4e..0000000
--- a/lib/multi-term
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f954e4e18b0a035151d34852387e724d87a3316f
diff --git a/lib/multiple-cursors b/lib/multiple-cursors
deleted file mode 160000
index 6a7c3c0..0000000
--- a/lib/multiple-cursors
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff
diff --git a/lib/mwim b/lib/mwim
deleted file mode 160000
index b4f3edb..0000000
--- a/lib/mwim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85
diff --git a/lib/no-littering b/lib/no-littering
deleted file mode 160000
index 4e7ecf0..0000000
--- a/lib/no-littering
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4e7ecf017140bc522629cd2c977160f7cc2b8020
diff --git a/lib/org b/lib/org
deleted file mode 160000
index 495c7c6..0000000
--- a/lib/org
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 495c7c6a5774a4d3035c582a3b4c95eb04e83dd5
diff --git a/lib/orgalist b/lib/orgalist
deleted file mode 160000
index d120090..0000000
--- a/lib/orgalist
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d120090588d9b258629a95d226bb9f8bf4e2afca
diff --git a/lib/other-frame-window b/lib/other-frame-window
deleted file mode 160000
index 7477b00..0000000
--- a/lib/other-frame-window
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7477b00664bff9b0b9edfe7ecbef379a7543ba77
diff --git a/lib/ox-hugo b/lib/ox-hugo
deleted file mode 160000
index 00186ff..0000000
--- a/lib/ox-hugo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 00186ff8d7ae13fab6707b0e2e7665e055db558f
diff --git a/lib/packed b/lib/packed
deleted file mode 160000
index c41c3df..0000000
--- a/lib/packed
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c41c3dfda86ae33832ffc146923e2a4675cbacfa
diff --git a/lib/page-break-lines b/lib/page-break-lines
deleted file mode 160000
index 87e801e..0000000
--- a/lib/page-break-lines
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 87e801efb816b24e83ebf84c052001e178e180bc
diff --git a/lib/pkg-info b/lib/pkg-info
deleted file mode 160000
index 76ba741..0000000
--- a/lib/pkg-info
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 76ba7415480687d05a4353b27fea2ae02b8d9d61
diff --git a/lib/popup b/lib/popup
deleted file mode 160000
index 80829dd..0000000
--- a/lib/popup
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 80829dd46381754639fb764da11c67235fe63282
diff --git a/lib/projectile b/lib/projectile
deleted file mode 160000
index d625ecb..0000000
--- a/lib/projectile
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d625ecb09e3a9fb319740686402197bdf6fc109b
diff --git a/lib/proof-site b/lib/proof-site
deleted file mode 160000
index f7cc8f1..0000000
--- a/lib/proof-site
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f7cc8f1f76baf5e517e51f1db47510ed605064e8
diff --git a/lib/rich-minority b/lib/rich-minority
deleted file mode 160000
index a50d9b2..0000000
--- a/lib/rich-minority
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a50d9b2fd059f6a0e5b22063a5375851a087f61a
diff --git a/lib/s b/lib/s
deleted file mode 160000
index 03410e6..0000000
--- a/lib/s
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 03410e6a7a2b11e47e1fea3b7d9899c7df26435e
diff --git a/lib/shrink-path b/lib/shrink-path
deleted file mode 160000
index 9d06c45..0000000
--- a/lib/shrink-path
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9d06c453d1537df46a4b703a29213cc7f7857aa0
diff --git a/lib/shut-up b/lib/shut-up
deleted file mode 160000
index 081d6b0..0000000
--- a/lib/shut-up
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 081d6b01e3ba0e60326558e545c4019219e046ce
diff --git a/lib/smart-mode-line b/lib/smart-mode-line
deleted file mode 160000
index b79f4fa..0000000
--- a/lib/smart-mode-line
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b79f4fa5f2380b0d726a895dd7199e5483004490
diff --git a/lib/smex b/lib/smex
deleted file mode 160000
index 55aaebe..0000000
--- a/lib/smex
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 55aaebe3d793c2c990b39a302eb26c184281c42c
diff --git a/lib/treepy b/lib/treepy
deleted file mode 160000
index b40e6b0..0000000
--- a/lib/treepy
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d
diff --git a/lib/typo b/lib/typo
deleted file mode 160000
index 9dad93b..0000000
--- a/lib/typo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9dad93b6f367f02f52c8d9bf15d446d922cec294
diff --git a/lib/unkillable-scratch b/lib/unkillable-scratch
deleted file mode 160000
index d805ee0..0000000
--- a/lib/unkillable-scratch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d805ee0570c218559cd972788c2d7f77704282b9
diff --git a/lib/use-package b/lib/use-package
deleted file mode 160000
index 39a8b88..0000000
--- a/lib/use-package
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 39a8b8812c2c9f6f0b299e6a04e504ef393694ce
diff --git a/lib/web-mode b/lib/web-mode
deleted file mode 160000
index 5da977b..0000000
--- a/lib/web-mode
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5da977bec7714c09d41b556e2d651ccb269a14a2
diff --git a/lib/which-key b/lib/which-key
deleted file mode 160000
index 43e3e3d..0000000
--- a/lib/which-key
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 43e3e3d7641a8e1c298b37e6a277612bf0898708
diff --git a/lib/winum b/lib/winum
deleted file mode 160000
index efcb14f..0000000
--- a/lib/winum
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit efcb14fd306afbc738666e6b2e5a8a1bb5904392
diff --git a/lib/with-editor b/lib/with-editor
deleted file mode 160000
index 9dd9f17..0000000
--- a/lib/with-editor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9dd9f176d96abc60365369de6d08c26c414ef1f3
diff --git a/lib/yaml-mode b/lib/yaml-mode
deleted file mode 160000
index 40067a1..0000000
--- a/lib/yaml-mode
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 40067a10ac1360f0b9533f0bbbb2eea128e2574d
diff --git a/lib/yasnippet b/lib/yasnippet
deleted file mode 160000
index 1d96da2..0000000
--- a/lib/yasnippet
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1d96da2e08664c31ff7f6f7441da1f4fa5680b1f
-- 
cgit v1.2.3-60-g2f50


From 5cbf910f810e708b712a0cb558e5bee96bb0ea12 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 17:33:06 -0500
Subject: [emacs][wip] fix (void-variable personal-keybindings) error

https://github.com/jwiegley/use-package/issues/436#issuecomment-285954250
---
 init.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.org b/init.org
index 52c1437..11f45a3 100644
--- a/init.org
+++ b/init.org
@@ -729,6 +729,7 @@ for this.
 ** Bindings
 
 #+begin_src emacs-lisp
+(require 'bind-key)
 (bind-keys
  ("C-c a i" . ielm)
 
-- 
cgit v1.2.3-60-g2f50


From 197330785f9a001d49ad6afb33e2e69761fa3169 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 17:34:21 -0500
Subject: [emacs][wip] dired: add b for dired-up-directory

---
 init.org | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/init.org b/init.org
index 11f45a3..9acbd33 100644
--- a/init.org
+++ b/init.org
@@ -1184,6 +1184,7 @@ There's no way I could top that, so I won't attempt to.
   ;; https://oremacs.com/2017/03/18/dired-ediff/
   (defun dired-ediff-files ()
     (interactive)
+    (require 'dired-aux)
     (defvar ediff-after-quit-hook-internal)
     (let ((files (dired-get-marked-files))
           (wnd (current-window-configuration)))
@@ -1203,6 +1204,7 @@ There's no way I could top that, so I won't attempt to.
                         (set-window-configuration wnd))))
         (error "no more than 2 files should be marked"))))
   :bind (:map dired-mode-map
+              ("b"  . dired-up-directory)
               ("e"  . dired-ediff-files)
               ("E"  . dired-toggle-read-only)
               ("\\" . dired-hide-details-mode)
-- 
cgit v1.2.3-60-g2f50


From 19740fc021b8c4b169ce14e1e66e1d2094b40d65 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 18:07:11 -0500
Subject: [emacs][wip] fix sml error when switching to dark theme

---
 init.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.org b/init.org
index 9acbd33..3d29991 100644
--- a/init.org
+++ b/init.org
@@ -1833,6 +1833,7 @@ Emacs package that displays available keybindings in popup
 
 #+begin_src emacs-lisp
 (use-package smart-mode-line
+  :commands (sml/apply-theme)
   :config
   (sml/setup))
 #+end_src
-- 
cgit v1.2.3-60-g2f50


From c31b1ac02d0c0b4c375384dc72cc26073ecb526c Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 18:17:32 -0500
Subject: [emacs][wip] a/async-babel-tangle: add option to byte-recompile-file

---
 init.org | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/init.org b/init.org
index 3d29991..3cf7343 100644
--- a/init.org
+++ b/init.org
@@ -897,9 +897,12 @@ file.
   (defvar a/show-async-tangle-time nil
     "Show the time spent tangling the file.")
 
-  (defvar a/async-tangle-post-compile "make ti"
+  (defvar a/async-tangle-post-compile nil
     "If non-nil, pass to `compile' after successful tangle.")
 
+  (defvar a/async-tangle-byte-recompile t
+    "If non-nil, byte-recompile the file on successful tangle.")
+
   (defun a/async-babel-tangle ()
     "Tangle org file asynchronously."
     (interactive)
@@ -907,7 +910,7 @@ file.
            (file (buffer-file-name))
            (file-nodir (file-name-nondirectory file))
            ;; (async-quiet-switch "-q")
-           )
+           (file-noext (file-name-sans-extension file)))
       (async-start
        `(lambda ()
           (require 'org)
@@ -916,6 +919,7 @@ file.
          `(lambda (result)
             (if result
                 (progn
+                  (setq byte-compile-warnings '(not noruntime unresolved))
                   (message "Tangled %s%s"
                            ,file-nodir
                            (if a/show-async-tangle-time
@@ -924,7 +928,9 @@ file.
                                                                   ',file-tangle-start-time)))
                              ""))
                   (when a/async-tangle-post-compile
-                    (compile a/async-tangle-post-compile)))
+                    (compile a/async-tangle-post-compile))
+                  (when a/async-tangle-byte-recompile
+                    (byte-recompile-file (concat ,file-noext ".el"))))
               (message "Tangling %s failed" ,file-nodir))))))))
 
 (add-to-list
@@ -2432,6 +2438,6 @@ Display how long it took to load the init file.
 
 * COMMENT Local Variables                                           :ARCHIVE:
 # Local Variables:
-# eval: ;; (add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)
+# eval: (add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)
 # eval: (typo-mode -1)
 # End:
-- 
cgit v1.2.3-60-g2f50


From 426cec7a80db7a16d4b820e27996f05a68f99977 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 18:43:53 -0500
Subject: [emacs][wip] fix proof general

---
 init.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/init.org b/init.org
index 3cf7343..d8da51c 100644
--- a/init.org
+++ b/init.org
@@ -1411,7 +1411,8 @@ Automatically save place in each file.
 ** [[https://coq.inria.fr][Coq]] (with [[https://github.com/ProofGeneral/PG][Proof General]])
 
 #+begin_src emacs-lisp
-(use-package proof-general)
+(use-package proof-site
+  :straight proof-general)
 #+end_src
 
 ** [[https://leanprover.github.io][Lean]] (with [[https://github.com/leanprover/lean-mode][lean-mode]])
-- 
cgit v1.2.3-60-g2f50


From e931bbddd5b72fa2edf21778c96fa95227cbe36d Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 18:44:06 -0500
Subject: [emacs][wip] for some reason straight seems to interfere with :after

---
 init.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/init.org b/init.org
index d8da51c..257e868 100644
--- a/init.org
+++ b/init.org
@@ -2015,7 +2015,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 
 #+begin_src emacs-lisp
 (use-package shrink-path
-  :after eshell
+  :defer 2
   :config
   (setq eshell-prompt-regexp "\\(.*\n\\)*λ "
         eshell-prompt-function #'+eshell/prompt)
@@ -2046,6 +2046,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 
 #+begin_src emacs-lisp
 (use-package eshell-up
+  :commands eshell-up
   :after eshell)
 #+end_src
 
-- 
cgit v1.2.3-60-g2f50


From bf233291df57d81c31f2290d24f24eaf33cd8873 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 19:08:47 -0500
Subject: [emacs][wip] fix up some breakages due to use-package-always-defer

https://github.com/jwiegley/use-package#loading-packages-in-sequence
---
 init.org | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/init.org b/init.org
index 257e868..1f3d721 100644
--- a/init.org
+++ b/init.org
@@ -880,6 +880,7 @@ And here's where my actual Org configurations begin:
                t))
 
 (use-feature ox-beamer
+  :demand
   :after ox)
 #+end_src
 
@@ -2352,6 +2353,7 @@ Convenient footnotes in =message-mode=.
 
 (use-feature ebdb-gnus
   :after ebdb
+  :demand
   :custom
   (ebdb-gnus-window-configuration
    '(article
@@ -2363,6 +2365,7 @@ Convenient footnotes in =message-mode=.
 
 (use-feature ebdb-mua
   :after ebdb
+  :demand
   ;; :custom (ebdb-mua-pop-up nil)
   )
 
-- 
cgit v1.2.3-60-g2f50


From 86efa0e39cbe936b57c65f18b576e95de57bc68b Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 19:36:18 -0500
Subject: [emacs][wip] ebdb: directly use upstream instead of GNU ELPA mirror

---
 init.org                     | 1 +
 straight/versions/default.el | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/init.org b/init.org
index 1f3d721..56a439a 100644
--- a/init.org
+++ b/init.org
@@ -2327,6 +2327,7 @@ Convenient footnotes in =message-mode=.
 
 #+begin_src emacs-lisp
 (use-package ebdb
+  :straight (:host github :repo "girzel/ebdb")
   :after gnus
   :bind (:map gnus-group-mode-map ("e" . ebdb))
   :config
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 74548a0..1e08557 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -10,7 +10,7 @@
  ("dante" . "8d5e00d268aa37d91baaa675cead953e58f19c6d")
  ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584")
  ("diff-hl" . "2cddce48d472111f178da84d44656f92012aa64b")
- ("ebdb" . "51733ece51fcae699e977703d61f2f2ebaea70b1")
+ ("ebdb" . "980927ff3dfdb238e7b168f0088353fec29db86e")
  ("elisp-refs" . "a8900dab9f8e2925ce5dea0f97bdac4ce47714d9")
  ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029")
  ("emacs-doom-themes" . "2f4a0cdf287a086d45a1d9e8536ace6a2e152318")
-- 
cgit v1.2.3-60-g2f50


From e724cc402f5c4fd2fc84536c2806d0d2f46926d9 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 21:23:03 -0500
Subject: [emacs][wip] remove vestigial borg-related things

---
 Makefile | 13 -----------
 init.org | 79 ++++++++++++++--------------------------------------------------
 2 files changed, 17 insertions(+), 75 deletions(-)
 delete mode 100644 Makefile

diff --git a/Makefile b/Makefile
deleted file mode 100644
index e694d46..0000000
--- a/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
--include lib/borg/borg.mk
-
-bootstrap-borg:
-	@git submodule--helper clone --name borg --path lib/borg \
-	--url git@github.com:emacscollective/borg.git
-	@cd lib/borg; git symbolic-ref HEAD refs/heads/master
-	@cd lib/borg; git reset --hard HEAD
-
-bootstrap: tangle-init
-
-ta: tangle-init all
-
-ti: tangle-init build-init
diff --git a/init.org b/init.org
index 56a439a..0503414 100644
--- a/init.org
+++ b/init.org
@@ -9,10 +9,10 @@
 :END:
 
 This org file is my literate configuration for GNU Emacs, and is
-tangled to [[./init.el][init.el]]. Packages are installed and managed using
-[[https://github.com/emacscollective/borg][Borg]]. Over the years, I've taken inspiration from configurations of
-many different people. Some of the configurations that I can remember
-off the top of my head are:
+tangled to [[./init.el][init.el]].  Packages are installed and managed using
+[[https://github.com/raxod502/straight.el][straight.el]].  Over the years, I've taken inspiration from
+configurations of many different people.  Some of the configurations
+that I can remember off the top of my head are:
 
 - [[https://github.com/dieggsy/dotfiles][dieggsy/dotfiles]]: literate Emacs and dotfiles configuration, uses
   straight.el for managing packages
@@ -28,25 +28,9 @@ off the top of my head are:
 I'd like to have a fully reproducible Emacs setup (part of the reason
 why I store my configuration in this repository) but unfortunately out
 of the box, that's not achievable with =package.el=, not currently
-anyway. So, I've opted to use Borg. For what it's worth, I briefly
-experimented with [[https://github.com/raxod502/straight.el][straight.el]], but found that it added about 2 seconds
-to my init time; which is unacceptable for me: I use Emacs as my
-window manager (via EXWM) and coming from bspwm, I'm too used to
-having fast startup times.
-
-** Installation
-
-To use this config for your Emacs, first you need to clone this repo,
-then bootstrap Borg, tell Borg to retrieve package submodules, and
-byte-compiled the packages. Something along these lines should work:
-
-#+begin_src sh :tangle no
-git clone https://github.com/aminb/dotfiles ~/.emacs.d
-cd ~/.emacs.d
-make bootstrap-borg
-make bootstrap
-make build
-#+end_src
+anyway.  So, I've opted to use =straight.el=.  I also used Borg for a
+few months, but decided to try =straight.el= which allows direct use
+of the various package archives.
 
 * Contents                                                   :toc_1:noexport:
 
@@ -243,38 +227,7 @@ integration, we will define a =use-feature= for plain ole
   (declare (indent defun))
   `(use-package ,name
      :straight nil
-,@args))
-#+end_src
-
-*** COMMENT Borg
-
-#+begin_quote
-Assimilate Emacs packages as Git submodules
-#+end_quote
-
-[[https://github.com/emacscollective/borg][Borg]] is at the heart of package management of my Emacs setup. In
-short, it creates a git submodule in =lib/= for each package, which
-can then be managed with the help of Magit or other tools.
-
-#+begin_src emacs-lisp
-(setq user-init-file (or load-file-name buffer-file-name)
-      user-emacs-directory (file-name-directory user-init-file))
-(add-to-list 'load-path
-             (expand-file-name "lib/borg" user-emacs-directory))
-(require 'borg)
-(borg-initialize)
-
-;; (require 'borg-nix-shell)
-;; (setq borg-build-shell-command 'borg-nix-shell-build-command)
-
-(with-eval-after-load 'bind-key
-  (bind-keys
-   :package borg
-   ("C-c b A" . borg-activate)
-   ("C-c b a" . borg-assimilate)
-   ("C-c b b" . borg-build)
-   ("C-c b c" . borg-clone)
-   ("C-c b r" . borg-remove)))
+     ,@args))
 #+end_src
 
 *** =use-package=
@@ -300,7 +253,7 @@ and without compromising on performance.
 (setq use-package-always-defer t)
 #+end_src
 
-*** COMMENT Epkg
+*** Epkg
 
 #+begin_quote
 Browse the Emacsmirror package database
@@ -311,13 +264,14 @@ database, low-level functions for querying the database, and a
 =package.el=-like user interface for browsing the available packages.
 
 #+begin_src emacs-lisp
+(require 'bind-key)
 (use-package epkg
-  :defer t
+  :commands (epkg-list-packages epkg-describe-package)
   :bind
-  (("C-c b d" . epkg-describe-package)
-   ("C-c b p" . epkg-list-packages)
-   ("C-c b u" . epkg-update))
+  (("C-c P e d" . epkg-describe-package)
+   ("C-c P e p" . epkg-list-packages))
   :config
+  (setq epkg-repository "~/.emacs.d/straight/repos/epkgs/")
   (eval-when-compile (defvar ivy-initial-inputs-alist))
   (with-eval-after-load 'ivy
     (add-to-list
@@ -729,7 +683,6 @@ for this.
 ** Bindings
 
 #+begin_src emacs-lisp
-(require 'bind-key)
 (bind-keys
  ("C-c a i" . ielm)
 
@@ -1799,7 +1752,9 @@ Emacs package that displays available keybindings in popup
     ;; prefixes for my personal bindings
     "C-c a"   "applications"
     "C-c a s" "shells"
-    "C-c b"   "borg"
+    "C-c P"   "package-management"
+    "C-c P e" "package-management/epkg"
+    "C-c P s" "package-management/straight.el"
     "C-c c"   "compile-and-comments"
     "C-c e"   "eval"
     "C-c f"   "files"
-- 
cgit v1.2.3-60-g2f50


From c145ffd981a65b0556b25611aeb8064c05f67812 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 23:23:06 -0500
Subject: [emacs][wip] hack together a bootstrap path

---
 Makefile | 19 +++++++++++++++++++
 init.org | 41 +++++++++++++++++++++++++++--------------
 2 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..3b3a23f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,19 @@
+EMACS           ?= emacs
+EMACS_ARGUMENTS ?= -Q
+
+.PHONY: all help clean build build-init quick bootstrap
+.FORCE:
+
+tangle-init: init.el
+init.el: init.org
+	@$(EMACS) $(EMACS_ARGUMENTS) \
+	--batch --load org \
+	--eval '(org-babel-tangle-file "init.org")' 2>&1
+
+build-init:
+	@rm -f init.elc
+	@$(EMACS) $(EMACS_ARGUMENTS) \
+	--batch -l init.el --eval '(a/build-init)' 2>&1
+
+ti: tangle-init
+bi: build-init
diff --git a/init.org b/init.org
index 0503414..60031a4 100644
--- a/init.org
+++ b/init.org
@@ -199,20 +199,33 @@ hacker.
 =straight.el= allows me to have a fully reproducible Emacs setup.
 
 #+begin_src emacs-lisp
+;; Main engine start...
+
 (setq straight-repository-branch "develop")
 
-(defvar bootstrap-version)
-(let ((bootstrap-file
-       (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
-      (bootstrap-version 5))
-  (unless (file-exists-p bootstrap-file)
-    (with-current-buffer
-        (url-retrieve-synchronously
-         "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
-         'silent 'inhibit-cookies)
-      (goto-char (point-max))
-      (eval-print-last-sexp)))
-  (load bootstrap-file nil 'nomessage))
+(defun a/bootstrap-straight ()
+  (defvar bootstrap-version)
+  (let ((bootstrap-file
+         (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
+        (bootstrap-version 5))
+    (unless (file-exists-p bootstrap-file)
+      (with-current-buffer
+          (url-retrieve-synchronously
+           "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
+           'silent 'inhibit-cookies)
+        (goto-char (point-max))
+        (eval-print-last-sexp)))
+    (load bootstrap-file nil 'nomessage)))
+
+;; Solid rocket booster ignition...
+
+(defun a/build-init ()
+  (a/bootstrap-straight)
+  (byte-compile-file "init.el"))
+
+(a/bootstrap-straight)
+
+;; We have lift off!
 
 (setq straight-use-package-by-default t)
 #+end_src
@@ -851,10 +864,10 @@ file.
   (defvar a/show-async-tangle-time nil
     "Show the time spent tangling the file.")
 
-  (defvar a/async-tangle-post-compile nil
+  (defvar a/async-tangle-post-compile "make bi"
     "If non-nil, pass to `compile' after successful tangle.")
 
-  (defvar a/async-tangle-byte-recompile t
+  (defvar a/async-tangle-byte-recompile nil
     "If non-nil, byte-recompile the file on successful tangle.")
 
   (defun a/async-babel-tangle ()
-- 
cgit v1.2.3-60-g2f50


From 06c562baad41e2a5aee6441437e0239b3df5b2f8 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 23:24:00 -0500
Subject: [emacs][wip] update custom

---
 etc/custom.el | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/etc/custom.el b/etc/custom.el
index b28cc4d..013afe6 100644
--- a/etc/custom.el
+++ b/etc/custom.el
@@ -10,6 +10,8 @@
  '(company-idle-delay 0.3)
  '(company-minimum-prefix-length 1)
  '(company-selection-wrap-around t)
+ '(eshell-hist-ignoredups t t)
+ '(eshell-input-filter 'eshell-input-filter-initial-space t)
  '(ibuffer-formats
    '((mark modified read-only locked " "
            (name 18 18 :left :elide)
@@ -20,13 +22,19 @@
            " " filename-and-process)
      (mark " "
            (name 16 -1)
-           " " filename)))
+           " " filename)) t)
  '(ibuffer-saved-filter-groups
    '(("default"
       ("dired"
        (mode . dired-mode))
       ("org"
        (mode . org-mode))
+      ("gnus"
+       (or
+        (mode . gnus-group-mode)
+        (mode . gnus-summary-mode)
+        (mode . gnus-article-mode)
+        (mode . message-mode)))
       ("web"
        (or
         (mode . web-mode)
@@ -36,24 +44,28 @@
       ("shell"
        (or
         (mode . eshell-mode)
-        (mode . shell-mode)))
-      ("notmuch"
-       (name . "*notmuch*"))
+        (mode . shell-mode)
+        (mode . term-mode)))
       ("programming"
        (or
         (mode . python-mode)
+        (mode . c-mode)
         (mode . c++-mode)
-        (mode . emacs-lisp-mode)))
+        (mode . emacs-lisp-mode)
+        (mode . scheme-mode)
+        (mode . haskell-mode)
+        (mode . lean-mode)))
       ("emacs"
        (or
         (name . "^\\*scratch\\*$")
-        (name . "^\\*Messages\\*$")))
-      ("slack"
-       (or
-        (name . "^\\*Slack*"))))))
+        (name . "^\\*Messages\\*$"))))) t)
+ '(ls-lisp-dirs-first t t)
  '(org-latex-packages-alist '(("" "listings") ("" "color")))
  '(safe-local-variable-values
-   '((eval add-hook 'after-save-hook 'org-beamer-export-to-latex t t)
+   '((eval when
+           (featurep 'typo
+                     (typo-mode -1)))
+     (eval add-hook 'after-save-hook 'org-beamer-export-to-latex t t)
      (eval setq org-latex-prefer-user-labels t)
      (eval add-hook 'after-save-hook 'org-latex-export-to-latex t t)
      (org-hugo-footer . "
@@ -68,13 +80,6 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(dired-directory ((t (:weight semi-bold))))
- ;; '(font-lock-comment-face ((t (:foreground "grey" :weight semi-bold))))
- ;; '(ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
- ;; '(ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold))))
- ;; '(ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold))))
  '(magit-diff-file-heading ((t (:weight normal))))
- ;; '(message-header-cc ((t (:foreground "#333" :weight normal))))
- ;; '(message-header-subject ((t (:foreground "navy blue" :weight semi-bold))))
- ;; '(message-header-to ((t (:foreground "MidnightBlue" :weight semi-bold))))
  '(quote (org-block-begin-line ((t (:foreground "#5a5b5a" :background "#1d1f21")))))
  '(widget-button ((t (:weight semi-bold)))))
-- 
cgit v1.2.3-60-g2f50


From 5c1cce805441514eee8d8d0812615675c3a4f034 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 24 Dec 2018 23:24:12 -0500
Subject: [emacs][wip] small tweaks

---
 init.org | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/init.org b/init.org
index 60031a4..c8e0e29 100644
--- a/init.org
+++ b/init.org
@@ -1250,6 +1250,13 @@ Highlight matching parens.
   :config (show-paren-mode))
 #+end_src
 
+** simple (for column numbers)
+
+#+begin_src emacs-lisp
+(use-feature simple
+  :config (column-number-mode))
+#+end_src
+
 ** =savehist=
 
 Save minibuffer history.
@@ -1810,6 +1817,7 @@ Emacs package that displays available keybindings in popup
 #+begin_src emacs-lisp
 (use-package smart-mode-line
   :commands (sml/apply-theme)
+  :demand
   :config
   (sml/setup))
 #+end_src
@@ -2413,5 +2421,5 @@ Display how long it took to load the init file.
 * COMMENT Local Variables                                           :ARCHIVE:
 # Local Variables:
 # eval: (add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)
-# eval: (typo-mode -1)
+# eval: (when (featurep 'typo (typo-mode -1)))
 # End:
-- 
cgit v1.2.3-60-g2f50


From ff374d22f5aab91625fd5e9f780ae27daed96943 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 26 Dec 2018 14:39:28 -0500
Subject: [emacs][wip] enable geiser and guix, and update packages

---
 init.org                     |  4 ++--
 straight/versions/default.el | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/init.org b/init.org
index c8e0e29..5a70eaf 100644
--- a/init.org
+++ b/init.org
@@ -1719,7 +1719,7 @@ treemacs
   :after (treemacs))
 #+end_src
 
-** COMMENT geiser
+** geiser
 
 #+begin_src emacs-lisp
 (use-package geiser)
@@ -1729,7 +1729,7 @@ treemacs
   (setq geiser-guile-load-path "~/src/git/guix"))
 #+end_src
 
-** COMMENT guix
+** guix
 
 #+begin_src emacs-lisp
 (use-package guix)
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 1e08557..831254b 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -1,9 +1,11 @@
-(("PG" . "f7cc8f1f76baf5e517e51f1db47510ed605064e8")
+(("PG" . "7389d43893569ff0e1eff892254901876fc8225e")
  ("all-the-icons.el" . "52d1f2d36468146c93aaf11399f581401a233306")
  ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f")
  ("auto-compile" . "6ce4255ab9a0b010ef8414c5bd9a6d6d9eea012f")
  ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5")
+ ("bui.el" . "508577a7225b3d07eaefa9444064410af2518675")
  ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04")
+ ("closql" . "012b94f8695e194455111fd54eff0b94dd0dd0db")
  ("company-ebdb" . "3b463fe1236ac6445657f3a1df20357a7a2fa8f6")
  ("company-mode" . "b696b3943d2a55aed937cb0ba971d6e29b2e3a8b")
  ("crux" . "308f17d914e2cd79cbc809de66d02b03ceb82859")
@@ -11,12 +13,15 @@
  ("dash.el" . "6514359b8606a6a9a94068ccd601fcd6379d6584")
  ("diff-hl" . "2cddce48d472111f178da84d44656f92012aa64b")
  ("ebdb" . "980927ff3dfdb238e7b168f0088353fec29db86e")
+ ("edit-indirect" . "de645d8144e8a08f039a9c88185121ec81d957ef")
  ("elisp-refs" . "a8900dab9f8e2925ce5dea0f97bdac4ce47714d9")
  ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029")
  ("emacs-doom-themes" . "2f4a0cdf287a086d45a1d9e8536ace6a2e152318")
  ("emacs-memoize" . "9a561268ffb550b257a08710489a95cd087998b6")
  ("emacs-which-key" . "43e3e3d7641a8e1c298b37e6a277612bf0898708")
+ ("emacsql" . "f8c3d9fce28ab7d5b0c9fcf2c1236151ca7add24")
  ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
+ ("epkg" . "c42bc98a711ffa8d2a7b9096b563ac0edb0b9bf3")
  ("epkgs" . "3e2b3cbada81bdb5e9b3f4bf185c7258f656b021")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
  ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519")
@@ -25,10 +30,12 @@
  ("f.el" . "de6d4d40ddc844eee643e92d47b9d6a63fbebb48")
  ("flycheck" . "baf96df4d1c3e61bf62f15fbea05a880d1e49e45")
  ("flycheck-haskell" . "32ddff87165a7d3a35e7318bee997b5b4bd41278")
+ ("geiser" . "a6a2f2c2194cdef97d67945aa1e7df81763ec34e")
  ("ghub" . "db15d00d01b8bd9187079a0b538d878d241743a8")
  ("git.el" . "a3396a7027a7d986598c6a2d6d5599bac918f3da")
  ("gnu-elpa-mirror" . "db6dd0677f0adac536ec6c575865770aa902c0a1")
  ("graphql.el" . "e2b309689f4faf9225f290080f836e988c5a576d")
+ ("guix.el" . "495baedc983070f0158442173bdef0a35c2a1e9d")
  ("haskell-mode" . "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b")
  ("helpful" . "039345ef60b4722d050c94ab1978540137df35f9")
  ("hl-todo" . "24b9925b1b2c7ad6bf7b66800395f74abf035c5f")
@@ -37,14 +44,14 @@
  ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499")
  ("let-alist" . "4a7693b678c59a148660c736cc0bb26a5032ee9a")
  ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c")
- ("magit" . "d866fb3624bdeb87f0c56e359239e4474362d0af")
+ ("magit" . "50b5aad124a07614b5e3819c9f81915a454e08fc")
  ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642")
  ("melpa" . "5487adde3bbb1bfd875c51932c63ceef541d6b6f")
  ("multi-term" . "f954e4e18b0a035151d34852387e724d87a3316f")
  ("multiple-cursors.el" . "6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff")
  ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
  ("no-littering" . "4e7ecf017140bc522629cd2c977160f7cc2b8020")
- ("org" . "495c7c6a5774a4d3035c582a3b4c95eb04e83dd5")
+ ("org" . "5dc18f0c43e16343f3be26aec71f8eeed99969b8")
  ("orgalist" . "f70a65da3a9bf3d0c1a9c769b77821d2a79c42cb")
  ("ox-hugo" . "00186ff8d7ae13fab6707b0e2e7665e055db558f")
  ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa")
-- 
cgit v1.2.3-60-g2f50


From 1323384f45451b35419647b87bbf9f18434e6fef Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 26 Dec 2018 14:40:37 -0500
Subject: [emacs][wip] let unkillable-scratch bury the buffer(s)

---
 init.org | 1 -
 1 file changed, 1 deletion(-)

diff --git a/init.org b/init.org
index 5a70eaf..e58ca6c 100644
--- a/init.org
+++ b/init.org
@@ -1919,7 +1919,6 @@ Make =*scratch*= and =*Messages*= unkillable.
   :config
   (unkillable-scratch 1)
   :custom
-  (unkillable-scratch-behavior 'do-nothing)
   (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$")))
 #+end_src
 
-- 
cgit v1.2.3-60-g2f50


From eb7e51cf86cbc2983ade92431efa151817c20499 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 26 Dec 2018 16:23:32 -0500
Subject: [emacs][wip] straight.el: don’t check for package changes on startup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

instead check-on-save; shaves about half a second off of startup time
---
 init.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/init.org b/init.org
index e58ca6c..44504ab 100644
--- a/init.org
+++ b/init.org
@@ -201,7 +201,8 @@ hacker.
 #+begin_src emacs-lisp
 ;; Main engine start...
 
-(setq straight-repository-branch "develop")
+(setq straight-repository-branch "develop"
+      straight-check-for-modifications '(check-on-save find-when-checking))
 
 (defun a/bootstrap-straight ()
   (defvar bootstrap-version)
-- 
cgit v1.2.3-60-g2f50