From 7d6b5e44a9eccde62d55b4e044b7d78a65c72d58 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 30 Jan 2019 12:54:47 -0500
Subject: [PATCH 01/16] [emacs] update packages

---
 straight/versions/default.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/straight/versions/default.el b/straight/versions/default.el
index 7d1184a..f878e45 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -23,7 +23,7 @@
  ("emacsql" . "59147c4cdfd18dc2736a6502a3283564ab5c1457")
  ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
  ("epkg" . "4243b363d038b28650479b23949cb7dfd319542b")
- ("epkgs" . "87d0cb92fdbd77507fee0a7d8581a1c5f8df6786")
+ ("epkgs" . "fc71f8add570b048d8cfb05cc030909ec1145daa")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
  ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519")
  ("exec-path-from-shell" . "76cd6e3fa8a7dac937af7e40507843dfae4f9184")
@@ -46,7 +46,7 @@
  ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499")
  ("let-alist" . "33e71829e8814cf5f28b6e4291192aafef61b69e")
  ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c")
- ("magit" . "5e512721baecd251169bded90b7fe841b1a38feb")
+ ("magit" . "98e328200b3369fc47a462ff290c9740dae2a705")
  ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642")
  ("markdown-mode" . "53db08184b84ac2bb0709d3ef4dfbaf97965e0d9")
  ("melpa" . "2f6a009a0a227d2405defcf085c56312ec78737d")
@@ -71,12 +71,12 @@
  ("smart-mode-line" . "b79f4fa5f2380b0d726a895dd7199e5483004490")
  ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c")
  ("straight.el" . "32f0f5789626e58a8b02d142873de918193eb772")
- ("swiper" . "6017cc8c56c4076d45b607c2c1e9e3a79bf980d5")
+ ("swiper" . "e86cf2ecffa2061586952d78b7a95782f4957453")
  ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
  ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294")
  ("unkillable-scratch" . "d805ee0570c218559cd972788c2d7f77704282b9")
  ("use-package" . "39a8b8812c2c9f6f0b299e6a04e504ef393694ce")
- ("web-mode" . "c3e0a4815859010a688fbcc87c7c40e7efaded5e")
+ ("web-mode" . "ab1990f2a94e47fb2eb6c182f0cb2a0767ed7eb0")
  ("with-editor" . "9dd9f176d96abc60365369de6d08c26c414ef1f3")
  ("yasnippet" . "1d96da2e08664c31ff7f6f7441da1f4fa5680b1f"))
 :saturn
-- 
2.20.1


From 53c67a14f5025b998190de766c6354e2b890319c Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 30 Jan 2019 12:55:20 -0500
Subject: [PATCH 02/16] [rc/mkinitcpio] add configuration

---
 rc.org | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/rc.org b/rc.org
index d145033..06e419c 100644
--- a/rc.org
+++ b/rc.org
@@ -894,6 +894,77 @@ Section "InputClass"
 EndSection
 #+end_src
 
+** mkinitcpio
+
+#+begin_src conf :tangle /sudo::/etc/mkinitcpio.conf :comments none
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES=(piix ide_disk reiserfs)
+MODULES=(i915)
+
+# BINARIES
+# This setting includes any additional binaries a given user may
+# wish into the CPIO image.  This is run last, so it may be used to
+# override the actual binaries included by a given hook
+# BINARIES are dependency parsed, so you may safely ignore libraries
+BINARIES=()
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in any way.  This is useful for config files.
+FILES=()
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+##   This setup specifies all modules in the MODULES setting above.
+##   No raid, lvm2, or encrypted root is needed.
+#    HOOKS=(base)
+#
+##   This setup will autodetect all modules for your system and should
+##   work as a sane default
+#    HOOKS=(base udev autodetect block filesystems)
+#
+##   This setup will generate a 'full' image which supports most systems.
+##   No autodetection is done.
+#    HOOKS=(base udev block filesystems)
+#
+##   This setup assembles a pata mdadm array with an encrypted root FS.
+##   Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
+#    HOOKS=(base udev block mdadm encrypt filesystems)
+#
+##   This setup loads an lvm2 volume group on a usb device.
+#    HOOKS=(base udev block lvm2 filesystems)
+#
+##   NOTE: If you have /usr on a separate partition, you MUST include the
+#    usr, fsck and shutdown hooks.
+HOOKS=(base udev autodetect modconf block keyboard encrypt lvm2 resume filesystems fsck)
+
+# COMPRESSION
+# Use this to compress the initramfs image. By default, gzip compression
+# is used. Use 'cat' to create an uncompressed image.
+#COMPRESSION="gzip"
+#COMPRESSION="bzip2"
+#COMPRESSION="lzma"
+#COMPRESSION="xz"
+#COMPRESSION="lzop"
+#COMPRESSION="lz4"
+
+# COMPRESSION_OPTIONS
+# Additional options for the compressor
+#COMPRESSION_OPTIONS=()
+#+end_src
+
 ** mpd
 :PROPERTIES:
 :header-args+: :tangle ~/.config/mpd/mpd.conf
-- 
2.20.1


From cb300a22ba7dde1ce2718d3b85121aa985d8f40a Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 30 Jan 2019 12:55:46 -0500
Subject: [PATCH 03/16] [rc/pacman] add configuration and mirrorlist

---
 rc.org | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 220 insertions(+)

diff --git a/rc.org b/rc.org
index 06e419c..1a86339 100644
--- a/rc.org
+++ b/rc.org
@@ -2238,6 +2238,226 @@ Unit=notmuch.service
 WantedBy=timers.target
 #+end_src
 
+** pacman
+
+*** conf
+
+#+begin_src conf :tangle /sudo::/etc/pacman.conf :comments none
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+Color
+TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all Arch/Parabola packagers
+# with `pacman-key --populate archlinux` and `pacman-key --populate parabola`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+# NOTE: Nonprism is a particular repository that aims to provide software built
+# and patched without services under global data surveillance programs like PRISM,
+# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism
+
+#[nonprism-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[nonprism]
+#Include = /etc/pacman.d/mirrorlist
+
+#[libre-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[libre]
+Include = /etc/pacman.d/mirrorlist
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# The PCR (Parabola Community Repository) contains packages maintained by trusted
+# members of the Parabola community. It also contains packages maintained by
+# Parabola developers, but that the developer decided didn't belong in core/libre.
+
+#[pcr-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[pcr]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the libre-multilib, multilib and pcr-multilib repositories as required here.
+
+#[nonprism-multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[nonprism-multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+#[libre-multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[libre-multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+#[pcr-multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[pcr-multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+# Parabola also supports another community projects and personal repositories, to
+# find them check out this wiki page: https://wiki.parabola.nu/Repositories
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
+Include = /etc/pacman.d/*.conf
+#+end_src
+
+*** mirrorlist
+
+#+begin_src conf :tangle /sudo::/etc/pacman.d/mirrorlist :comments none
+# Parabola GNU/Linux-libre - Last Updated: Wed Dec 20 02:59:35 GMT 2017
+
+Server = http://mirror.fsf.org/parabola/$repo/os/$arch
+Server = http://mirror.fsf.org/parabola/$repo/os/$arch
+Server = http://mirror.fsf.org/parabola/$repo/os/$arch
+Server = http://mirror.fsf.org/parabola/$repo/os/$arch
+
+# Location: London, UK
+# Responsible: Parabola Project
+# Note: Not really a mirror, automatically redirects you to an Arch
+#       mirror when possible. Works best specifying it a few times in a
+#       row (404s workaround).
+# Server = http://redirector.parabola.nu/$repo/os/$arch
+Server = https://redirector.parabola.nu/$repo/os/$arch
+
+# Location: Reykjavík, Iceland
+# Responsible: Parabola Project
+# Note: Not really a mirror, automatically redirects you to a Parabola
+#       mirror that has the file you are looking for.
+# Server = http://repomirror.parabola.nu/$repo/os/$arch
+Server = https://repomirror.parabola.nu/$repo/os/$arch
+
+# Location: Falkenstein, Germany
+# Server = http://mirror.grapentin.org/parabola/$repo/os/$arch
+Server = https://mirror.grapentin.org/parabola/$repo/os/$arch
+
+# Location: Volendam, Netherlands
+Server = https://jeweet.net/repo/parabola/$repo/os/$arch
+
+# Location: Amsterdam, Netherlands
+# Note: Not really a mirror, but a high-speed 10GiB cache for
+#       mirror.yandex.ru/mirrors/parabola
+# Server = http://parabola.isacdaavid.info:8080/$repo/os/$arch
+Server = https://parabola.isacdaavid.info:8081/$repo/os/$arch
+
+# Location: Moscow, Russian Federation
+# Server = http://mirror.yandex.ru/mirrors/parabola/$repo/os/$arch
+Server = https://mirror.yandex.ru/mirrors/parabola/$repo/os/$arch
+
+# Location: Ho Chi Minh City, Vietnam
+# Server = http://mirror.freedif.org/Parabola/$repo/os/$arch
+Server = https://mirror.freedif.org/Parabola/$repo/os/$arch
+
+# Location: Los Angeles, CA, USA
+# Note: Also visit http://alfplayer.com/ for its SNAPSHOTS ARCHIVE
+Server = http://alfplayer.com/parabola/$repo/os/$arch
+
+# Location: Boston, MA, USA
+Server = http://mirror.fsf.org/parabola/$repo/os/$arch
+
+# Location: Austin, TX, USA
+# Server = http://parabola.serverpit.com/
+Server = https://parabola.serverpit.com/
+
+# Location: Reykjavík, Iceland
+# Responsible: Parabola Project
+# Note: Currently pointing to repomirror.parabola.nu
+# Server = http://repo.parabola.nu/$repo/os/$arch
+Server = https://repo.parabola.nu/$repo/os/$arch
+#+end_src
+
 ** pigeonhole
 *** amin.sieve
 :PROPERTIES:
-- 
2.20.1


From 9a123361ac6229a07617f1da286158d23a5c7cd8 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Thu, 31 Jan 2019 12:15:40 -0500
Subject: [PATCH 04/16] [rc/tlp] work around bluetooth getting enabled after
 hibernate

of course, it should be manually disabled the first time
---
 rc.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rc.org b/rc.org
index 1a86339..1dfdf08 100644
--- a/rc.org
+++ b/rc.org
@@ -3340,12 +3340,11 @@ USB_BLACKLIST_WWAN=1
 # Hint: the parameters DEVICES_TO_DISABLE/ENABLE_ON_STARTUP/SHUTDOWN below
 #   are ignored when this is enabled!
 #RESTORE_DEVICE_STATE_ON_STARTUP=0
-RESTORE_DEVICE_STATE_ON_STARTUP=0
+RESTORE_DEVICE_STATE_ON_STARTUP=1
 
 # Radio devices to disable on startup: bluetooth, wifi, wwan.
 # Separate multiple devices with spaces.
 #DEVICES_TO_DISABLE_ON_STARTUP="bluetooth wifi wwan"
-DEVICES_TO_DISABLE_ON_STARTUP="bluetooth"
 
 # Radio devices to enable on startup: bluetooth, wifi, wwan.
 # Separate multiple devices with spaces.
@@ -3364,6 +3363,7 @@ DEVICES_TO_DISABLE_ON_STARTUP="bluetooth"
 
 # Radio devices to disable on battery: bluetooth, wifi, wwan.
 #DEVICES_TO_DISABLE_ON_BAT="bluetooth wifi wwan"
+DEVICES_TO_DISABLE_ON_BAT="bluetooth"
 
 # Radio devices to disable on battery when not in use (not connected):
 #   bluetooth, wifi, wwan.
-- 
2.20.1


From 56c39a708d95ca617a52c759c7e24ca19fe4834c Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Thu, 31 Jan 2019 12:17:16 -0500
Subject: [PATCH 05/16] [emacs] update org and web-mode

---
 straight/versions/default.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/straight/versions/default.el b/straight/versions/default.el
index f878e45..a391115 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -55,7 +55,7 @@
  ("multiple-cursors.el" . "6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff")
  ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
  ("no-littering" . "5a6f483dca3c8a2dcf3a56ab07ffbea21b2926a1")
- ("org" . "8ba23b9ce18d947a0241017ff33015a7807f615d")
+ ("org" . "683df456a41a2b0e308bdbf746f5db0235a6058a")
  ("orgalist" . "f70a65da3a9bf3d0c1a9c769b77821d2a79c42cb")
  ("ox-hugo" . "e6e58a6e7e5cb624357a7050753edd9a3f0bad48")
  ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa")
@@ -76,7 +76,7 @@
  ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294")
  ("unkillable-scratch" . "d805ee0570c218559cd972788c2d7f77704282b9")
  ("use-package" . "39a8b8812c2c9f6f0b299e6a04e504ef393694ce")
- ("web-mode" . "ab1990f2a94e47fb2eb6c182f0cb2a0767ed7eb0")
+ ("web-mode" . "70fcfb6e127a466ffb8ab6674f62cf40912b8a9d")
  ("with-editor" . "9dd9f176d96abc60365369de6d08c26c414ef1f3")
  ("yasnippet" . "1d96da2e08664c31ff7f6f7441da1f4fa5680b1f"))
 :saturn
-- 
2.20.1


From 2dff0318fc314ce817db04d7e758d2bcfa0db565 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 1 Feb 2019 23:47:22 -0500
Subject: [PATCH 06/16] [emacs] update packages

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

diff --git a/straight/versions/default.el b/straight/versions/default.el
index a391115..904cb5e 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -23,7 +23,7 @@
  ("emacsql" . "59147c4cdfd18dc2736a6502a3283564ab5c1457")
  ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
  ("epkg" . "4243b363d038b28650479b23949cb7dfd319542b")
- ("epkgs" . "fc71f8add570b048d8cfb05cc030909ec1145daa")
+ ("epkgs" . "1f31cb8521c5570044412000e21de69e6932c380")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
  ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519")
  ("exec-path-from-shell" . "76cd6e3fa8a7dac937af7e40507843dfae4f9184")
@@ -46,18 +46,18 @@
  ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499")
  ("let-alist" . "33e71829e8814cf5f28b6e4291192aafef61b69e")
  ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c")
- ("magit" . "98e328200b3369fc47a462ff290c9740dae2a705")
+ ("magit" . "6cd26d9e43fcf83584d703807ca67baaee8f508e")
  ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642")
  ("markdown-mode" . "53db08184b84ac2bb0709d3ef4dfbaf97965e0d9")
- ("melpa" . "2f6a009a0a227d2405defcf085c56312ec78737d")
+ ("melpa" . "cf0ece0efb1fcf0ea7364df0d35fca69862f5e9a")
  ("message-x" . "5524de7bbfdd8749c110f48de5afb024d9f83133")
  ("multi-term" . "f954e4e18b0a035151d34852387e724d87a3316f")
  ("multiple-cursors.el" . "6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff")
  ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
  ("no-littering" . "5a6f483dca3c8a2dcf3a56ab07ffbea21b2926a1")
- ("org" . "683df456a41a2b0e308bdbf746f5db0235a6058a")
+ ("org" . "646d4a5fe977fae6f8c4a08ea0b387b88237d418")
  ("orgalist" . "f70a65da3a9bf3d0c1a9c769b77821d2a79c42cb")
- ("ox-hugo" . "e6e58a6e7e5cb624357a7050753edd9a3f0bad48")
+ ("ox-hugo" . "38254687afb2ff2e030f4205828a50202e52f586")
  ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa")
  ("page-break-lines" . "87e801efb816b24e83ebf84c052001e178e180bc")
  ("pkg-info.el" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
@@ -70,7 +70,7 @@
  ("shut-up" . "081d6b01e3ba0e60326558e545c4019219e046ce")
  ("smart-mode-line" . "b79f4fa5f2380b0d726a895dd7199e5483004490")
  ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c")
- ("straight.el" . "32f0f5789626e58a8b02d142873de918193eb772")
+ ("straight.el" . "aab9d5e2cce618ce39f3d5dd918c713b9510c44f")
  ("swiper" . "e86cf2ecffa2061586952d78b7a95782f4957453")
  ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
  ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294")
-- 
2.20.1


From bb60074bc1784847f77321e96e13b8c0bab6df56 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 6 Feb 2019 23:08:58 -0500
Subject: [PATCH 07/16] [emacs,rc] add csclub mail

---
 init.org         | 15 ++++++++++++---
 rc.org           | 36 +++++++++++++++++++++++++++++++++++-
 var/eshell/alias |  2 +-
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/init.org b/init.org
index 6877be2..ce31d58 100644
--- a/init.org
+++ b/init.org
@@ -2295,7 +2295,13 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
              (nnimap-address "127.0.0.1")
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
-             (nnimap-user "abandali@uwaterloo.ca")))
+             (nnimap-user "abandali@uwaterloo.ca"))
+     (nnimap "csclub"
+             (nnimap-stream plain)
+             (nnimap-address "127.0.0.1")
+             (nnimap-server-port 143)
+             (nnimap-authenticator plain)
+             (nnimap-user "abandali@csclub.uw")))
    gnus-message-archive-group "nnimap+amin:Sent"
    gnus-parameters
    '(("gnu.*"
@@ -2373,7 +2379,10 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
            (eval (setq a/message-cite-say-hi nil)))
           ("nnimap\\+uwaterloo:.*"
            (address "abandali@uwaterloo.ca")
-           (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
+           (gcc "\"nnimap+uwaterloo:Sent Items\""))
+          ("nnimap\\+csclub:.*"
+           (address "abandali@csclub.uwaterloo.ca")
+           (gcc "nnimap+csclub:Sent")))))
 
 (use-feature gnus-topic
   :hook (gnus-group-mode . gnus-topic-mode))
@@ -2426,7 +2435,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
         message-send-mail-function 'message-send-mail-with-sendmail
         message-sendmail-envelope-from 'header
         message-dont-reply-to-names
-        "\\(\\(.*@aminb\\.org\\)\\|\\(amin@bandali\\.me\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)"
+        "\\(\\(.*@aminb\\.org\\)\\|\\(amin@bandali\\.me\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)"
         message-user-fqdn "aminb.org")
   (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
diff --git a/rc.org b/rc.org
index 1dfdf08..f4dcf38 100644
--- a/rc.org
+++ b/rc.org
@@ -822,6 +822,31 @@ Channel uwaterloo
 Master :uwaterloo-remote:
 Slave :uwaterloo-local:
 Patterns *
+
+######
+IMAPAccount csclub
+Host mail.csclub.uwaterloo.ca
+User abandali
+PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/csclub.gpg"
+SSLType IMAPS
+
+IMAPStore csclub-remote
+Account csclub
+
+IMAPAccount csclub-dovecot
+Host 127.0.0.1
+Port 143
+User abandali@csclub.uw
+PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/csclub-dovecot.gpg"
+SSLType None
+
+IMAPStore csclub-local
+Account csclub-dovecot
+
+Channel csclub
+Master :csclub-remote:
+Slave :csclub-local:
+Patterns *
 #+end_src
 
 *** mbsync.service
@@ -1434,6 +1459,15 @@ user abandali
 passwordeval gpg2 --no-tty -q -d ~/.passwd/uwaterloo.gpg
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
+# csclub
+account csclub
+host mail.csclub.uwaterloo.ca
+tls_starttls on
+from abandali@csclub.uwaterloo.ca
+user abandali
+passwordeval gpg2 --no-tty -q -d ~/.passwd/csclub.gpg
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+
 # Set a default account
 account default : aminb
 #+end_src
@@ -4380,7 +4414,7 @@ alias mv="mv -iv"
 alias cp="cp -iv"
 alias scl=systemctl
 alias jcl=journalctl
-alias m="mbsync uwaterloo; mbsync amin"
+alias m="mbsync csclub; mbsync uwaterloo; mbsync amin"
 alias best="youtube-dl -f best"
 alias sd="ssh deb"
 alias sf="ssh fp"
diff --git a/var/eshell/alias b/var/eshell/alias
index 21a533c..e086adf 100644
--- a/var/eshell/alias
+++ b/var/eshell/alias
@@ -14,4 +14,4 @@ alias up eshell-up $1
 alias pk eshell-up-peek $1
 alias vi find-file $1
 alias vim find-file $1
-alias m mbsync uwaterloo; mbsync amin
+alias m mbsync csclub; mbsync uwaterloo; mbsync amin
-- 
2.20.1


From 59bef0ce2978181d7fba2ad74edb0ab23c961b3e Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 6 Feb 2019 23:09:56 -0500
Subject: [PATCH 08/16] [emacs] update packages

---
 straight/versions/default.el | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/straight/versions/default.el b/straight/versions/default.el
index 904cb5e..73be6b6 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -7,7 +7,7 @@
  ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04")
  ("closql" . "012b94f8695e194455111fd54eff0b94dd0dd0db")
  ("company-ebdb" . "3b463fe1236ac6445657f3a1df20357a7a2fa8f6")
- ("company-mode" . "a7c689a9ef5d07ae88beb95f09f1bbe06d2f1f27")
+ ("company-mode" . "edbb3c5354ad7909b4b952c61fd8238fd656b1d0")
  ("crux" . "308f17d914e2cd79cbc809de66d02b03ceb82859")
  ("dante" . "3e98c4351789fc649d2cc1155a8f05da95872f9d")
  ("dash.el" . "26f065fd607cdf1a68e7987b9360accc2d0cbfb6")
@@ -23,39 +23,39 @@
  ("emacsql" . "59147c4cdfd18dc2736a6502a3283564ab5c1457")
  ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
  ("epkg" . "4243b363d038b28650479b23949cb7dfd319542b")
- ("epkgs" . "1f31cb8521c5570044412000e21de69e6932c380")
+ ("epkgs" . "588fcc849eb66ce73475cf4cd6a078063547bb21")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
  ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519")
  ("exec-path-from-shell" . "76cd6e3fa8a7dac937af7e40507843dfae4f9184")
  ("expand-region.el" . "32baef9dab8ee4c7c8bb0a98c3e028b041ffd7b9")
  ("f.el" . "8191672377816a1975414cc1f116fd3b94b30bd0")
- ("flycheck" . "3dc6dffb276d2fabc7610dc6674f5f12fab601b8")
+ ("flycheck" . "87434852dbd9e03c3cf59401b61d75f03f8e03bc")
  ("flycheck-haskell" . "32ddff87165a7d3a35e7318bee997b5b4bd41278")
- ("forge" . "f5886b4b03689eb5929edef094a403d68b4d09d3")
- ("geiser" . "a6a2f2c2194cdef97d67945aa1e7df81763ec34e")
+ ("forge" . "7f7c5e8021e58174eeec3c96d7c4e05c801811b0")
+ ("geiser" . "4050ee010f1117051936f274d6dff6ca0a4dc5db")
  ("ghub" . "3566dc6e18d61455060a96deb70779c91f079c62")
  ("git.el" . "a3396a7027a7d986598c6a2d6d5599bac918f3da")
- ("gnu-elpa-mirror" . "c79c038b132f9e07cccf62d2bbe1fcf1a46503ad")
+ ("gnu-elpa-mirror" . "781f3b5025a4d4eeba57e54fee3eb7f995124297")
  ("graphql.el" . "e2b309689f4faf9225f290080f836e988c5a576d")
  ("guix.el" . "f764641396fb2e8ca1fb319f782b0e07c0a3fd0c")
  ("haskell-mode" . "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b")
- ("helpful" . "cf24f963bd77f679f09057c55c6a4683b3f3a5cb")
+ ("helpful" . "b80701b193bddfffdacd2ab065749cc63d0e45d0")
  ("hl-todo" . "ec44a210a176b879f98c80bf688b0196cb282e7f")
  ("hlint-refactor-mode" . "c4307f86aad6d02e32e9b30cb6edc115584c791c")
  ("lcr" . "c14f40692292d59156c7632dbdd2867c086aa75f")
  ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499")
  ("let-alist" . "33e71829e8814cf5f28b6e4291192aafef61b69e")
  ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c")
- ("magit" . "6cd26d9e43fcf83584d703807ca67baaee8f508e")
+ ("magit" . "78114e6425d5e7d6eaa7712c845f28694aa7faeb")
  ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642")
  ("markdown-mode" . "53db08184b84ac2bb0709d3ef4dfbaf97965e0d9")
- ("melpa" . "cf0ece0efb1fcf0ea7364df0d35fca69862f5e9a")
+ ("melpa" . "06648d1d37767cbdc7588d7a8f709d679d478a3b")
  ("message-x" . "5524de7bbfdd8749c110f48de5afb024d9f83133")
  ("multi-term" . "f954e4e18b0a035151d34852387e724d87a3316f")
  ("multiple-cursors.el" . "6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff")
  ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
  ("no-littering" . "5a6f483dca3c8a2dcf3a56ab07ffbea21b2926a1")
- ("org" . "646d4a5fe977fae6f8c4a08ea0b387b88237d418")
+ ("org" . "18b85aa3feaea5a8a9f630dead73db69c941b717")
  ("orgalist" . "f70a65da3a9bf3d0c1a9c769b77821d2a79c42cb")
  ("ox-hugo" . "38254687afb2ff2e030f4205828a50202e52f586")
  ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa")
@@ -71,7 +71,7 @@
  ("smart-mode-line" . "b79f4fa5f2380b0d726a895dd7199e5483004490")
  ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c")
  ("straight.el" . "aab9d5e2cce618ce39f3d5dd918c713b9510c44f")
- ("swiper" . "e86cf2ecffa2061586952d78b7a95782f4957453")
+ ("swiper" . "3216d4060b9614428c1fcf87f324ca83c97d6d24")
  ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
  ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294")
  ("unkillable-scratch" . "d805ee0570c218559cd972788c2d7f77704282b9")
-- 
2.20.1


From 8d294f80caecd05d475d8381ecddd942a8f6c83f Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Tue, 12 Feb 2019 15:02:51 -0500
Subject: [PATCH 09/16] [emacs] update packages

---
 straight/versions/default.el | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/straight/versions/default.el b/straight/versions/default.el
index 73be6b6..3f3ea9d 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -1,4 +1,4 @@
-(("PG" . "737152152f8ebfb752fac0fbcdddc96ad7b18b8a")
+(("PG" . "8f90ac961c22099a615c03ed07576aaef820e06d")
  ("all-the-icons.el" . "52d1f2d36468146c93aaf11399f581401a233306")
  ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f")
  ("auto-compile" . "e6bbb1371324c8884af3b201e9adbc9296eb2ff4")
@@ -23,19 +23,19 @@
  ("emacsql" . "59147c4cdfd18dc2736a6502a3283564ab5c1457")
  ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
  ("epkg" . "4243b363d038b28650479b23949cb7dfd319542b")
- ("epkgs" . "588fcc849eb66ce73475cf4cd6a078063547bb21")
+ ("epkgs" . "2260de0e7bcb0a1336e8ab9c81d91ff77e597c55")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
  ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519")
  ("exec-path-from-shell" . "76cd6e3fa8a7dac937af7e40507843dfae4f9184")
  ("expand-region.el" . "32baef9dab8ee4c7c8bb0a98c3e028b041ffd7b9")
  ("f.el" . "8191672377816a1975414cc1f116fd3b94b30bd0")
- ("flycheck" . "87434852dbd9e03c3cf59401b61d75f03f8e03bc")
+ ("flycheck" . "7a4a76e52c1031a4b83fd0d6f8ff4c202498ef19")
  ("flycheck-haskell" . "32ddff87165a7d3a35e7318bee997b5b4bd41278")
  ("forge" . "7f7c5e8021e58174eeec3c96d7c4e05c801811b0")
- ("geiser" . "4050ee010f1117051936f274d6dff6ca0a4dc5db")
+ ("geiser" . "3db5f68b61163bb2646494e40b0a57c2c6f7c3b6")
  ("ghub" . "3566dc6e18d61455060a96deb70779c91f079c62")
  ("git.el" . "a3396a7027a7d986598c6a2d6d5599bac918f3da")
- ("gnu-elpa-mirror" . "781f3b5025a4d4eeba57e54fee3eb7f995124297")
+ ("gnu-elpa-mirror" . "fb95b324ae80ffdcbfe3df8364b41f5c3c8fbd80")
  ("graphql.el" . "e2b309689f4faf9225f290080f836e988c5a576d")
  ("guix.el" . "f764641396fb2e8ca1fb319f782b0e07c0a3fd0c")
  ("haskell-mode" . "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b")
@@ -49,15 +49,15 @@
  ("magit" . "78114e6425d5e7d6eaa7712c845f28694aa7faeb")
  ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642")
  ("markdown-mode" . "53db08184b84ac2bb0709d3ef4dfbaf97965e0d9")
- ("melpa" . "06648d1d37767cbdc7588d7a8f709d679d478a3b")
+ ("melpa" . "75d501ae9b64d9aa083f43358881a467a7cd2a04")
  ("message-x" . "5524de7bbfdd8749c110f48de5afb024d9f83133")
  ("multi-term" . "f954e4e18b0a035151d34852387e724d87a3316f")
  ("multiple-cursors.el" . "6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff")
  ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
  ("no-littering" . "5a6f483dca3c8a2dcf3a56ab07ffbea21b2926a1")
- ("org" . "18b85aa3feaea5a8a9f630dead73db69c941b717")
+ ("org" . "232160cf7ae47b7f4b96cc9c0087f3f13c561134")
  ("orgalist" . "f70a65da3a9bf3d0c1a9c769b77821d2a79c42cb")
- ("ox-hugo" . "38254687afb2ff2e030f4205828a50202e52f586")
+ ("ox-hugo" . "9faa9fc6d80422b59be828cb911d7ff9c0178b77")
  ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa")
  ("page-break-lines" . "87e801efb816b24e83ebf84c052001e178e180bc")
  ("pkg-info.el" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
@@ -70,8 +70,8 @@
  ("shut-up" . "081d6b01e3ba0e60326558e545c4019219e046ce")
  ("smart-mode-line" . "b79f4fa5f2380b0d726a895dd7199e5483004490")
  ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c")
- ("straight.el" . "aab9d5e2cce618ce39f3d5dd918c713b9510c44f")
- ("swiper" . "3216d4060b9614428c1fcf87f324ca83c97d6d24")
+ ("straight.el" . "e17e54790ca6f29afb17d89f48569f03074ff682")
+ ("swiper" . "dfeaec0d5410a57ee5b55af5d9e1a25067bf28c3")
  ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
  ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294")
  ("unkillable-scratch" . "d805ee0570c218559cd972788c2d7f77704282b9")
-- 
2.20.1


From a4dd1359f1832bea7f9cf96aa35e904211986f24 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Tue, 12 Feb 2019 15:03:00 -0500
Subject: [PATCH 10/16] [rc/pacman] enable libre-testing for now

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

diff --git a/rc.org b/rc.org
index f4dcf38..4bd1da7 100644
--- a/rc.org
+++ b/rc.org
@@ -2358,8 +2358,8 @@ LocalFileSigLevel = Optional
 #[nonprism]
 #Include = /etc/pacman.d/mirrorlist
 
-#[libre-testing]
-#Include = /etc/pacman.d/mirrorlist
+[libre-testing]
+Include = /etc/pacman.d/mirrorlist
 
 [libre]
 Include = /etc/pacman.d/mirrorlist
-- 
2.20.1


From e0a9b53cf2ccc591c37f5547e5afa1189b41661e Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Tue, 12 Feb 2019 15:03:17 -0500
Subject: [PATCH 11/16] [rc/rofi-pass] change default_user2

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

diff --git a/rc.org b/rc.org
index 4bd1da7..89af541 100644
--- a/rc.org
+++ b/rc.org
@@ -2740,7 +2740,7 @@ clip=primary
 # Options for generating new password entries
 # default_user is also used for password files that have no user field.
 default_user=aminb
-default_user2=aminban
+default_user2=bandali
 password_length=30
 
 # Custom Keybindings
-- 
2.20.1


From 7e304b81e26461ef47cbbaa0bd95d99c60c5007a Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 22 Feb 2019 13:35:47 -0500
Subject: [PATCH 12/16] [emacs] update packages

---
 straight/versions/default.el | 40 +++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/straight/versions/default.el b/straight/versions/default.el
index 3f3ea9d..625216c 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -1,5 +1,5 @@
 (("PG" . "8f90ac961c22099a615c03ed07576aaef820e06d")
- ("all-the-icons.el" . "52d1f2d36468146c93aaf11399f581401a233306")
+ ("all-the-icons.el" . "a33c864d4bd37c086beff5bb8bc27ce4ea7f5dac")
  ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f")
  ("auto-compile" . "e6bbb1371324c8884af3b201e9adbc9296eb2ff4")
  ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5")
@@ -7,55 +7,56 @@
  ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04")
  ("closql" . "012b94f8695e194455111fd54eff0b94dd0dd0db")
  ("company-ebdb" . "3b463fe1236ac6445657f3a1df20357a7a2fa8f6")
- ("company-mode" . "edbb3c5354ad7909b4b952c61fd8238fd656b1d0")
+ ("company-mode" . "20fe01542bf7665ba90f9fe1a86cbe0eea4d9f8a")
  ("crux" . "308f17d914e2cd79cbc809de66d02b03ceb82859")
- ("dante" . "3e98c4351789fc649d2cc1155a8f05da95872f9d")
- ("dash.el" . "26f065fd607cdf1a68e7987b9360accc2d0cbfb6")
- ("diff-hl" . "76289d24c61fac501d955a8419b5fdf7debddd5f")
+ ("dante" . "8e2c3f5d6ff35e20d4f1b478ae06883526c72476")
+ ("dash.el" . "f1ffdf7beb8b4fc6aa156873162c98f84b9465bd")
+ ("diff-hl" . "d3f90cc45fb8faef0c77f6eff42f87ad5be63864")
  ("ebdb" . "6176da533b6923c005d5464ac2ea874771232c85")
  ("edit-indirect" . "de645d8144e8a08f039a9c88185121ec81d957ef")
  ("elisp-refs" . "a8900dab9f8e2925ce5dea0f97bdac4ce47714d9")
  ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029")
- ("emacs-doom-themes" . "d2ad6dec29cf8c30b39b163b62b52853bdb290a0")
+ ("emacs-doom-themes" . "c695f6aa2d88ede611d5b3faeaa261f5fc042ff1")
  ("emacs-eclim" . "23f5b294f833ce58516d7b9ae08a7792d70022a1")
  ("emacs-memoize" . "9a561268ffb550b257a08710489a95cd087998b6")
  ("emacs-which-key" . "43e3e3d7641a8e1c298b37e6a277612bf0898708")
  ("emacsql" . "59147c4cdfd18dc2736a6502a3283564ab5c1457")
  ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70")
  ("epkg" . "4243b363d038b28650479b23949cb7dfd319542b")
- ("epkgs" . "2260de0e7bcb0a1336e8ab9c81d91ff77e597c55")
+ ("epkgs" . "73bc7106c628aef82ad0ff806bebb18d1c33ec78")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
  ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519")
  ("exec-path-from-shell" . "76cd6e3fa8a7dac937af7e40507843dfae4f9184")
  ("expand-region.el" . "32baef9dab8ee4c7c8bb0a98c3e028b041ffd7b9")
  ("f.el" . "8191672377816a1975414cc1f116fd3b94b30bd0")
- ("flycheck" . "7a4a76e52c1031a4b83fd0d6f8ff4c202498ef19")
+ ("flycheck" . "407bcd22e41092470ce87816875ef6f597dffc8e")
  ("flycheck-haskell" . "32ddff87165a7d3a35e7318bee997b5b4bd41278")
- ("forge" . "7f7c5e8021e58174eeec3c96d7c4e05c801811b0")
+ ("forge" . "16de14ad32403e6aa54d5531118b9eb3b7c82d76")
  ("geiser" . "3db5f68b61163bb2646494e40b0a57c2c6f7c3b6")
  ("ghub" . "3566dc6e18d61455060a96deb70779c91f079c62")
  ("git.el" . "a3396a7027a7d986598c6a2d6d5599bac918f3da")
- ("gnu-elpa-mirror" . "fb95b324ae80ffdcbfe3df8364b41f5c3c8fbd80")
+ ("gnu-elpa-mirror" . "d9b4623e3eb0664a3bd000ec114ba814e7179f3f")
  ("graphql.el" . "e2b309689f4faf9225f290080f836e988c5a576d")
  ("guix.el" . "f764641396fb2e8ca1fb319f782b0e07c0a3fd0c")
  ("haskell-mode" . "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b")
- ("helpful" . "b80701b193bddfffdacd2ab065749cc63d0e45d0")
- ("hl-todo" . "ec44a210a176b879f98c80bf688b0196cb282e7f")
+ ("helpful" . "4cf4381aca731db2f9473cc39c64413ddedcde63")
+ ("hl-todo" . "243dfd9c7a8ff6bab5cde9a230d0af9c4ea064f6")
  ("hlint-refactor-mode" . "c4307f86aad6d02e32e9b30cb6edc115584c791c")
+ ("hydra" . "9c4a4711bc78364e114acbbcf484a60669d02d78")
  ("lcr" . "c14f40692292d59156c7632dbdd2867c086aa75f")
  ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499")
  ("let-alist" . "33e71829e8814cf5f28b6e4291192aafef61b69e")
  ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c")
- ("magit" . "78114e6425d5e7d6eaa7712c845f28694aa7faeb")
+ ("magit" . "65c7f2d9380859d16edefb357ee9f60e77bf51f3")
  ("magit-popup" . "8eaa0becc2370484a432a8a19f40ce5e8d0f1642")
  ("markdown-mode" . "53db08184b84ac2bb0709d3ef4dfbaf97965e0d9")
- ("melpa" . "75d501ae9b64d9aa083f43358881a467a7cd2a04")
+ ("melpa" . "fded63df1b90e5ae3a1aa4e0a8fbfe5eb6a62756")
  ("message-x" . "5524de7bbfdd8749c110f48de5afb024d9f83133")
  ("multi-term" . "f954e4e18b0a035151d34852387e724d87a3316f")
  ("multiple-cursors.el" . "6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff")
  ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
  ("no-littering" . "5a6f483dca3c8a2dcf3a56ab07ffbea21b2926a1")
- ("org" . "232160cf7ae47b7f4b96cc9c0087f3f13c561134")
+ ("org" . "9eddf47059370a02f22900d5560f7acbbd83bf99")
  ("orgalist" . "f70a65da3a9bf3d0c1a9c769b77821d2a79c42cb")
  ("ox-hugo" . "9faa9fc6d80422b59be828cb911d7ff9c0178b77")
  ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa")
@@ -70,13 +71,14 @@
  ("shut-up" . "081d6b01e3ba0e60326558e545c4019219e046ce")
  ("smart-mode-line" . "b79f4fa5f2380b0d726a895dd7199e5483004490")
  ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c")
- ("straight.el" . "e17e54790ca6f29afb17d89f48569f03074ff682")
- ("swiper" . "dfeaec0d5410a57ee5b55af5d9e1a25067bf28c3")
+ ("straight.el" . "26a240e7aea524f3de212be9e56e29029ead8994")
+ ("swiper" . "2a02343cdf218441158e83323ce507a6d9112445")
+ ("transient" . "0758efa1dbdac38581b33aff66bbe53021a0fdb1")
  ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d")
  ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294")
  ("unkillable-scratch" . "d805ee0570c218559cd972788c2d7f77704282b9")
- ("use-package" . "39a8b8812c2c9f6f0b299e6a04e504ef393694ce")
- ("web-mode" . "70fcfb6e127a466ffb8ab6674f62cf40912b8a9d")
+ ("use-package" . "12731665e068a68883bdb280e9844dbfd14e5626")
+ ("web-mode" . "8c412fed3bc7e7df6299c18597e8cb841123c106")
  ("with-editor" . "9dd9f176d96abc60365369de6d08c26c414ef1f3")
  ("yasnippet" . "1d96da2e08664c31ff7f6f7441da1f4fa5680b1f"))
 :saturn
-- 
2.20.1


From b507a0ef4580b5f255f771f6a9bd4931b5dce594 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 22 Feb 2019 13:37:37 -0500
Subject: [PATCH 13/16] [emacs,rc] update personal email address

---
 init.org | 11 +++++------
 rc.org   | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/init.org b/init.org
index ce31d58..503e0fd 100644
--- a/init.org
+++ b/init.org
@@ -1,4 +1,4 @@
-#+title: =aminb='s Literate Emacs Configuration
+#+title: Literate Emacs Configuration of Amin Bandali
 #+author: Amin Bandali
 #+babel: :cache yes
 #+property: header-args :tangle yes
@@ -214,7 +214,7 @@ but for now I've decided to keep them enabled. See documentation for
 
 #+begin_src emacs-lisp
 (setq user-full-name "Amin Bandali"
-      user-mail-address "amin@aminb.org")
+      user-mail-address "amin@bndl.org")
 #+end_src
 
 ** Package management
@@ -2289,7 +2289,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
             (nnimap-address "127.0.0.1")
             (nnimap-server-port 143)
             (nnimap-authenticator plain)
-            (nnimap-user "amin@aminb.org"))
+            (nnimap-user "amin@bndl.org"))
      (nnimap "uwaterloo"
              (nnimap-stream plain)
              (nnimap-address "127.0.0.1")
@@ -2368,7 +2368,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
   :config
   (setq gnus-posting-styles
         '((".*"
-           (address "amin@aminb.org")
+           (address "amin@bndl.org")
            (body "\nBest,\namin\n")
            (eval (setq a/message-cite-say-hi t)))
           ("gnu.*"
@@ -2435,8 +2435,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
         message-send-mail-function 'message-send-mail-with-sendmail
         message-sendmail-envelope-from 'header
         message-dont-reply-to-names
-        "\\(\\(.*@aminb\\.org\\)\\|\\(amin@bandali\\.me\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)"
-        message-user-fqdn "aminb.org")
+        "\\(\\(amin@bndl\\.org\\)\\|\\(.*@\\(aminb\\|amin\\.bndl\\)\\.org\\)\\|\\(\\(bandali\\|aminb?\\|mab\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")
   (require 'company-ebdb)
   :hook (;; (message-setup . mml-secure-message-sign-pgpmime)
          (message-mode . flyspell-mode)
diff --git a/rc.org b/rc.org
index 89af541..f1af18c 100644
--- a/rc.org
+++ b/rc.org
@@ -775,8 +775,8 @@ Expunge Both
 
 ######
 IMAPAccount amin
-Host mail.aminb.org
-User amin@aminb.org
+Host mail.bndl.org
+User amin@bndl.org
 PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/amin.gpg"
 SSLType IMAPS
 
@@ -786,7 +786,7 @@ Account amin
 IMAPAccount amin-dovecot
 Host 127.0.0.1
 Port 143
-User amin@aminb.org
+User amin@bndl.org
 PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/amin-dovecot.gpg"
 SSLType None
 
@@ -1419,18 +1419,18 @@ auth on
 #tls_trust_file /etc/ssl/certs/ca-certificates.crt
 logfile ~/.msmtp.log
 
-# aminb
-account aminb
-host mail.aminb.org
-# use `msmtp -a aminb --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint
-tls_fingerprint DE:5F:73:0C:F7:9A:7B:1D:55:AA:49:28:E7:28:49:24:A4:08:55:00:7A:7E:D8:7F:30:06:26:24:11:29:61:07
+# amin
+account amin
+host mail.bndl.org
+# use `msmtp -a amin --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint
+tls_fingerprint B8:17:DF:D7:26:56:4F:CD:F0:51:D5:E5:4C:44:B6:F1:C9:47:E7:A2:C7:36:C9:C1:F2:10:85:18:43:72:9D:ED
 tls_starttls on
-from amin@aminb.org
-user amin@aminb.org
+from amin@bndl.org
+user amin@bndl.org
 passwordeval gpg2 --no-tty -q -d ~/.passwd/amin.gpg
 
-account bandali-me : aminb
-from amin@bandali.me
+account aminb : amin
+from amin@aminb.org
 
 # gnu
 account gnu
@@ -1469,7 +1469,7 @@ passwordeval gpg2 --no-tty -q -d ~/.passwd/csclub.gpg
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
 # Set a default account
-account default : aminb
+account default : amin
 #+end_src
 
 ** ncmpcpp
@@ -2495,7 +2495,7 @@ Server = https://repo.parabola.nu/$repo/os/$arch
 ** pigeonhole
 *** amin.sieve
 :PROPERTIES:
-:header-args+: :tangle ~/mail/aminb.org/amin/sieve/amin.sieve :comments none
+:header-args+: :tangle ~/mail/bndl.org/amin/sieve/amin.sieve :comments none
 :END:
 
 #+begin_src conf
@@ -2514,7 +2514,7 @@ include :personal "lists";
 
 *** lists.sieve
 :PROPERTIES:
-:header-args+: :tangle ~/mail/aminb.org/amin/sieve/lists.sieve :comments none
+:header-args+: :tangle ~/mail/bndl.org/amin/sieve/lists.sieve :comments none
 :END:
 
 #+begin_src conf
-- 
2.20.1


From dadb049ec4908bba38694e0a268a9899e69fda50 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 22 Feb 2019 13:39:01 -0500
Subject: [PATCH 14/16] [emacs/{gnus,message}] set custom fqdn for outgoing gnu
 messages

in order to customize generated Message-ID
---
 init.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/init.org b/init.org
index 503e0fd..97ad67d 100644
--- a/init.org
+++ b/init.org
@@ -2372,7 +2372,8 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
            (body "\nBest,\namin\n")
            (eval (setq a/message-cite-say-hi t)))
           ("gnu.*"
-           (address "bandali@gnu.org"))
+           (address "bandali@gnu.org")
+           (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
           ((header "subject" "ThankCRM")
            (to "webmasters-comment@gnu.org")
            (body "\nAdded  to 2019supporters.html.\n\nMoving to campaigns.\n\n-amin\n")
-- 
2.20.1


From 4c52b20e3ea95119afb6dd12787d899926917054 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 22 Feb 2019 13:40:40 -0500
Subject: [PATCH 15/16] [emacs/gnus] make topic line format more consistent
 with group lines

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

diff --git a/init.org b/init.org
index 97ad67d..d603f43 100644
--- a/init.org
+++ b/init.org
@@ -2386,7 +2386,8 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
            (gcc "nnimap+csclub:Sent")))))
 
 (use-feature gnus-topic
-  :hook (gnus-group-mode . gnus-topic-mode))
+  :hook (gnus-group-mode . gnus-topic-mode)
+  :config (setq gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n"))
 
 (use-feature gnus-agent
   :config
-- 
2.20.1


From d831ea762b79c47ddfc632a31f71503c15f48333 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 22 Feb 2019 13:42:05 -0500
Subject: [PATCH 16/16] [emacs] unbind C-z in graphical mode

froze my emacs by accident too many damn times
---
 init.org | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/init.org b/init.org
index d603f43..6f9789f 100644
--- a/init.org
+++ b/init.org
@@ -805,6 +805,9 @@ Some bindings for functions from built-in GNU Emacs packages:
 
  ("s-p"     . beginning-of-buffer)
  ("s-n"     . end-of-buffer))
+
+(when (display-graphic-p)
+  (unbind-key "C-z" global-map))
 #+end_src
 
 While at it, let's bind a few for some =straight-*= functions too:
-- 
2.20.1