Merge remote-tracking branch 'gh'

11 files changed, 39 insertions, 13 deletions

diff --git a/.chezmoiignore b/.chezmoiignore
index 7c7bb6b..5a9d604 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -20,6 +20,15 @@ crontab
 afs
 {{- end }}
 
+{{- if not (eq .chezmoi.hostname "asteria") }}
+.config/borgmatic/music.yaml
+.config/borgmatic/pictures.yaml
+.config/borgmatic/tosh.yaml
+.config/systemd/user/timers.target.wants/borgmatic@music.timer
+.config/systemd/user/timers.target.wants/borgmatic@pictures.timer
+.config/systemd/user/timers.target.wants/borgmatic@tosh.timer
+{{- end }}
+
 # files in home
 .*~
 .**/*~
diff --git a/.chezmoiremove b/.chezmoiremove
index a30ed6e..697c5de 100644
--- a/.chezmoiremove
+++ b/.chezmoiremove
@@ -11,6 +11,9 @@ bin/mutt
 .config/systemd/user/default.target.wants/swaybg-random.service
 .config/systemd/user/ssh-agent.service.d/*
 .config/systemd/user/ssh-agent.service.d
+.config/systemd/user/mbsync.service
+.config/systemd/user/mbsync.timer
+.config/systemd/user/timers.target.wants/mbsync.timer
 .config/neomutt/news.rc
 .config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca/*
 .config/neomutt/accounts/ryan.kavanagh.mail.mcgill.ca
diff --git a/dot_config/isyncrc.tmpl b/dot_config/isyncrc.tmpl
index 761ac1a..7a2029d 100644
--- a/dot_config/isyncrc.tmpl
+++ b/dot_config/isyncrc.tmpl
@@ -197,3 +197,17 @@ Group inboxes
 Channel gmail-inbox
 Channel rak-inbox
 Channel uqam-inbox
+
+Group uqam
+Channel uqam-inbox
+Channel uqam-others
+
+Group gmail
+Channel gmail-base
+Channel gmail-others
+
+Group rak
+Channel rak-inbox
+Channel rak-lists
+Channel rak-misc
+Channel rak-archive
diff --git a/dot_config/neomutt/accounts/9rak.queensu.ca/private_read.rc b/dot_config/neomutt/accounts/9rak.queensu.ca/private_read.rc
new file mode 100644
index 0000000..e3633e1
--- /dev/null
+++ b/dot_config/neomutt/accounts/9rak.queensu.ca/private_read.rc
@@ -0,0 +1,8 @@
+# vim: syntax=neomuttrc
+
+set imap_authenticators = 'xoauth2'
+set imap_oauth_refresh_command = "mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' \"$XDG_STATE_HOME/xoauth2-tokens/9rak.queensu.ca\""
+set imap_passive = 'no'
+set imap_user = '9rak@queensu.ca'
+
+unset imap_pass
diff --git a/dot_config/neomutt/accounts/9rak.queensu.ca/private_read.rc.tmpl b/dot_config/neomutt/accounts/9rak.queensu.ca/private_read.rc.tmpl
deleted file mode 100644
index ea26286..0000000
--- a/dot_config/neomutt/accounts/9rak.queensu.ca/private_read.rc.tmpl
+++ /dev/null
@@ -1,8 +0,0 @@
-# vim: syntax=neomuttrc
-
-set imap_authenticators = 'xoauth2'
-set imap_oauth_refresh_command = 'mutt_oauth2.py --client-id="08162f7c-0fd2-4200-a84a-f25a4db0b584" --client-secret="TxRBilcHdC6WGBee]fs?QR:SJ8nI[g82" --encryption-pipe="cat" --decryption-pipe="cat" $XDG_CONFIG_HOME/neomutt/accounts/9rak.queensu.ca/xoauth2-token'
-set imap_passive = 'no'
-set imap_user = '9rak@queensu.ca'
-
-unset imap_pass
diff --git a/dot_config/neomutt/accounts/9rak.queensu.ca/send.rc b/dot_config/neomutt/accounts/9rak.queensu.ca/send.rc
index c0fc662..fff4c4f 100644
--- a/dot_config/neomutt/accounts/9rak.queensu.ca/send.rc
+++ b/dot_config/neomutt/accounts/9rak.queensu.ca/send.rc
@@ -3,7 +3,7 @@
 set copy = yes
 set from = 'Ryan Kavanagh <ryan.kavanagh@queensu.ca>'
 set smtp_authenticators = 'xoauth2'
-set smtp_oauth_refresh_command = 'mutt_oauth2.py --client-id="08162f7c-0fd2-4200-a84a-f25a4db0b584" --client-secret="TxRBilcHdC6WGBee]fs?QR:SJ8nI[g82" --encryption-pipe="cat" --decryption-pipe="cat" $XDG_CONFIG_HOME/neomutt/accounts/9rak.queensu.ca/xoauth2-token'
+set smtp_oauth_refresh_command = "mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' \"$XDG_STATE_HOME/xoauth2-tokens/9rak.queensu.ca\""
 set smtp_url = 'smtp://9rak@queensu.ca@smtp.office365.com:587/'
 
 unset sendmail
diff --git a/dot_config/sway/config.d/40_keyboards b/dot_config/sway/config.d/40_keyboards
index efe2bd8..f8f610a 100644
--- a/dot_config/sway/config.d/40_keyboards
+++ b/dot_config/sway/config.d/40_keyboards
@@ -10,6 +10,7 @@ input "1:1:AT_Translated_Set_2_keyboard" {
 
 # Home Kinesis Advantage Pro
 input "1523:7:HID_05f3:0007" {
+    xkb_model "kinesis"
     xkb_options "nbsp:level3n,lalt_meta:lalt_meta,ralt_super:ralt_super,caps:swapescape,grp:shifts_toggle,lv3:switch"
 }
 
diff --git a/dot_config/systemd/user/borgmatic@.service b/dot_config/systemd/user/borgmatic@.service
index 479d40a..be1cb96 100644
--- a/dot_config/systemd/user/borgmatic@.service
+++ b/dot_config/systemd/user/borgmatic@.service
@@ -7,7 +7,7 @@ After=network-online.target
 ConditionACPower=true
 ConditionFileNotEmpty=/home/rak/.config/borgmatic/%I.yaml
 Documentation=https://torsion.org/borgmatic/
-OnFailure=notify-unit-failure@%i.service
+OnFailure=notify-unit-failure@%n.service
 
 [Service]
 Type=oneshot
diff --git a/dot_config/systemd/user/mbsync.service b/dot_config/systemd/user/mbsync@.service
index da0f146..f8c23b7 100644
--- a/dot_config/systemd/user/mbsync.service
+++ b/dot_config/systemd/user/mbsync@.service
@@ -1,9 +1,10 @@
 [Unit]
 Description=Mailbox synchronization service
+OnFailure=notify-unit-failure@%n.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/mbsync -a
+ExecStart=/usr/bin/mbsync %i
 
 [Install]
 WantedBy=default.target
diff --git a/dot_config/systemd/user/mbsync.timer b/dot_config/systemd/user/mbsync@.timer
index b613c7f..26580a4 100644
--- a/dot_config/systemd/user/mbsync.timer
+++ b/dot_config/systemd/user/mbsync@.timer
@@ -4,7 +4,6 @@ Description=Mailbox synchronization timer
 [Timer]
 OnBootSec=2m
 OnUnitActiveSec=15m
-Unit=mbsync.service
 
 [Install]
 WantedBy=timers.target
diff --git a/dot_config/systemd/user/timers.target.wants/symlink_mbsync.timer b/dot_config/systemd/user/timers.target.wants/symlink_mbsync.timer
deleted file mode 100644
index adba734..0000000
--- a/dot_config/systemd/user/timers.target.wants/symlink_mbsync.timer
+++ /dev/null
@@ -1 +0,0 @@
-/home/rak/.config/systemd/user/mbsync.timer