X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/cb300a22ba7dde1ce2718d3b85121aa985d8f40a..a172cabe992746b2939d65f6ad95120a949a5745:/rc.org

diff --git a/rc.org b/rc.org
index 1a86339..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
 
@@ -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
@@ -1394,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
@@ -1434,8 +1459,17 @@ 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
+account default : amin
 #+end_src
 
 ** ncmpcpp
@@ -2324,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
@@ -2461,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
@@ -2480,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
@@ -2706,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
@@ -3340,12 +3374,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 +3397,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.
@@ -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"