From a25e56597e6ad13f174ae0ecaee4ab31c072aab2 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 31 Oct 2018 11:55:59 -0400
Subject: [PATCH 01/16] [emacs] some pdf-tools customizations

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

diff --git a/init.org b/init.org
index 6d0b40f..058b9b0 100644
--- a/init.org
+++ b/init.org
@@ -1610,13 +1610,17 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 #+begin_src emacs-lisp
 (use-package pdf-tools
   :magic ("%PDF" . pdf-view-mode)
-  :config (pdf-tools-install)
+  :config
+  (setq pdf-view-resize-factor 1.05)
+  (pdf-tools-install)
   :bind
   (:map pdf-view-mode-map
         ("C-s" . isearch-forward)
         ("C-r" . isearch-backward)
         ("j"   . pdf-view-next-line-or-next-page)
-        ("k"   . pdf-view-previous-line-or-previous-page)))
+        ("k"   . pdf-view-previous-line-or-previous-page)
+        ("h"   . image-backward-hscroll)
+        ("l"   . image-forward-hscroll)))
 #+end_src
 
 ** anzu
-- 
2.20.1


From a4aa1167bdf5b1fe79be5c6e6bce5d2b3be8c708 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 31 Oct 2018 11:56:34 -0400
Subject: [PATCH 02/16] [emacs] enable orgalist-mode in message-mode

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

diff --git a/init.org b/init.org
index 058b9b0..4bd4458 100644
--- a/init.org
+++ b/init.org
@@ -718,7 +718,8 @@ In short, my favourite way of life.
 (use-package org-notmuch
   :after (:any org notmuch))
 
-(use-package orgalist)
+(use-package orgalist
+  :hook (message-mode . orgalist-mode))
 #+end_src
 
 **** asynchronous tangle
-- 
2.20.1


From 9b59637c71b32cc79bae835c0609f426c64e0136 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 31 Oct 2018 11:58:31 -0400
Subject: [PATCH 03/16] [emacs] assimilate org-outline-numbering and dep

TODO: sort out auto-upating if possible and then enable
---
 .gitmodules               | 6 ++++++
 init.org                  | 3 +++
 lib/org-outline-numbering | 1 +
 lib/ov                    | 1 +
 4 files changed, 11 insertions(+)
 create mode 160000 lib/org-outline-numbering
 create mode 160000 lib/ov

diff --git a/.gitmodules b/.gitmodules
index b31573a..e50daec 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -191,9 +191,15 @@
 	# into lisp/, which git will pick up.  so, let's ignore untracked files
 	# from org's submodule; at least for now
 	ignore = untracked
+[submodule "org-outline-numbering"]
+	path = lib/org-outline-numbering
+	url = git@gitlab.com:andersjohansson/org-outline-numbering.git
 [submodule "orgalist"]
 	path = lib/orgalist
 	url = git@github.com:emacsmirror/orgalist.git
+[submodule "ov"]
+	path = lib/ov
+	url = git@github.com:ShingoFukuyama/ov.el.git
 [submodule "ox-hugo"]
 	path = lib/ox-hugo
 	url = git@github.com:kaushalmodi/ox-hugo.git
diff --git a/init.org b/init.org
index 4bd4458..9a0e1dd 100644
--- a/init.org
+++ b/init.org
@@ -720,6 +720,9 @@ In short, my favourite way of life.
 
 (use-package orgalist
   :hook (message-mode . orgalist-mode))
+
+;; (use-package org-outline-numbering)
+;; TODO: auto-updating by calling org-outline-numbering-display
 #+end_src
 
 **** asynchronous tangle
diff --git a/lib/org-outline-numbering b/lib/org-outline-numbering
new file mode 160000
index 0000000..b95b6a7
--- /dev/null
+++ b/lib/org-outline-numbering
@@ -0,0 +1 @@
+Subproject commit b95b6a7ed9289637cb512232470633b330ca9713
diff --git a/lib/ov b/lib/ov
new file mode 160000
index 0000000..fae7215
--- /dev/null
+++ b/lib/ov
@@ -0,0 +1 @@
+Subproject commit fae7215b3dedba2a9ced145284332e4609bfdc38
-- 
2.20.1


From 0c158cafca2f97bc07de692ff4b81f300f292e8f Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 31 Oct 2018 12:26:38 -0400
Subject: [PATCH 04/16] [emacs] assimilate other-frame-window and winum (TODO:
 set them up)

---
 .gitmodules            | 6 ++++++
 lib/other-frame-window | 1 +
 lib/winum              | 1 +
 3 files changed, 8 insertions(+)
 create mode 160000 lib/other-frame-window
 create mode 160000 lib/winum

diff --git a/.gitmodules b/.gitmodules
index e50daec..002346a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -197,6 +197,9 @@
 [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 "ov"]
 	path = lib/ov
 	url = git@github.com:ShingoFukuyama/ov.el.git
@@ -267,6 +270,9 @@
 [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
diff --git a/lib/other-frame-window b/lib/other-frame-window
new file mode 160000
index 0000000..7477b00
--- /dev/null
+++ b/lib/other-frame-window
@@ -0,0 +1 @@
+Subproject commit 7477b00664bff9b0b9edfe7ecbef379a7543ba77
diff --git a/lib/winum b/lib/winum
new file mode 160000
index 0000000..c56d1cd
--- /dev/null
+++ b/lib/winum
@@ -0,0 +1 @@
+Subproject commit c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c
-- 
2.20.1


From 313f587783feb1c4b497451a2f3af370c0018ff9 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Thu, 1 Nov 2018 18:20:51 -0400
Subject: [PATCH 05/16] [emacs] assimilate slack and deps, clear up .gitignore,
 add secrets
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

hopefully the slack thing is temporary, as i don’t like using
proprietary platforms. however, if i must, i’d *much* prefer using
free software to access it, rather than executing proprietary JS.

note: since i’ve decided to commit etc/secrets.el, it shall not
contain any sensitive information itself, but rather how to obtain
them.  therefore, it must be byte-compiled; and the byte-compiled
etc/secrets.elc must *never* be committed.
---
 .gitignore     |  7 +-----
 .gitmodules    | 27 ++++++++++++++++++++++
 etc/secrets.el |  7 ++++++
 init.org       | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-
 lib/alert      |  1 +
 lib/circe      |  1 +
 lib/deferred   |  1 +
 lib/emojify    |  1 +
 lib/ht         |  1 +
 lib/oauth2     |  1 +
 lib/request    |  1 +
 lib/slack      |  1 +
 lib/websocket  |  1 +
 13 files changed, 104 insertions(+), 7 deletions(-)
 create mode 100644 etc/secrets.el
 create mode 160000 lib/alert
 create mode 160000 lib/circe
 create mode 160000 lib/deferred
 create mode 160000 lib/emojify
 create mode 160000 lib/ht
 create mode 160000 lib/oauth2
 create mode 160000 lib/request
 create mode 160000 lib/slack
 create mode 160000 lib/websocket

diff --git a/.gitignore b/.gitignore
index 9c17b6d..6a2dcca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,5 @@
-# getmail oldmail file
-oldmail-*
+*.elc
 
 /early-init.el
 /init.el
 /var
-/recentf
-/smex-items
-/auto-save-list
-/network-security.data
diff --git a/.gitmodules b/.gitmodules
index 002346a..f20e6fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,9 @@
 [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
@@ -22,6 +25,9 @@
 [submodule "boxquote"]
 	path = lib/boxquote
 	url = git@github.com:davep/boxquote.el.git
+[submodule "circe"]
+	path = lib/circe
+	url = git@github.com:jorgenschaefer/circe.git
 [submodule "closql"]
 	path = lib/closql
 	url = git@github.com:emacscollective/closql.git
@@ -45,6 +51,9 @@
 	# that the submodule is dirty. so, let's ignore the untracked
 	# files of dash's submodule
 	ignore = untracked
+[submodule "deferred"]
+	path = lib/deferred
+	url = git@github.com:kiwanami/emacs-deferred.git
 [submodule "diff-hl"]
 	path = lib/diff-hl
 	url = git@github.com:dgutov/diff-hl.git
@@ -71,6 +80,9 @@
 [submodule "emmet-mode"]
 	path = lib/emmet-mode
 	url = git@github.com:smihica/emmet-mode.git
+[submodule "emojify"]
+	path = lib/emojify
+	url = git@github.com:iqbalansari/emacs-emojify.git
 [submodule "epkg"]
 	path = lib/epkg
 	url = git@github.com:emacscollective/epkg.git
@@ -113,6 +125,9 @@
 [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
@@ -181,6 +196,9 @@
 	# build-step = make
 	# build-step = make sphinx-texinfo
 	# build-step = borg-makeinfo
+[submodule "oauth2"]
+	path = lib/oauth2
+	url = git@github.com:emacsmirror/oauth2.git
 [submodule "org"]
 	path = lib/org
 	url = git@code.orgmode.org:bzg/org-mode.git
@@ -231,6 +249,9 @@
 [submodule "proof-site"]  # Proof General
 	path = lib/proof-site
 	url = git@github.com:ProofGeneral/PG.git
+[submodule "request"]
+	path = lib/request
+	url = git@github.com:tkf/emacs-request.git
 [submodule "s"]
 	path = lib/s
 	url = git@github.com:magnars/s.el.git
@@ -243,6 +264,9 @@
 [submodule "shut-up"]
 	path = lib/shut-up
 	url = git@github.com:cask/shut-up.git
+[submodule "slack"]
+	path = lib/slack
+	url = git@github.com:yuya373/emacs-slack.git
 [submodule "smex"]  # used by counsel-M-x
 	path = lib/smex
 	url = git@github.com:nonsequitur/smex.git
@@ -267,6 +291,9 @@
 [submodule "web-mode"]
 	path = lib/web-mode
 	url = git@github.com:fxbois/web-mode.git
+[submodule "websocket"]
+	path = lib/websocket
+	url = git@github.com:ahyatt/emacs-websocket.git
 [submodule "which-key"]
 	path = lib/which-key
 	url = git@github.com:justbur/emacs-which-key.git
diff --git a/etc/secrets.el b/etc/secrets.el
new file mode 100644
index 0000000..9feeceb
--- /dev/null
+++ b/etc/secrets.el
@@ -0,0 +1,7 @@
+(require 'auth-source)
+(defvar uw-apv-client-id      (eval-when-compile (plist-get (car (auth-source-search :host "uw-apv.slack.com"  :max 1)) :client-id)))
+(defvar uw-apv-client-secret  (eval-when-compile (plist-get (car (auth-source-search :host "uw-apv.slack.com"  :max 1)) :client-secret)))
+(defvar uw-apv-token          (eval-when-compile (plist-get (car (auth-source-search :host "uw-apv.slack.com"  :max 1)) :token)))
+(defvar watform-client-id     (eval-when-compile (plist-get (car (auth-source-search :host "watform.slack.com" :max 1)) :client-id)))
+(defvar watform-client-secret (eval-when-compile (plist-get (car (auth-source-search :host "watform.slack.com" :max 1)) :client-secret)))
+(defvar watform-token         (eval-when-compile (plist-get (car (auth-source-search :host "watform.slack.com" :max 1)) :token)))
diff --git a/init.org b/init.org
index 9a0e1dd..d64925d 100644
--- a/init.org
+++ b/init.org
@@ -324,6 +324,12 @@ it it's own file. While at it, treat themes as safe.
   (setf custom-safe-themes t))
 #+end_src
 
+** Secrets file
+
+#+begin_src emacs-lisp
+(load (no-littering-expand-etc-file-name "secrets"))
+#+end_src
+
 ** Better =$PATH= handling
 
 Let's use [[https://github.com/purcell/exec-path-from-shell][exec-path-from-shell]] to make Emacs use the =$PATH= as set up
@@ -642,7 +648,7 @@ Enable =winner-mode=.
 #+begin_src emacs-lisp
 (bind-keys
  ("C-c b k" . kill-this-buffer)
- ("C-c s s" . save-buffer)
+ ;; ("C-c s s" . save-buffer)
  ("C-c b s" . save-buffer)
  ("C-c S"   . save-buffer)
  ("C-c o"   . other-window)
@@ -1642,6 +1648,59 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
   :hook (text-mode . typo-mode))
 #+end_src
 
+** slack
+
+Hopefully temporary.
+
+#+begin_src emacs-lisp
+(use-package slack
+  :commands (slack-start)
+  :init
+  (eval-when-compile                    ; silence the byte-compiler
+    (defvar url-http-data nil)
+    (defvar url-http-extra-headers nil)
+    (defvar url-http-method nil)
+    (defvar url-callback-function nil)
+    (defvar url-callback-arguments nil)
+    (defvar oauth--token-data nil))
+  (setq slack-buffer-emojify t
+        slack-prefer-current-team t)
+  :config
+  (slack-register-team
+   :name "uw-apv"
+   :default t
+   :client-id uw-apv-client-id
+   :client-secret uw-apv-client-secret
+   :token uw-apv-token
+   :subscribed-channels '(general)
+   :full-and-display-names t)
+  (slack-register-team
+   :name "watform"
+   :default nil
+   :client-id watform-client-id
+   :client-secret watform-client-secret
+   :token watform-token
+   :subscribed-channels '(general)
+   :full-and-display-names t);
+  :bind
+  (("C-c s s" . slack-start)
+   ("C-c s u" . slack-select-unread-rooms)
+   ("C-c s b" . slack-select-rooms)
+   ("C-c s t" . slack-change-current-team)
+   ("C-c s c" . slack-ws-close)
+   :map slack-mode-map
+   ("C-c e"   . slack-message-edit)
+   ("C-c k"   . slack-message-delete)
+   ("C-c C-k" . slack-channel-leave)
+   ("@"       . slack-message-embed-mention)
+   ("#"       . slack-message-embed-channel)));
+
+(use-package alert
+  :commands (alert)
+  :init
+  (setq alert-default-style 'notifier))
+#+end_src
+
 * Email
 
 #+begin_src emacs-lisp
diff --git a/lib/alert b/lib/alert
new file mode 160000
index 0000000..9f329be
--- /dev/null
+++ b/lib/alert
@@ -0,0 +1 @@
+Subproject commit 9f329be87820474925f29b52a1131084c8ea95b9
diff --git a/lib/circe b/lib/circe
new file mode 160000
index 0000000..fedfa7e
--- /dev/null
+++ b/lib/circe
@@ -0,0 +1 @@
+Subproject commit fedfa7eb8516a53fa70b6a1f4fce4b5ab66ea91f
diff --git a/lib/deferred b/lib/deferred
new file mode 160000
index 0000000..2239671
--- /dev/null
+++ b/lib/deferred
@@ -0,0 +1 @@
+Subproject commit 2239671d94b38d92e9b28d4e12fd79814cfb9c16
diff --git a/lib/emojify b/lib/emojify
new file mode 160000
index 0000000..38ae28d
--- /dev/null
+++ b/lib/emojify
@@ -0,0 +1 @@
+Subproject commit 38ae28d95b58e9fb86a3495a2dda3e5de254c4fc
diff --git a/lib/ht b/lib/ht
new file mode 160000
index 0000000..5a665d0
--- /dev/null
+++ b/lib/ht
@@ -0,0 +1 @@
+Subproject commit 5a665d00dc8fda77bad2a43277d8809c23e46ab8
diff --git a/lib/oauth2 b/lib/oauth2
new file mode 160000
index 0000000..1d352b3
--- /dev/null
+++ b/lib/oauth2
@@ -0,0 +1 @@
+Subproject commit 1d352b3dcd186d93bce7baf26818967c022187e4
diff --git a/lib/request b/lib/request
new file mode 160000
index 0000000..a3d080e
--- /dev/null
+++ b/lib/request
@@ -0,0 +1 @@
+Subproject commit a3d080e57eb8be606fbf39d1baff94e1b16e1fb8
diff --git a/lib/slack b/lib/slack
new file mode 160000
index 0000000..792604d
--- /dev/null
+++ b/lib/slack
@@ -0,0 +1 @@
+Subproject commit 792604db287de2a986177d90f086f5d51aa5b403
diff --git a/lib/websocket b/lib/websocket
new file mode 160000
index 0000000..0d96ba2
--- /dev/null
+++ b/lib/websocket
@@ -0,0 +1 @@
+Subproject commit 0d96ba2ff5a25c6cd6c66f417cc9b5f38a4308ba
-- 
2.20.1


From 1aa90613c027ab54dc66287d0a7b562507a195b3 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Thu, 1 Nov 2018 18:28:49 -0400
Subject: [PATCH 06/16] [emacs] update 14 drones

lib/borg                    master                    v3.0.0-1-g73990d3
lib/closql                  master                    v1.0.0
lib/doom-modeline           master                    v0.6.1
lib/emacsql                 master                     3.0.0
lib/epkg                    master                    v3.1.1
lib/ghub                    master                    v3.0.0
lib/helpful                 master                     0.15-7-g039345e
lib/magit                   master                     2.13.0-367-g39f22c97
lib/no-littering            master                    v1.0.0
lib/org                     master                    release_9.1.14-1016-g85a675b93
lib/ox-hugo                 master                    v0.8-428-g6f495b9
lib/proof-site              master                    v4.4-209-g15cf5a3f
lib/web-mode                master                    v16-43-g2d8c7fc
lib/with-editor             master                    v2.8.0
---
 lib/borg          | 2 +-
 lib/closql        | 2 +-
 lib/doom-modeline | 2 +-
 lib/emacsql       | 2 +-
 lib/epkg          | 2 +-
 lib/ghub          | 2 +-
 lib/helpful       | 2 +-
 lib/magit         | 2 +-
 lib/no-littering  | 2 +-
 lib/org           | 2 +-
 lib/ox-hugo       | 2 +-
 lib/proof-site    | 2 +-
 lib/web-mode      | 2 +-
 lib/with-editor   | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/borg b/lib/borg
index 3144f29..73990d3 160000
--- a/lib/borg
+++ b/lib/borg
@@ -1 +1 @@
-Subproject commit 3144f291ab051c5d66037c3a0910cde74c53410d
+Subproject commit 73990d3039f94da4ba213a3423f42f47f454d5db
diff --git a/lib/closql b/lib/closql
index 253ceab..012b94f 160000
--- a/lib/closql
+++ b/lib/closql
@@ -1 +1 @@
-Subproject commit 253ceab31a826c211eb16ec74aeb1712d3e8f089
+Subproject commit 012b94f8695e194455111fd54eff0b94dd0dd0db
diff --git a/lib/doom-modeline b/lib/doom-modeline
index 81a782b..1d372f0 160000
--- a/lib/doom-modeline
+++ b/lib/doom-modeline
@@ -1 +1 @@
-Subproject commit 81a782b1cb8e91868f6ef49fb59658abd96cf7e6
+Subproject commit 1d372f0c82a967daeddfb6adf8601121d3449b92
diff --git a/lib/emacsql b/lib/emacsql
index 6f1e375..8c5f095 160000
--- a/lib/emacsql
+++ b/lib/emacsql
@@ -1 +1 @@
-Subproject commit 6f1e375a2ebb558138b73d2a63f2077da1028f92
+Subproject commit 8c5f095458aa37e4146b80d9319ee63571734127
diff --git a/lib/epkg b/lib/epkg
index cb1da87..5bc1b75 160000
--- a/lib/epkg
+++ b/lib/epkg
@@ -1 +1 @@
-Subproject commit cb1da87b51711bbef39873410dbe59dc2ece2553
+Subproject commit 5bc1b7515cc444b6ae9f7af7a208d77531cfb406
diff --git a/lib/ghub b/lib/ghub
index 84dbc5d..8b8ae5c 160000
--- a/lib/ghub
+++ b/lib/ghub
@@ -1 +1 @@
-Subproject commit 84dbc5d1474302dc336a359480615dc8c40a47c5
+Subproject commit 8b8ae5c8df048d7e1971d09f8b47361b532d2df0
diff --git a/lib/helpful b/lib/helpful
index d37d32e..039345e 160000
--- a/lib/helpful
+++ b/lib/helpful
@@ -1 +1 @@
-Subproject commit d37d32e01183143b62d51fb7967883959f48bbeb
+Subproject commit 039345ef60b4722d050c94ab1978540137df35f9
diff --git a/lib/magit b/lib/magit
index 14c7b13..39f22c9 160000
--- a/lib/magit
+++ b/lib/magit
@@ -1 +1 @@
-Subproject commit 14c7b1381c0203ddc6e44c43f233280f5ec543fe
+Subproject commit 39f22c97224f78c832bf2ea13f4e5ff302d9cac9
diff --git a/lib/no-littering b/lib/no-littering
index 0243e74..b9c8dcf 160000
--- a/lib/no-littering
+++ b/lib/no-littering
@@ -1 +1 @@
-Subproject commit 0243e7485de736be9b7299c1e188d0cc9fdc3349
+Subproject commit b9c8dcfd5d0757aeca2fb772ff233cd6f1fd75db
diff --git a/lib/org b/lib/org
index 643481f..85a675b 160000
--- a/lib/org
+++ b/lib/org
@@ -1 +1 @@
-Subproject commit 643481fade386aa51d88ccc22b9669b0b77daaa1
+Subproject commit 85a675b939b469984fa701b42fa11eae262ec732
diff --git a/lib/ox-hugo b/lib/ox-hugo
index 03c146e..6f495b9 160000
--- a/lib/ox-hugo
+++ b/lib/ox-hugo
@@ -1 +1 @@
-Subproject commit 03c146e7cd5db14ee607718e034bcc1a2fde1ddb
+Subproject commit 6f495b91f13ed86f8b50b08a12d3214756de21c4
diff --git a/lib/proof-site b/lib/proof-site
index 7987392..15cf5a3 160000
--- a/lib/proof-site
+++ b/lib/proof-site
@@ -1 +1 @@
-Subproject commit 798739255ec1002438b6f9250acac9786ca28554
+Subproject commit 15cf5a3f1e3ba35d832e1464a1b729905aed78a8
diff --git a/lib/web-mode b/lib/web-mode
index c17db9b..2d8c7fc 160000
--- a/lib/web-mode
+++ b/lib/web-mode
@@ -1 +1 @@
-Subproject commit c17db9b9677e59277f5f37a29ca0dd1558810106
+Subproject commit 2d8c7fc0b337a0b38ed3e5a35a2b9ac23ddafdb7
diff --git a/lib/with-editor b/lib/with-editor
index 7ac5743..db11c10 160000
--- a/lib/with-editor
+++ b/lib/with-editor
@@ -1 +1 @@
-Subproject commit 7ac5743b6940bde700e046304a1fb51b5f341dde
+Subproject commit db11c10b8ca981f00d9fc7f8e0669a6c15710502
-- 
2.20.1


From e6bb60ec586ab8536f2948117bc03b51cfa842ca Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 2 Nov 2018 00:26:44 -0400
Subject: [PATCH 07/16] [emacs] update org; secrets: eval-when-compile require
 'auth-source

update org to release_9.1.14-1017-g6382a6bbb
---
 etc/secrets.el | 2 +-
 lib/org        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/secrets.el b/etc/secrets.el
index 9feeceb..74642b2 100644
--- a/etc/secrets.el
+++ b/etc/secrets.el
@@ -1,4 +1,4 @@
-(require 'auth-source)
+(eval-when-compile (require 'auth-source))
 (defvar uw-apv-client-id      (eval-when-compile (plist-get (car (auth-source-search :host "uw-apv.slack.com"  :max 1)) :client-id)))
 (defvar uw-apv-client-secret  (eval-when-compile (plist-get (car (auth-source-search :host "uw-apv.slack.com"  :max 1)) :client-secret)))
 (defvar uw-apv-token          (eval-when-compile (plist-get (car (auth-source-search :host "uw-apv.slack.com"  :max 1)) :token)))
diff --git a/lib/org b/lib/org
index 85a675b..6382a6b 160000
--- a/lib/org
+++ b/lib/org
@@ -1 +1 @@
-Subproject commit 85a675b939b469984fa701b42fa11eae262ec732
+Subproject commit 6382a6bbb31aad38b3157a8cb6b2e2c8f39fcd6e
-- 
2.20.1


From 289f0396c70391f9c3e79eed25b6dfb47b6db0a6 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 4 Nov 2018 00:43:33 -0400
Subject: [PATCH 08/16] [emacs] update 9 drones

lib/doom-modeline           master                    v0.6.1-2-ge9d4728
lib/helm                    master                    v3.0-25-g63285d7f
lib/magit                   master                     2.13.0-379-gaf4bf8df
lib/org                     master                    release_9.1.14-1020-g6e51b42e1
lib/ox-hugo                 master                    v0.8-429-g1bad3c4
lib/projectile              master                    v1.0.0-203-g8c2e260
lib/slack                   master                    2e96859
lib/web-mode                master                    v16-44-g6f70ee0
lib/with-editor             master                    v2.8.0-2-g87c96b3
---
 lib/doom-modeline | 2 +-
 lib/helm          | 2 +-
 lib/magit         | 2 +-
 lib/org           | 2 +-
 lib/ox-hugo       | 2 +-
 lib/projectile    | 2 +-
 lib/slack         | 2 +-
 lib/web-mode      | 2 +-
 lib/with-editor   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/doom-modeline b/lib/doom-modeline
index 1d372f0..e9d4728 160000
--- a/lib/doom-modeline
+++ b/lib/doom-modeline
@@ -1 +1 @@
-Subproject commit 1d372f0c82a967daeddfb6adf8601121d3449b92
+Subproject commit e9d4728b210b83d1f1d3cd2e80a3cfc63098e858
diff --git a/lib/helm b/lib/helm
index 2e56609..63285d7 160000
--- a/lib/helm
+++ b/lib/helm
@@ -1 +1 @@
-Subproject commit 2e566095893f85f58c66eb8f73c5f5d0165efb4a
+Subproject commit 63285d7fb9794376f46bb6f6045ff82535883754
diff --git a/lib/magit b/lib/magit
index 39f22c9..af4bf8d 160000
--- a/lib/magit
+++ b/lib/magit
@@ -1 +1 @@
-Subproject commit 39f22c97224f78c832bf2ea13f4e5ff302d9cac9
+Subproject commit af4bf8df892af62d7660ceeb6f55545f7e33434c
diff --git a/lib/org b/lib/org
index 6382a6b..6e51b42 160000
--- a/lib/org
+++ b/lib/org
@@ -1 +1 @@
-Subproject commit 6382a6bbb31aad38b3157a8cb6b2e2c8f39fcd6e
+Subproject commit 6e51b42e164df978df66580b0ca82b4fc84c7e0e
diff --git a/lib/ox-hugo b/lib/ox-hugo
index 6f495b9..1bad3c4 160000
--- a/lib/ox-hugo
+++ b/lib/ox-hugo
@@ -1 +1 @@
-Subproject commit 6f495b91f13ed86f8b50b08a12d3214756de21c4
+Subproject commit 1bad3c47d74d411b57ef66b00d56cf3e1ad99bee
diff --git a/lib/projectile b/lib/projectile
index 2a3e27a..8c2e260 160000
--- a/lib/projectile
+++ b/lib/projectile
@@ -1 +1 @@
-Subproject commit 2a3e27add0a13f99379ccccb8b03d92be0b4b7d1
+Subproject commit 8c2e260565b5b9460895dffbce5ebc5c7d687f71
diff --git a/lib/slack b/lib/slack
index 792604d..2e96859 160000
--- a/lib/slack
+++ b/lib/slack
@@ -1 +1 @@
-Subproject commit 792604db287de2a986177d90f086f5d51aa5b403
+Subproject commit 2e968590bdd3ba7474b5d6260910d821607b21a5
diff --git a/lib/web-mode b/lib/web-mode
index 2d8c7fc..6f70ee0 160000
--- a/lib/web-mode
+++ b/lib/web-mode
@@ -1 +1 @@
-Subproject commit 2d8c7fc0b337a0b38ed3e5a35a2b9ac23ddafdb7
+Subproject commit 6f70ee0cd7da3677ea1846ab7d7383b628e41e4e
diff --git a/lib/with-editor b/lib/with-editor
index db11c10..87c96b3 160000
--- a/lib/with-editor
+++ b/lib/with-editor
@@ -1 +1 @@
-Subproject commit db11c10b8ca981f00d9fc7f8e0669a6c15710502
+Subproject commit 87c96b3a7cdf9ab9477e27f1ae2010883a83a426
-- 
2.20.1


From 3bb16326b55d9570fb19bb88aa23295317b00c33 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 4 Nov 2018 00:45:01 -0400
Subject: [PATCH 09/16] [emacs] some slack-related enhancements

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

diff --git a/init.org b/init.org
index d64925d..4e263c8 100644
--- a/init.org
+++ b/init.org
@@ -707,7 +707,9 @@ In short, my favourite way of life.
 
 (use-package ox-latex
   :config
-  (setq org-latex-listings 'listings)
+  (setq org-latex-listings 'listings
+        ;; org-latex-prefer-user-labels t
+        )
   (add-to-list 'org-latex-packages-alist '("" "listings"))
   (add-to-list 'org-latex-packages-alist '("" "color"))
   (add-to-list 'org-latex-classes
@@ -944,7 +946,10 @@ There's no way I could top that, so I won't attempt to.
       ("emacs"
        (or
         (name . "^\\*scratch\\*$")
-        (name . "^\\*Messages\\*$"))))))
+        (name . "^\\*Messages\\*$")))
+      ("slack"
+       (or
+        (name . "^\\*Slack*"))))))
   (ibuffer-formats
    '((mark modified read-only locked " "
            (name 18 18 :left :elide)
@@ -1689,9 +1694,17 @@ Hopefully temporary.
    ("C-c s t" . slack-change-current-team)
    ("C-c s c" . slack-ws-close)
    :map slack-mode-map
+   ("M-p"     . slack-buffer-goto-prev-message)
+   ("M-n"     . slack-buffer-goto-next-message)
    ("C-c e"   . slack-message-edit)
    ("C-c k"   . slack-message-delete)
    ("C-c C-k" . slack-channel-leave)
+   ("C-c r a" . slack-message-add-reaction)
+   ("C-c r r" . slack-message-remove-reaction)
+   ("C-c r s" . slack-message-show-reaction-users)
+   ("C-c p l" . slack-room-pins-list)
+   ("C-c p a" . slack-message-pins-add)
+   ("C-c p r" . slack-message-pins-remove)
    ("@"       . slack-message-embed-mention)
    ("#"       . slack-message-embed-channel)));
 
-- 
2.20.1


From 852fbc1b0374ed84053229ef249c0b5724816647 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 4 Nov 2018 00:56:58 -0400
Subject: [PATCH 10/16] Revert "[emacs] assimilate org-outline-numbering and
 dep"
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This reverts commit 9b59637c71b32cc79bae835c0609f426c64e0136.

i’ll instead use org-num (by Nicolas Goaziou) when it’s released
https://lists.gnu.org/r/emacs-orgmode/2018-11/msg00015.html
---
 .gitmodules               | 6 ------
 init.org                  | 3 ---
 lib/org-outline-numbering | 1 -
 lib/ov                    | 1 -
 4 files changed, 11 deletions(-)
 delete mode 160000 lib/org-outline-numbering
 delete mode 160000 lib/ov

diff --git a/.gitmodules b/.gitmodules
index f20e6fc..7e9756f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -209,18 +209,12 @@
 	# into lisp/, which git will pick up.  so, let's ignore untracked files
 	# from org's submodule; at least for now
 	ignore = untracked
-[submodule "org-outline-numbering"]
-	path = lib/org-outline-numbering
-	url = git@gitlab.com:andersjohansson/org-outline-numbering.git
 [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 "ov"]
-	path = lib/ov
-	url = git@github.com:ShingoFukuyama/ov.el.git
 [submodule "ox-hugo"]
 	path = lib/ox-hugo
 	url = git@github.com:kaushalmodi/ox-hugo.git
diff --git a/init.org b/init.org
index 4e263c8..17db595 100644
--- a/init.org
+++ b/init.org
@@ -728,9 +728,6 @@ In short, my favourite way of life.
 
 (use-package orgalist
   :hook (message-mode . orgalist-mode))
-
-;; (use-package org-outline-numbering)
-;; TODO: auto-updating by calling org-outline-numbering-display
 #+end_src
 
 **** asynchronous tangle
diff --git a/lib/org-outline-numbering b/lib/org-outline-numbering
deleted file mode 160000
index b95b6a7..0000000
--- a/lib/org-outline-numbering
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b95b6a7ed9289637cb512232470633b330ca9713
diff --git a/lib/ov b/lib/ov
deleted file mode 160000
index fae7215..0000000
--- a/lib/ov
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fae7215b3dedba2a9ced145284332e4609bfdc38
-- 
2.20.1


From d851faed1cc3546afc039ade989ff5bab805bdf9 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 4 Nov 2018 16:17:16 -0500
Subject: [PATCH 11/16] [emacs] small slack enhancements

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

diff --git a/init.org b/init.org
index 17db595..259d239 100644
--- a/init.org
+++ b/init.org
@@ -1683,7 +1683,8 @@ Hopefully temporary.
    :client-secret watform-client-secret
    :token watform-token
    :subscribed-channels '(general)
-   :full-and-display-names t);
+   :full-and-display-names t)
+  (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t)
   :bind
   (("C-c s s" . slack-start)
    ("C-c s u" . slack-select-unread-rooms)
@@ -1693,6 +1694,7 @@ Hopefully temporary.
    :map slack-mode-map
    ("M-p"     . slack-buffer-goto-prev-message)
    ("M-n"     . slack-buffer-goto-next-message)
+   ("M-N"     . end-of-buffer)
    ("C-c e"   . slack-message-edit)
    ("C-c k"   . slack-message-delete)
    ("C-c C-k" . slack-channel-leave)
@@ -1703,7 +1705,7 @@ Hopefully temporary.
    ("C-c p a" . slack-message-pins-add)
    ("C-c p r" . slack-message-pins-remove)
    ("@"       . slack-message-embed-mention)
-   ("#"       . slack-message-embed-channel)));
+   ("#"       . slack-message-embed-channel)))
 
 (use-package alert
   :commands (alert)
-- 
2.20.1


From 3c3055c760d69af5efefe3dbff30f423d8c8c8a8 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 4 Nov 2018 16:20:45 -0500
Subject: [PATCH 12/16] [emacs] a few useful super bindings

---
 init.org | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/init.org b/init.org
index 259d239..5df8479 100644
--- a/init.org
+++ b/init.org
@@ -648,14 +648,17 @@ Enable =winner-mode=.
 #+begin_src emacs-lisp
 (bind-keys
  ("C-c b k" . kill-this-buffer)
- ;; ("C-c s s" . save-buffer)
  ("C-c b s" . save-buffer)
  ("C-c S"   . save-buffer)
  ("C-c o"   . other-window)
  ("C-c q q" . save-buffers-kill-terminal)
  ("C-c F m" . make-frame-command)
  ("C-c F d" . delete-frame)
- ("C-c F D" . delete-other-frames))
+ ("C-c F D" . delete-other-frames)
+ ("s-c e b" . eval-buffer)
+ ("s-c e r" . eval-region)
+ ("s-p"     . beginning-of-buffer)
+ ("s-n"     . end-of-buffer))
 #+end_src
 
 ** Packages
@@ -790,8 +793,7 @@ Not just how I do git, but /the/ way to do git.
 (use-package magit
   :defer t
   :bind
-  (("s-g"   . magit-dispatch-popup)
-   ("C-x g" . magit-status)
+  (("s-g" . magit-status)
    :prefix-map amin--magit-prefix-map
    :prefix "C-c g"
    ("SPC" . magit-status)
@@ -1694,7 +1696,6 @@ Hopefully temporary.
    :map slack-mode-map
    ("M-p"     . slack-buffer-goto-prev-message)
    ("M-n"     . slack-buffer-goto-next-message)
-   ("M-N"     . end-of-buffer)
    ("C-c e"   . slack-message-edit)
    ("C-c k"   . slack-message-delete)
    ("C-c C-k" . slack-channel-leave)
-- 
2.20.1


From 2ab3155c7691dff78baae26abc3965cf38593cfc Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 4 Nov 2018 16:27:21 -0500
Subject: [PATCH 13/16] [emacs] update 4 drones

lib/magit                   master                     2.13.0-383-gdc0a2e70
lib/org                     master                    release_9.1.14-1023-g503a1d4d9
lib/slack                   master                    ef3956a
lib/web-mode                master                    v16-45-g29ced99
---
 lib/magit    | 2 +-
 lib/org      | 2 +-
 lib/slack    | 2 +-
 lib/web-mode | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/magit b/lib/magit
index af4bf8d..dc0a2e7 160000
--- a/lib/magit
+++ b/lib/magit
@@ -1 +1 @@
-Subproject commit af4bf8df892af62d7660ceeb6f55545f7e33434c
+Subproject commit dc0a2e7032a596851f0c71c223e1552c13320404
diff --git a/lib/org b/lib/org
index 6e51b42..503a1d4 160000
--- a/lib/org
+++ b/lib/org
@@ -1 +1 @@
-Subproject commit 6e51b42e164df978df66580b0ca82b4fc84c7e0e
+Subproject commit 503a1d4d94fba7adeda50fcb1bf411285d566af6
diff --git a/lib/slack b/lib/slack
index 2e96859..ef3956a 160000
--- a/lib/slack
+++ b/lib/slack
@@ -1 +1 @@
-Subproject commit 2e968590bdd3ba7474b5d6260910d821607b21a5
+Subproject commit ef3956a80c5521b5fb91e65947ab0af40222b10d
diff --git a/lib/web-mode b/lib/web-mode
index 6f70ee0..29ced99 160000
--- a/lib/web-mode
+++ b/lib/web-mode
@@ -1 +1 @@
-Subproject commit 6f70ee0cd7da3677ea1846ab7d7383b628e41e4e
+Subproject commit 29ced993bb1a435bd82d3e7395bed13b99e87de4
-- 
2.20.1


From 037935edac213e954e5ecd870510463295495dae Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 5 Nov 2018 16:52:36 -0500
Subject: [PATCH 14/16] =?utf8?q?[rc]=20nix=20=E2=86=92=20deb,=20and=20a=20?=
 =?utf8?q?few=20useful=20aliases?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 rc.org | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/rc.org b/rc.org
index e648215..6843791 100644
--- a/rc.org
+++ b/rc.org
@@ -991,7 +991,7 @@ CopyArrivalDate yes
 
 ######
 IMAPAccount amin
-Host nix.aminb.org
+Host mail.aminb.org
 User amin@aminb.org
 PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/amin.gpg"
 SSLType IMAPS
@@ -1535,9 +1535,9 @@ logfile ~/.msmtp.log
 
 # aminb
 account aminb
-host nix.aminb.org
+host mail.aminb.org
 # use `msmtp -a aminb --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint
-tls_fingerprint 98:C7:F0:02:7F:2B:D8:B6:D3:BF:E8:C1:D4:07:6B:B5:6C:B1:C7:5D:97:20:70:88:AB:9E:B5:09:5D:2C:DC:8E
+tls_fingerprint C7:A4:2E:A3:11:FA:80:45:C4:29:D6:62:4D:73:DB:34:43:67:8F:16:F1:2E:54:43:06:1B:41:B6:A9:09:E0:37
 tls_starttls on
 from amin@aminb.org
 user amin@aminb.org
@@ -5389,10 +5389,11 @@ alias mv="mv -iv"
 alias cp="cp -iv"
 alias scl=systemctl
 alias jcl=journalctl
-alias m="mbsync -a; getmail; notmuch new"
+alias m="mbsync -a; notmuch new"
 alias best="youtube-dl -f best"
-alias nixx="ssh amin@nix.aminb.org"
-alias fence="ssh aminb@fencepost.gnu.org"
+alias sd="ssh deb"
+alias sf="ssh fp"
+alias sn="ssh nix"
 
 aur() {
    cd ~/usr/build
-- 
2.20.1


From 3ffa47326264a6ff513936f36131b4003966115e Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 5 Nov 2018 16:53:36 -0500
Subject: [PATCH 15/16] [emacs] make outline bindings not overlap, bindings for
 flycheck

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

diff --git a/init.org b/init.org
index 5df8479..5d760c8 100644
--- a/init.org
+++ b/init.org
@@ -972,8 +972,8 @@ There's no way I could top that, so I won't attempt to.
   (:map
    outline-minor-mode-map
    ("<s-tab>"  . outline-toggle-children)
-   ("s-p"      . outline-previous-visible-heading)
-   ("s-n"      . outline-next-visible-heading)
+   ("M-p"      . outline-previous-visible-heading)
+   ("M-n"      . outline-next-visible-heading)
    :prefix-map amin--outline-prefix-map
    :prefix "s-o"
    ("TAB" . outline-toggle-children)
@@ -1096,6 +1096,10 @@ TODO: break this giant source block down into individual org sections.
 #+begin_src emacs-lisp
 (use-package flycheck
   :hook (prog-mode . flycheck-mode)
+  :bind
+  (:map flycheck-mode-map
+        ("M-P" . flycheck-previous-error)
+        ("M-N" . flycheck-next-error))
   :config
   ;; Use the load-path from running Emacs when checking elisp files
   (setq flycheck-emacs-lisp-load-path 'inherit)
-- 
2.20.1


From ea40ba6c05350f8aa70afebf4f66d7f0eb097f93 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Tue, 6 Nov 2018 01:24:03 -0500
Subject: [PATCH 16/16] [emacs] Gnus setup skeleton

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

diff --git a/init.org b/init.org
index 5d760c8..7488fb8 100644
--- a/init.org
+++ b/init.org
@@ -1726,6 +1726,37 @@ Hopefully temporary.
   (add-to-list 'recentf-exclude amin-maildir))
 #+end_src
 
+** Gnus
+
+#+begin_src emacs-lisp :tangle yes
+(setq amin-gnus-init-file (no-littering-expand-etc-file-name "gnus"))
+
+(use-package gnus
+  :bind ("C-c m" . gnus)
+  :init
+  (setq
+   gnus-init-file        amin-gnus-init-file
+   gnus-home-directory   (no-littering-expand-var-file-name "gnus/")
+   gnus-directory        (no-littering-expand-var-file-name "gnus/News/")
+   message-directory     amin-maildir
+   gnus-save-newsrc-file nil
+   gnus-read-newsrc-file nil
+   gnus-gcc-mark-as-read t))
+
+(use-package mm-decode
+  :config
+  (setq mm-discouraged-alternatives '("text/html" "text/richtext")))
+#+end_src
+
+# #+begin_src emacs-lisp :tangle (concat gnus-init-file ".el") :mkdirp yes
+#+begin_src emacs-lisp :tangle no
+(setq gnus-select-method
+      '(nnmaildir "gnu"
+                  (directory "~/mail/gnu/")
+                  (directory-files nnheader-directory-files-safe)
+                  (get-new-mail nil)))
+#+end_src
+
 ** sendmail
 
 #+begin_src emacs-lisp
-- 
2.20.1