From 62e31918e9d50b3126ac3ad4fabd99b3a83ebbcb Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 13 Sep 2019 18:52:19 -0400
Subject: [PATCH 01/16] emacs: update packages, disable exwm for now

---
 .emacs.d/init.el                      |  3 +++
 .emacs.d/straight/versions/default.el | 13 +++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 47ff590..a5ac8f8 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -394,6 +394,7 @@ For disabling the behaviour for certain buffers and/or modes."
 
 ;; time and battery in mode-line
 (use-feature time
+  :disabled
   :demand
   :config
   (display-time-mode)
@@ -402,6 +403,7 @@ For disabling the behaviour for certain buffers and/or modes."
   (display-time-format "%a %b %-e, %-l:%M%P"))
 
 (use-feature battery
+  :disabled
   :demand
   :config
   (display-battery-mode)
@@ -561,6 +563,7 @@ For disabling the behaviour for certain buffers and/or modes."
 ;;; Essential packages
 
 (use-package exwm
+  :disabled
   :demand
   :config
   ;; make class name the buffer name, truncating beyond 60 characters
diff --git a/.emacs.d/straight/versions/default.el b/.emacs.d/straight/versions/default.el
index 82d6a65..eecc83c 100644
--- a/.emacs.d/straight/versions/default.el
+++ b/.emacs.d/straight/versions/default.el
@@ -4,7 +4,6 @@
  ("biblio.el" . "efeeab720cb8e3f95ddb4298d0cc62393cf237e9")
  ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5")
  ("bui.el" . "508577a7225b3d07eaefa9444064410af2518675")
- ("cl-generic" . "5fdc275eca6d0c5fce54b86997dea2f50f70df47")
  ("cl-lib" . "e79686c4a26959c0ecba0951a7e335ed28035386")
  ("closql" . "70b98dbae53611d10a461d9b4a6f71086910dcef")
  ("company-ebdb" . "3b463fe1236ac6445657f3a1df20357a7a2fa8f6")
@@ -22,7 +21,7 @@
  ("emacs-emojify" . "782ac307f37239e90c56810323db4263a6469219")
  ("emacs-htmlize" . "8db0aa6aab77475a732b7363f0d57bd3933c18fd")
  ("emacs-which-key" . "42a25055163141165aa0269dbca69735e704825c")
- ("emacsmirror-mirror" . "ee5a5b91cd4f47293c7c539fcc05266748ed90bc")
+ ("emacsmirror-mirror" . "3e746b1f82568b2a6ebe118ac1f35ed1ce502a37")
  ("emacsql" . "a118b6c95af1306f0288a383d274b5dd93efbbda")
  ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
@@ -31,10 +30,9 @@
  ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519")
  ("exec-path-from-shell" . "3cfedb8791397ed50ee66bc0a7cbee5b9d78245c")
  ("expand-region.el" . "1c31447730443d98f90f65dfcb752f347d46ad1b")
- ("exwm" . "621295e21c2e9f1e24398c75ab6a3825275a69b7")
  ("exwm-edit" . "961c0f3ea45766b888c73d7353da13d329538034")
  ("f.el" . "8191672377816a1975414cc1f116fd3b94b30bd0")
- ("flycheck" . "2642b38efc1a952a1c8687c9071de7dbcf1ff10a")
+ ("flycheck" . "0006a59259ebd02c9199ddc87f0e3ce22793a2ea")
  ("forge" . "4424101b416931abc1b838e48f5710bd933c2973")
  ("geiser" . "f76340bd11dc6eb5cf6c22cb5f39e76d52b15d66")
  ("george-mode" . "e377ef5bd21783046fc5d02dd4fdc695e9baccc7")
@@ -42,7 +40,7 @@
  ("gntp.el" . "767571135e2c0985944017dc59b0be79af222ef5")
  ("gnu-elpa-mirror" . "01001b660cd3677228e25a6f544d579b56845c37")
  ("go-mode.el" . "3bc74790c41e071cc3a9da97b95bb01c78cc8784")
- ("guix.el" . "ba5ca406ca2048c2ab436578262e8654efcebc9a")
+ ("guix.el" . "24918011d2f1a78d63f39bf0c462b7dab190629a")
  ("helm" . "c00b5826c1d5797debe92ed235d50b068a348c14")
  ("helm-bibtex" . "7e87161463c9c5ade3ed0e65aa3cde48c51b57de")
  ("helpful" . "e9e958a5643619d0e32b9934bf4e9195c57cb71f")
@@ -57,7 +55,7 @@
  ("magit" . "5c424142704d481faafce7b834af67c1aca98e68")
  ("magit-popup" . "4250c3a606011e3ff2477e3b5bbde2b493f3c85c")
  ("markdown-mode" . "f3c54e34cc5228001af36a5301883325319f21d4")
- ("melpa" . "f0e0354a4da2e675406068d158c7e532cd5ed083")
+ ("melpa" . "44b28cc63352e4398a94338d885371226d1e81aa")
  ("message-x" . "5524de7bbfdd8749c110f48de5afb024d9f83133")
  ("minions" . "62f1d60a0852b4f83f64e6fc4c199eea967a34f7")
  ("moody" . "ac17d739075a571a086756fcaed482814888bf5c")
@@ -82,7 +80,7 @@
  ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
  ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c")
  ("soap-client" . "0c531f8bf9cd84cd12fbb434ad02344f75deef6f")
- ("straight.el" . "3794237a251c759262fb0b1a2579344aba4caf9a")
+ ("straight.el" . "f18e581af9763f9ec6e5686f5505bda6e429579a")
  ("swiper" . "79333e9edfee38ec3b367c33711a68bdf7783259")
  ("switch-buffer-functions-el" . "b8d8e01e21ae8c8c84234dddeb3cc8250814f7ba")
  ("tablist" . "8079801527da1f596bc942162026328d7bdf6ad9")
@@ -93,7 +91,6 @@
  ("use-package" . "1d5ffb2e0d1427066ced58febbba68c1328bf001")
  ("web-mode" . "a723d3ecd3606d1c1948871f46fc8c8d7f879fe4")
  ("with-editor" . "45c29f9bfb7f2df93426ce1571e2f4f41ed4e492")
- ("xelb" . "cb6f2c9482515b49630cb593a88de85344df0403")
  ("yasnippet" . "d91dd66f2aed9bbaef32813a68b105ea77e83890")
  ("znc" . "2fd359e556e05006e6976ba9b0f8cb220ea19863"))
 :alpha
-- 
2.20.1


From 95f304a8d9bd644b2fd49df49ca6acfbc93dae74 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 13 Sep 2019 18:52:39 -0400
Subject: [PATCH 02/16] emacs: ebdb: enable the pop-up again for now

maybe make this conditional on screen size
---
 .emacs.d/init.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index a5ac8f8..42152ea 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -2443,7 +2443,7 @@ https://csclub.uwaterloo.ca/~abandali")
 (use-feature ebdb-mua
   :demand
   :after ebdb
-  :custom (ebdb-mua-pop-up nil))
+  :custom (ebdb-mua-pop-up t))
 
 ;; (use-package ebdb-message
 ;;   :after ebdb)
-- 
2.20.1


From 489798a4ab8574e584deed009e20affae58bcea9 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 13 Sep 2019 18:53:22 -0400
Subject: [PATCH 03/16] bash: use i-beam cursor in terminals

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

diff --git a/.bashrc b/.bashrc
index d8bbe5e..b5c3480 100644
--- a/.bashrc
+++ b/.bashrc
@@ -39,7 +39,7 @@ PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: $(a_prompt)\007"'
 
 # i-beam cursor
 # echo -e "\033[5 q"              # blinking
-# echo -e "\033[6 q"              # non-blinking
+echo -e "\033[6 q"              # non-blinking
 
 # various bash tweaks
 # append to the history file, don't overwrite it
-- 
2.20.1


From bd155c4067a764d35ab32f8d97c50251af517427 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 13 Sep 2019 18:55:19 -0400
Subject: [PATCH 04/16] delete vestigial .gitmodules file

---
 .gitmodules | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29..0000000
-- 
2.20.1


From c470019ff5cb6b4bfeb7dd950f6b5ea4221d2655 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sat, 14 Sep 2019 09:43:54 -0400
Subject: [PATCH 05/16] emacs: tangomod: tweak mode-line colours

---
 .emacs.d/lisp/tangomod-theme.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.emacs.d/lisp/tangomod-theme.el b/.emacs.d/lisp/tangomod-theme.el
index 5ec1bd1..a395578 100644
--- a/.emacs.d/lisp/tangomod-theme.el
+++ b/.emacs.d/lisp/tangomod-theme.el
@@ -64,9 +64,9 @@ Semantic, and Ansi-Color faces are included.")
    `(show-paren-match ((,class (:background ,blue-1))))
    ;; Mode line faces
    `(mode-line ((,class (:box (:line-width -1 :style released-button)
-                              :background ,alum-2 :foreground ,alum-6))))
+                              :background "#e7e7e7" :foreground ,alum-6))))
    `(mode-line-inactive ((,class (:box (:line-width -1 :style released-button)
-                                       :background ,alum-4 :foreground ,alum-6))))
+                                       :background "#e1e1e1" :foreground ,alum-6))))
    ;; Escape and prompt faces
    `(minibuffer-prompt ((,class (:weight bold :foreground ,blue-3))))
    `(escape-glyph ((,class (:foreground ,red-3))))
-- 
2.20.1


From 2e54e9db1def0a2624775458b8e7f91689bedc57 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sat, 14 Sep 2019 09:44:14 -0400
Subject: [PATCH 06/16] emacs: update lean-mode

my PR removing (require 'cl) has been merged
---
 .emacs.d/init.el                      | 2 --
 .emacs.d/straight/versions/default.el | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 42152ea..13350c7 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1333,8 +1333,6 @@ This function is intended for use with `ivy-ignore-buffers'."
 
 (eval-when-compile (defvar lean-mode-map))
 (use-package lean-mode
-  :straight (:host github :repo "leanprover/lean-mode"
-                   :fork (:repo "notbandali/lean-mode" :branch "remove-cl"))
   :defer 0.4
   :bind (:map lean-mode-map
               ("S-SPC" . company-complete))
diff --git a/.emacs.d/straight/versions/default.el b/.emacs.d/straight/versions/default.el
index eecc83c..35e3114 100644
--- a/.emacs.d/straight/versions/default.el
+++ b/.emacs.d/straight/versions/default.el
@@ -48,7 +48,7 @@
  ("ht.el" . "3c1f3b527da6ad1b219d64957257acb22971cd73")
  ("hydra" . "435c55e9f75a8cf3ae6a4ba0c7725e3dc4e5963f")
  ("key-chord" . "72443e9ff3c4f1c3ccaced3130236801efde3d83")
- ("lean-mode" . "62383ed5c61a0fb91657724cb613afda6c85c9c1")
+ ("lean-mode" . "b5ba739f68ef731c03247bf6db2708502c8ac46c")
  ("let-alist" . "57561d7d9267da48e8b7ab1f3bd45c9d05951289")
  ("log4e" . "c69424e407be0d9d0e54b427d8b18b1ac5a607e2")
  ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c")
-- 
2.20.1


From e003a4093636de8eaad7b7e4144bfbd7230dd021 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sat, 14 Sep 2019 09:44:43 -0400
Subject: [PATCH 07/16] emacs: remove exwm-systemtray--refresh call from my
 theme swithcers

---
 .emacs.d/init.el | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 13350c7..55e63b7 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1559,8 +1559,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   (load-theme 'tangomod t)
   ;; (sml/apply-theme 'automatic)
   (font-lock-remove-keywords
-   'org-mode b/org-mode-font-lock-keywords)
-  (exwm-systemtray--refresh))
+   'org-mode b/org-mode-font-lock-keywords))
 
 (defun b/lights-off ()
   "Go dark."
@@ -1569,8 +1568,7 @@ This function is intended for use with `ivy-ignore-buffers'."
   (load-theme 'doom-one t)
   ;; (sml/apply-theme 'automatic)
   (font-lock-add-keywords
-   'org-mode b/org-mode-font-lock-keywords t)
-  (exwm-systemtray--refresh))
+   'org-mode b/org-mode-font-lock-keywords t))
 
 (bind-keys
  ("C-c t d" . b/lights-off)
-- 
2.20.1


From b29aa20fef0303ebd7b3e5dcaff4a612c7e0cf39 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 20 Sep 2019 12:47:22 -0400
Subject: [PATCH 08/16] emacs: update packages and disable emojify

---
 .emacs.d/init.el                      |  1 +
 .emacs.d/straight/versions/default.el | 32 +++++++++++++--------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 55e63b7..12cafdb 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1885,6 +1885,7 @@ This function is intended for use with `ivy-ignore-buffers'."
 ;; (use-package fill-column-indicator)
 
 (use-package emojify
+  :disabled
   :hook (erc-mode . emojify-mode))
 
 (use-feature window
diff --git a/.emacs.d/straight/versions/default.el b/.emacs.d/straight/versions/default.el
index 35e3114..49d6b30 100644
--- a/.emacs.d/straight/versions/default.el
+++ b/.emacs.d/straight/versions/default.el
@@ -9,8 +9,8 @@
  ("company-ebdb" . "3b463fe1236ac6445657f3a1df20357a7a2fa8f6")
  ("company-mode" . "f6974e3103497afe01da2ad4d2ea3668ad68bc27")
  ("crux" . "308f17d914e2cd79cbc809de66d02b03ceb82859")
- ("dash.el" . "11907f4592ff1813536366d54245d3ecf6b99198")
- ("debbugs" . "88af17f05e0979049ae91656b17c8a3458deb305")
+ ("dash.el" . "a743ae3da1d5869434c6f262bbe45ef30d87cb9c")
+ ("debbugs" . "658730086f90d962ee4eb7895bf7f34f31eb1360")
  ("diff-hl" . "374b1d4b34876219218da7a539e7301259b56958")
  ("ebdb" . "61bb4d89f9413611e3563be90a26baefec6a15b0")
  ("edit-indirect" . "de645d8144e8a08f039a9c88185121ec81d957ef")
@@ -18,10 +18,9 @@
  ("elisp-refs" . "0a254e6a4dc7fa12857f8334fe6eefa72e49d1c9")
  ("emacs-async" . "bd68cc1ab1ac6af890e250bdaa12ffb1cb9649be")
  ("emacs-doom-themes" . "1159463956223ae53df421bcd796e94610759c42")
- ("emacs-emojify" . "782ac307f37239e90c56810323db4263a6469219")
  ("emacs-htmlize" . "8db0aa6aab77475a732b7363f0d57bd3933c18fd")
  ("emacs-which-key" . "42a25055163141165aa0269dbca69735e704825c")
- ("emacsmirror-mirror" . "3e746b1f82568b2a6ebe118ac1f35ed1ce502a37")
+ ("emacsmirror-mirror" . "76dd9b8986d7875ecef92b640715f10292e9fe50")
  ("emacsql" . "a118b6c95af1306f0288a383d274b5dd93efbbda")
  ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
@@ -39,13 +38,12 @@
  ("ghub" . "7d59937d7782d0062216130a4d059b45e8396f82")
  ("gntp.el" . "767571135e2c0985944017dc59b0be79af222ef5")
  ("gnu-elpa-mirror" . "01001b660cd3677228e25a6f544d579b56845c37")
- ("go-mode.el" . "3bc74790c41e071cc3a9da97b95bb01c78cc8784")
+ ("go-mode.el" . "1bbe1d0cb88564e6c5b74ccd78ab87a8b9998374")
  ("guix.el" . "24918011d2f1a78d63f39bf0c462b7dab190629a")
- ("helm" . "c00b5826c1d5797debe92ed235d50b068a348c14")
- ("helm-bibtex" . "7e87161463c9c5ade3ed0e65aa3cde48c51b57de")
+ ("helm" . "cfa42e9f94260887d5a54b3c2356d61903f424bc")
+ ("helm-bibtex" . "5a26b35c3fa223d4c74262137f34bb2f325c4411")
  ("helpful" . "e9e958a5643619d0e32b9934bf4e9195c57cb71f")
- ("hl-todo" . "be57dbc5a4667e4a60b8249b53fa176db1019c8e")
- ("ht.el" . "3c1f3b527da6ad1b219d64957257acb22971cd73")
+ ("hl-todo" . "d7673363ef318a417adc28e36cafb78d01a671af")
  ("hydra" . "435c55e9f75a8cf3ae6a4ba0c7725e3dc4e5963f")
  ("key-chord" . "72443e9ff3c4f1c3ccaced3130236801efde3d83")
  ("lean-mode" . "b5ba739f68ef731c03247bf6db2708502c8ac46c")
@@ -55,22 +53,22 @@
  ("magit" . "5c424142704d481faafce7b834af67c1aca98e68")
  ("magit-popup" . "4250c3a606011e3ff2477e3b5bbde2b493f3c85c")
  ("markdown-mode" . "f3c54e34cc5228001af36a5301883325319f21d4")
- ("melpa" . "44b28cc63352e4398a94338d885371226d1e81aa")
+ ("melpa" . "31f4cbd89473f48ad6b4cc78028e8c51f1ee95a7")
  ("message-x" . "5524de7bbfdd8749c110f48de5afb024d9f83133")
- ("minions" . "62f1d60a0852b4f83f64e6fc4c199eea967a34f7")
+ ("minions" . "ca6a3e77ddbd19cdf363ea71ba357096395a5de5")
  ("moody" . "ac17d739075a571a086756fcaed482814888bf5c")
  ("multiple-cursors.el" . "b9b851a7670f4348f3a08b11ef12ed99676c8b84")
  ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
  ("no-littering" . "e1e79c0211ad924ca220dac3a7a1a2e40710c073")
- ("org" . "6f32e7af88805441c1261e16f729172639d8b3fa")
+ ("org" . "1fd07c1eeb0f29de9ce058fac995031413201d4d")
  ("org-pdftools" . "3ca91085290fc3d0f3886c3a3145deea760055b8")
- ("org-ref" . "9ab74270c1543e4743ca0436de567d8205403b43")
+ ("org-ref" . "0831d2bfe5820d72121fe66e9e298cac04c23b71")
  ("page-break-lines" . "2e1d274e11071bb8daea4d6f4c0369c84466de7a")
  ("parsebib" . "9a5f1730b8ef1fb6c29262a8ba79f8136e5548d4")
  ("pass" . "35e3f86e96878520e690513cdbc1b2753b173e72")
- ("password-store" . "b87e91f984f45615b6459ff3829baa9130b8ef75")
+ ("password-store" . "e74a1c738f7cda65c7a308e30e8d122f853d6f70")
  ("password-store-otp.el" . "04998c8578a060ab4a4e8f46f2ee0aafad4ab4d5")
- ("pdf-tools" . "db7de3901ae0e55f6ab8cf9baec257f706c3d16e")
+ ("pdf-tools" . "c851df842e05f353e4d249f2653f98418b3345d6")
  ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
  ("po-mode" . "1916142f6a817c733d5ec37e3b4fbae3da67e499")
  ("popup-el" . "80829dd46381754639fb764da11c67235fe63282")
@@ -80,7 +78,7 @@
  ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
  ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c")
  ("soap-client" . "0c531f8bf9cd84cd12fbb434ad02344f75deef6f")
- ("straight.el" . "f18e581af9763f9ec6e5686f5505bda6e429579a")
+ ("straight.el" . "11ae699d67114068e86f5e3ceb6646e42503ac6e")
  ("swiper" . "79333e9edfee38ec3b367c33711a68bdf7783259")
  ("switch-buffer-functions-el" . "b8d8e01e21ae8c8c84234dddeb3cc8250814f7ba")
  ("tablist" . "8079801527da1f596bc942162026328d7bdf6ad9")
@@ -89,7 +87,7 @@
  ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294")
  ("unkillable-scratch" . "b24c2a760529833f230c14cb02ff6e7ec92288ab")
  ("use-package" . "1d5ffb2e0d1427066ced58febbba68c1328bf001")
- ("web-mode" . "a723d3ecd3606d1c1948871f46fc8c8d7f879fe4")
+ ("web-mode" . "a31eb8592f09d789c4b08ccecfdaca6fd2f06a69")
  ("with-editor" . "45c29f9bfb7f2df93426ce1571e2f4f41ed4e492")
  ("yasnippet" . "d91dd66f2aed9bbaef32813a68b105ea77e83890")
  ("znc" . "2fd359e556e05006e6976ba9b0f8cb220ea19863"))
-- 
2.20.1


From 958286c5c28aca330e8e7225ba2dd9c1984e2225 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 20 Sep 2019 12:47:55 -0400
Subject: [PATCH 09/16] emacs: moody: tweak mode-line colour

---
 .emacs.d/init.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 12cafdb..759bfce 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1541,7 +1541,7 @@ This function is intended for use with `ivy-ignore-buffers'."
     (set-face-attribute 'mode-line-inactive nil :underline  line)
     (set-face-attribute 'mode-line          nil :box        nil)
     (set-face-attribute 'mode-line-inactive nil :box        nil)
-    (set-face-attribute 'mode-line-inactive nil :background "#eeeeee")) ; d3d7cf
+    (set-face-attribute 'mode-line-inactive nil :background "#e1e1e1")) ; d3d7cf
   (moody-replace-mode-line-buffer-identification)
   (moody-replace-vc-mode))
 
-- 
2.20.1


From e93437ba1293d5ec29f0e6370ccbe5e834b4ab3d Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 20 Sep 2019 12:48:39 -0400
Subject: [PATCH 10/16] update my uwaterloo addresses, simplify
 message-dont-reply-to-names

---
 .config/msmtp/config | 8 +++++++-
 .emacs.d/init.el     | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.config/msmtp/config b/.config/msmtp/config
index 6a4d9e1..422ca83 100644
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -41,11 +41,14 @@ from mab@gnu.org
 account uwaterloo
 host connect.uwaterloo.ca
 tls_starttls on
-from bandali@uwaterloo.ca
+from abandali@uwaterloo.ca
 user abandali
 passwordeval gpg --no-tty -q -d ~/.passwd/uwaterloo.gpg
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
+account uwaterloo-friendly : uwaterloo
+from bandali@uwaterloo.ca
+
 account csclub
 host mail.csclub.uwaterloo.ca
 tls_starttls on
@@ -54,5 +57,8 @@ user abandali
 passwordeval gpg --no-tty -q -d ~/.passwd/csclub.gpg
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
+account csclub-friendly : csclub
+from bandali@csclub.uwaterloo.ca
+
 # Set a default account
 account default : shemshak
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 759bfce..f7fad89 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -2291,7 +2291,7 @@ https://csclub.uwaterloo.ca/~abandali")
           ("nnimap\\+uw:INBOX"
            (gcc "\"nnimap+uw:Sent Items\""))
           ("nnimap\\+csc:.*"
-           (address "abandali@csclub.uwaterloo.ca")
+           (address "bandali@csclub.uwaterloo.ca")
            (signature b/csc-signature)
            (gcc "nnimap+csc:Sent")))))
 
@@ -2369,7 +2369,7 @@ https://csclub.uwaterloo.ca/~abandali")
         message-subscribed-address-functions
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
-        "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(\\(a\\(min\\.\\)?\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")
+        "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")
   (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
-- 
2.20.1


From 95ec8c25beabd6aa290c321854977711898c7853 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 20 Sep 2019 12:49:16 -0400
Subject: [PATCH 11/16] emacs: gnus: default to my @gnu.org address when for
 new messages

---
 .emacs.d/init.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index f7fad89..7c89bcd 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -2052,7 +2052,7 @@ This function is intended for use with `ivy-ignore-buffers'."
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@csc.uw.local")))
-   gnus-message-archive-group "nnimap+shemshak:Sent"
+   gnus-message-archive-group "nnimap+gnu:INBOX"
    gnus-parameters
    '(("l\\.atreus"
       (to-address . "atreus@freelists.org")
@@ -2273,14 +2273,15 @@ Computer Science Club, University of Waterloo
 https://csclub.uwaterloo.ca/~abandali")
   (setq gnus-posting-styles
         '((".*"
+           (address "bandali@gnu.org")
+           (signature b/gnu-signature)
+           (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
+          ("nnimap\\+shemshak:.*"
            (address "amin@shemshak.org")
            (body "\nBest,\n")
            (signature b/signature)
+           (gcc "nnimap+shemshak:Sent")
            (eval (setq b/message-cite-say-hi t)))
-          ("nnimap\\+gnu:.*"
-           (address "bandali@gnu.org")
-           (signature b/gnu-signature)
-           (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "")
-- 
2.20.1


From d41aeafcd705924641f8057ea556995c4e10946e Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 20 Sep 2019 12:50:29 -0400
Subject: [PATCH 12/16] emacs: enable typo-mode in web-mode

---
 .emacs.d/init.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 7c89bcd..1f31d3b 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1737,8 +1737,8 @@ This function is intended for use with `ivy-ignore-buffers'."
   :defer 0.5
   :config
   (typo-global-mode 1)
-  :hook (((text-mode erc-mode) . typo-mode)
-         (tex-mode             . (lambda ()(typo-mode -1)))))
+  :hook (((text-mode erc-mode web-mode) . typo-mode)
+         (tex-mode                      . (lambda ()(typo-mode -1)))))
 
 ;; highlight TODOs in buffers
 (use-package hl-todo
-- 
2.20.1


From bae7970cfc520d0203b03eeacc87d521a1b30651 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 20 Sep 2019 12:50:45 -0400
Subject: [PATCH 13/16] sway: disable mouse warping and use the right ctrl for
 win

---
 .config/sway/config | 2 ++
 .config/sway/darrud | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.config/sway/config b/.config/sway/config
index bea5259..10a0fef 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -77,6 +77,8 @@ mode "$mode_launch" {
     # mouse button for dragging.
     floating_modifier $mod normal
 
+    mouse_warping none
+
     # reload the configuration file
     bindsym $mod+Shift+c reload
 
diff --git a/.config/sway/darrud b/.config/sway/darrud
index 90185c7..e1fc33c 100644
--- a/.config/sway/darrud
+++ b/.config/sway/darrud
@@ -15,5 +15,5 @@ input "1:1:AT_Translated_Set_2_keyboard" {
     repeat_delay 200
     repeat_rate 45
     xkb_layout us,ir
-    xkb_options ctrl:nocaps,altwin:swap_alt_win,ctrl:rctrl_ralt,grp:shifts_toggle
+    xkb_options ctrl:nocaps,ctrl:swap_rwin_rctl,grp:shifts_toggle
 }
-- 
2.20.1


From a5c8d5d67e6d214b64d534db2ade19cbf1533532 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 22 Sep 2019 20:20:13 -0400
Subject: [PATCH 14/16] bash: update prompt

---
 .bashrc | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.bashrc b/.bashrc
index b5c3480..f7cbfc8 100644
--- a/.bashrc
+++ b/.bashrc
@@ -22,20 +22,22 @@ if [ -n "$IS_GUIX_SYSTEM" ]; then
 fi
 
 # from https://unix.stackexchange.com/a/55935
-a_prompt() {
+b_prompt() {
     cwd=$(sed -e "s:$HOME:~:" -e "s:\(\.\?[^/]\)[^/]*/:\1/:g" <<<$PWD)
     printf $cwd
 }
-# Adjust the prompt depending on whether we're in 'guix environment'.
-if [ -n "$GUIX_ENVIRONMENT" ]
-then
-    PS1="\u@\h [env] \$(a_prompt)> "
+
+if [ $(id -u) == "0" ]; then
+    PS1='`printf "\[\e[1;31m\]\$\[\e[00m\]"` '
 else
-    PS1="\u@\h \$(a_prompt)> "
+    PS1='\$ '
 fi
+PS1="`[ -n "$GUIX_ENVIRONMENT" ] && printf \" [env]\"`\n$PS1"
+__u='`[ \`id -u\` == "0" ] && printf "\[\e[1;31m\]\u\[\e[00m\]" || printf "\u"`'
+PS1="$__u@\h:\w/$PS1"
 
 # set terminal title
-PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: $(a_prompt)\007"'
+PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: $(b_prompt)\007"'
 
 # i-beam cursor
 # echo -e "\033[5 q"              # blinking
-- 
2.20.1


From 7d7a2fc968adc6124589e96d3bd8da96babd888f Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 22 Sep 2019 20:21:32 -0400
Subject: [PATCH 15/16] bash: slightly simplify prompt

no need to colourize the \u, colourizing \$ is enough
---
 .bashrc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.bashrc b/.bashrc
index f7cbfc8..6b4d476 100644
--- a/.bashrc
+++ b/.bashrc
@@ -32,9 +32,7 @@ if [ $(id -u) == "0" ]; then
 else
     PS1='\$ '
 fi
-PS1="`[ -n "$GUIX_ENVIRONMENT" ] && printf \" [env]\"`\n$PS1"
-__u='`[ \`id -u\` == "0" ] && printf "\[\e[1;31m\]\u\[\e[00m\]" || printf "\u"`'
-PS1="$__u@\h:\w/$PS1"
+PS1="\u@\h:\w/`[ -n "$GUIX_ENVIRONMENT" ] && printf \" [env]\"`\n$PS1"
 
 # set terminal title
 PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: $(b_prompt)\007"'
-- 
2.20.1


From fc3402997ba7c66fd8aa09fcf0c0b4225c6b7432 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 22 Sep 2019 20:22:19 -0400
Subject: [PATCH 16/16] emacs: update packages

---
 .emacs.d/straight/versions/default.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.emacs.d/straight/versions/default.el b/.emacs.d/straight/versions/default.el
index 49d6b30..650b1dc 100644
--- a/.emacs.d/straight/versions/default.el
+++ b/.emacs.d/straight/versions/default.el
@@ -20,7 +20,7 @@
  ("emacs-doom-themes" . "1159463956223ae53df421bcd796e94610759c42")
  ("emacs-htmlize" . "8db0aa6aab77475a732b7363f0d57bd3933c18fd")
  ("emacs-which-key" . "42a25055163141165aa0269dbca69735e704825c")
- ("emacsmirror-mirror" . "76dd9b8986d7875ecef92b640715f10292e9fe50")
+ ("emacsmirror-mirror" . "1d27c2ef363869a9f34bb4b41503b07fd55ea75f")
  ("emacsql" . "a118b6c95af1306f0288a383d274b5dd93efbbda")
  ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
@@ -40,7 +40,7 @@
  ("gnu-elpa-mirror" . "01001b660cd3677228e25a6f544d579b56845c37")
  ("go-mode.el" . "1bbe1d0cb88564e6c5b74ccd78ab87a8b9998374")
  ("guix.el" . "24918011d2f1a78d63f39bf0c462b7dab190629a")
- ("helm" . "cfa42e9f94260887d5a54b3c2356d61903f424bc")
+ ("helm" . "c56152f1c7da32ea4319afad9fd8058351a99cd7")
  ("helm-bibtex" . "5a26b35c3fa223d4c74262137f34bb2f325c4411")
  ("helpful" . "e9e958a5643619d0e32b9934bf4e9195c57cb71f")
  ("hl-todo" . "d7673363ef318a417adc28e36cafb78d01a671af")
@@ -53,7 +53,7 @@
  ("magit" . "5c424142704d481faafce7b834af67c1aca98e68")
  ("magit-popup" . "4250c3a606011e3ff2477e3b5bbde2b493f3c85c")
  ("markdown-mode" . "f3c54e34cc5228001af36a5301883325319f21d4")
- ("melpa" . "31f4cbd89473f48ad6b4cc78028e8c51f1ee95a7")
+ ("melpa" . "57f9fe7c4735d4106ad2a0f27331c3e3fe8833c0")
  ("message-x" . "5524de7bbfdd8749c110f48de5afb024d9f83133")
  ("minions" . "ca6a3e77ddbd19cdf363ea71ba357096395a5de5")
  ("moody" . "ac17d739075a571a086756fcaed482814888bf5c")
@@ -62,7 +62,7 @@
  ("no-littering" . "e1e79c0211ad924ca220dac3a7a1a2e40710c073")
  ("org" . "1fd07c1eeb0f29de9ce058fac995031413201d4d")
  ("org-pdftools" . "3ca91085290fc3d0f3886c3a3145deea760055b8")
- ("org-ref" . "0831d2bfe5820d72121fe66e9e298cac04c23b71")
+ ("org-ref" . "0fa807ff6bdfce58bd9abec3d86a242dd76228e4")
  ("page-break-lines" . "2e1d274e11071bb8daea4d6f4c0369c84466de7a")
  ("parsebib" . "9a5f1730b8ef1fb6c29262a8ba79f8136e5548d4")
  ("pass" . "35e3f86e96878520e690513cdbc1b2753b173e72")
@@ -77,7 +77,7 @@
  ("seq" . "095fb15a3baa082079799dd36b6caccdb062cb90")
  ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
  ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c")
- ("soap-client" . "0c531f8bf9cd84cd12fbb434ad02344f75deef6f")
+ ("soap-client" . "f379b51dfe8242d3bce68639ad18b4980f6ca8fd")
  ("straight.el" . "11ae699d67114068e86f5e3ceb6646e42503ac6e")
  ("swiper" . "79333e9edfee38ec3b367c33711a68bdf7783259")
  ("switch-buffer-functions-el" . "b8d8e01e21ae8c8c84234dddeb3cc8250814f7ba")
@@ -86,7 +86,7 @@
  ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
  ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294")
  ("unkillable-scratch" . "b24c2a760529833f230c14cb02ff6e7ec92288ab")
- ("use-package" . "1d5ffb2e0d1427066ced58febbba68c1328bf001")
+ ("use-package" . "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0")
  ("web-mode" . "a31eb8592f09d789c4b08ccecfdaca6fd2f06a69")
  ("with-editor" . "45c29f9bfb7f2df93426ce1571e2f4f41ed4e492")
  ("yasnippet" . "d91dd66f2aed9bbaef32813a68b105ea77e83890")
-- 
2.20.1