6 files changed, 17 insertions, 9 deletions
diff --git a/.chezmoiignore b/.chezmoiignore
index 8bf6e39..8772f56 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -17,6 +17,10 @@ crontab
 .xmonad/build
 .xmonad/xmonad-config.cabal
 {{- end }}
+{{- if ne .chezmoi.os "linux" }}
+# only install on linux
+afs
+{{-end }}
 
 # files in home
 .*~
diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl
index b09edb5..b8019df 100644
--- a/dot_Xresources.tmpl
+++ b/dot_Xresources.tmpl
@@ -47,10 +47,12 @@ XIdle.position: se
 XIdle.program: /usr/X11R6/bin/xlock
 XIdle.timeout: 60
 
-XLock.dpmsoff: 240
-XLock.dpmsstandby: 120
-XLock.dpmssuspend: 180
-XLock.lockdelay: 60
+XLock.dpmsoff: 300
+XLock.dpmsstandby: 180
+XLock.dpmssuspend: 240
+! Note that the total delay before autolocking will be XIdle.timeout
+! plus XLock.lockdelay, seeing that xlock is typically started by xidle
+XLock.lockdelay: 120
 XLock.logoutButton: -1
 XLock.mode: random
 XLock.program: /usr/games/fortune -s
diff --git a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/format.rc b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/format.rc.tmpl
index 5780c9a..b0d2ded 100644
--- a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/format.rc
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/format.rc.tmpl
@@ -3,3 +3,7 @@
 set pager_format = '-%Z-UQAM: %C/%m: %-20.20n   %s%*  -- (%P)'
 set compose_format = '-- UQAM: Compose [Approx. msg size: %l Atts: %a]%>-'
 set status_format = '-%r-UQAM: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'
+
+set attribution = "Le %d, %n a écrit:"
+set attribution_locale = "{{ if (eq .chezmoi.os "openbsd") }}fr_CA.UTF-8{{ else }}fr_CA.utf8{{ end }}"
+set date_format = "%a %d %b %Y à %I:%M:%S%p %Z" 
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 2dbc799..ac1f134 100644
--- a/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc
+++ b/dot_config/neomutt/accounts/kavanagh.ryan.uqam.ca/send.rc
@@ -8,10 +8,6 @@ set smtp_authenticators = 'xoauth2'
 set smtp_oauth_refresh_command = "~/bin/mutt_oauth2.py --encryption-pipe='cat' --decryption-pipe='cat' `pwd`/xoauth2-token"
 set smtp_url = 'smtp://kavanagh.ryan@uqam.ca@smtp.office365.com:587/'
 
-set attribution = "Le %d, %n a écrit:"
-set attribution_locale = "fr_CA.utf8"
-set date_format = "%a %d %b %Y à %I:%M:%S%p %Z" 
-
 set signature = "`pwd`/signature"
 
 unset sendmail
diff --git a/dot_config/neomutt/neomuttrc.tmpl b/dot_config/neomutt/neomuttrc.tmpl
index a49f29c..379312c 100644
--- a/dot_config/neomutt/neomuttrc.tmpl
+++ b/dot_config/neomutt/neomuttrc.tmpl
@@ -46,6 +46,7 @@ set mime_forward = ask-yes
 bind index G imap-fetch-mail
 bind index ( next-unread-mailbox
 bind index * next-unread
+unbind index i
 bind pager i exit
 
 # To keep the macro .n from binding just .
diff --git a/executable_dot_xinitrc.tmpl b/executable_dot_xinitrc.tmpl
index cd21129..e37040f 100644
--- a/executable_dot_xinitrc.tmpl
+++ b/executable_dot_xinitrc.tmpl
@@ -35,7 +35,8 @@ case `uname` in
         [ -d /usr/local/share/fonts/spleen ] && xset +fp /usr/local/share/fonts/spleen/
         redshift &
         ${HOME}/bin/icd
-        xmodmap -e 'remove mod4 = Alt_R'
+        # Only needed if you have Kinesis in Windows mode
+        # xmodmap -e 'remove mod4 = Alt_R'
         xidle &
         exec xmonad
 	;;