9 files changed, 13 insertions, 24 deletions
diff --git a/dot_config/environment.d/01_PATH.conf b/dot_config/environment.d/01_PATH.conf
index 2d43e7a..df69d32 100644
--- a/dot_config/environment.d/01_PATH.conf
+++ b/dot_config/environment.d/01_PATH.conf
@@ -6,4 +6,4 @@ PATH="${HOME}/.opam/default/bin:${PATH}"
 PATH="${HOME}/.opam/beluga/bin:${PATH}"
 PATH="${HOME}/.cabal/bin:${PATH}"
 PATH="${HOME}/.cargo/bin:${PATH}"
-PATH="${HOME}/bin:${PATH}"
+PATH="${HOME}/.local/bin:${PATH}"
diff --git a/dot_config/isyncrc.tmpl b/dot_config/isyncrc.tmpl
index 0d4db33..39cce29 100644
--- a/dot_config/isyncrc.tmpl
+++ b/dot_config/isyncrc.tmpl
@@ -15,8 +15,8 @@ TLSType IMAPS
 IMAPAccount CMU
 Host imap.gmail.com
 User rkavanag@alumni.cmu.edu
-Pass {{ .password.cmu }}
-AuthMechs PLAIN
+PassCmd "~/bin/mutt_oauth2.py --encryption-pipe=cat --decryption-pipe=cat $XDG_STATE_HOME/xoauth2-tokens/rkavanag.alumni.cmu.edu"
+AuthMechs XOAUTH2
 TLSType IMAPS
 
 IMAPAccount gmail
diff --git a/dot_config/msmtp/config b/dot_config/msmtp/config
index cae5650..ffd7db5 100644
--- a/dot_config/msmtp/config
+++ b/dot_config/msmtp/config
@@ -9,6 +9,6 @@ user             kavanagh.ryan@uqam.ca
 from             kavanagh.ryan@uqam.ca
 tls_certcheck    on
 auth             xoauth2
-passwordeval     /home/rak/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' -t $XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca
+passwordeval     mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' $XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca
 port             587
 tls_trust_file   /etc/ssl/certs/ca-certificates.crt
diff --git a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc
index fd74dfa..3d9924a 100644
--- a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/read.rc
@@ -1,7 +1,8 @@
 # vim: syntax=neomuttrc
 
+set imap_keepalive = 60
 set imap_authenticators = 'xoauth2'
-set imap_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' `pwd`/xoauth2-token"
+set imap_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' \"$XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca\""
 set imap_passive = 'no'
 set imap_user = 'kavanagh.ryan@uqam.ca'
 
diff --git a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc
index ac1f134..db9492c 100644
--- a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc
@@ -5,7 +5,7 @@
 set copy = no
 set from = 'Ryan Kavanagh <kavanagh.ryan@uqam.ca>'
 set smtp_authenticators = 'xoauth2'
-set smtp_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' `pwd`/xoauth2-token"
+set smtp_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' \"$XDG_STATE_HOME/xoauth2-tokens/kavanagh.ryan.uqam.ca\""
 set smtp_url = 'smtp://kavanagh.ryan@uqam.ca@smtp.office365.com:587/'
 
 set signature = "`pwd`/signature"
diff --git a/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl
index 16febff..874fabf 100644
--- a/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl
+++ b/dot_config/neomutt/accounts/rkavanag.alumni.cmu.edu/private_read.rc.tmpl
@@ -1,8 +1,7 @@
 # vim: syntax=muttrc
 
 set imap_keepalive = 60
-{{- if .password.cmu }}
-set imap_pass = '{{ .password.cmu }}'
-{{- end }}
+set imap_authenticators = 'xoauth2'
+set imap_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' \"$XDG_STATE_HOME/xoauth2-tokens/rkavanag.alumni.cmu.edu\""
 set imap_passive = 'no'
 set imap_user = 'rkavanag@alumni.cmu.edu'
diff --git a/dot_config/sh/10_aliases b/dot_config/sh/10_aliases
index 1b8f65d..0bef1a8 100644
--- a/dot_config/sh/10_aliases
+++ b/dot_config/sh/10_aliases
@@ -2,9 +2,9 @@
 
 alias apt-upgrade='sudo apt-get update && sudo apt-get dist-upgrade'
 
-alias 1920s='mplayer -playlist http://kara.fast-serv.com:8398/listen.pls'
-alias dismuke='mplayer -playlist https://early1900s.org/radiodismuke/radiodismuke.pls'
-alias wzum='mplayer http://pubmusic.streamguys1.com/wzum-aac'
+alias 1920s='mpv -playlist http://kara.fast-serv.com:8398/listen.pls'
+alias dismuke='mpv -playlist https://early1900s.org/radiodismuke/radiodismuke.pls'
+alias wzum='mpv http://pubmusic.streamguys1.com/wzum-aac'
 
 alias mplayer-fb='mplayer -vo fbdev'
 alias links2-fb='links2 -driver fb'
diff --git a/dot_config/systemd/user/ssh-agent.service.d/override.conf b/dot_config/systemd/user/ssh-agent.service.d/override.conf
deleted file mode 100644
index a3b6435..0000000
--- a/dot_config/systemd/user/ssh-agent.service.d/override.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenSSH Agent
-Documentation=man:ssh-agent(1)
-Before=basic.target
-ConditionPathExists=/etc/X11/Xsession.options
-Wants=dbus.socket
-After=dbus.socket
-
-[Service]
-ExecStart=
-ExecStart=/home/rak/.local/lib/openssh/agent-launch start
diff --git a/dot_config/systemd/user/swaybg-random.service b/dot_config/systemd/user/swaybg-random.service
index 06d7c29..81df562 100644
--- a/dot_config/systemd/user/swaybg-random.service
+++ b/dot_config/systemd/user/swaybg-random.service
@@ -5,7 +5,7 @@ Description=Randomize Wayland background
 Type=exec
 Restart=always
 RuntimeMaxSec=1h
-ExecStart=/home/rak/bin/swaybg-random
+ExecStart=swaybg-random
 
 [Install]
 WantedBy=wayland-session.target