Merge branch 'master' of urbainvaes.com:git/dotfiles

12 files changed, 37 insertions, 133 deletions

diff --git a/.mbsyncrc b/.mbsyncrc
index 9945cdc..08a006e 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -1,91 +1,34 @@
 Create Both
 Expunge Both
 SyncState *
-
-IMAPAccount Main
-Host imap.gmail.com
-User urbain.p.vaes@gmail.com
-PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/gmail/urbain.p.vaes@gmail.com.gpg"
-SSLType IMAPS
-CertificateFile /etc/ssl/certs/ca-certificates.crt
-
-IMAPAccount Informal
-Host imap.gmail.com
-User urbainvaes90@gmail.com
-PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/gmail/urbainvaes90@gmail.com.gpg"
-SSLType IMAPS
-CertificateFile /etc/ssl/certs/ca-certificates.crt
+Sync All
 
 IMAPAccount Work
 Host outlook.office365.com
 User uv113@ic.ac.uk
-PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/imperial/u.vaes13@imperial.ac.uk.gpg"
+PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/email/u.vaes13@imperial.ac.uk.gpg"
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPAccount Personal
-Host imap.openmailbox.org
-User urbain.p.vaes@openmailbox.org
-PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/openmailbox/urbain.p.vaes@openmailbox.org.gpg"
+Host box.bknguyen.org
+User mail@urbainvaes.com
+PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/email/mail@urbainvaes.com.gpg"
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
-IMAPStore Main-remote
-Account Main
-
-IMAPStore Informal-remote
-Account Informal
-
 IMAPStore Work-remote
 Account Work
 
 IMAPStore Personal-remote
 Account Personal
 
-MaildirStore Main-local
-Path ~/.mail/Main/
-
-MaildirStore Informal-local
-Path ~/.mail/Informal/
-
 MaildirStore Work-local
 Path ~/.mail/Work/
 
 MaildirStore Personal-local
 Path ~/.mail/Personal/
 
-Channel Main-inbox
-Master :Main-remote:"INBOX"
-Slave  :Main-local:"Main"
-
-Channel Main-draft
-Master :Main-remote:"[Gmail]/Drafts"
-Slave  :Main-local:"Main.drafts"
-
-Channel Main-sent
-Master :Main-remote:"[Gmail]/Sent Mail"
-Slave  :Main-local:"Main.sent"
-
-Channel Main-bin
-Master :Main-remote:"[Gmail]/Bin"
-Slave  :Main-local:"Main.bin"
-
-Channel Informal-inbox
-Master :Informal-remote:"INBOX"
-Slave  :Informal-local:"Informal"
-
-Channel Informal-draft
-Master :Informal-remote:"[Gmail]/Drafts"
-Slave  :Informal-local:"Informal.drafts"
-
-Channel Informal-sent
-Master :Informal-remote:"[Gmail]/Sent Mail"
-Slave  :Informal-local:"Informal.sent"
-
-Channel Informal-bin
-Master :Informal-remote:"[Gmail]/Bin"
-Slave  :Informal-local:"Informal.bin"
-
 Channel Work-inbox
 Master :Work-remote:"INBOX"
 Slave  :Work-local:"Work"
diff --git a/.mr/mrconfig b/.mr/mrconfig
index a16892b..e4064d4 100644
--- a/.mr/mrconfig
+++ b/.mr/mrconfig
@@ -1,5 +1,5 @@
 [/home/urbain/dotfiles]
-checkout = git clone 'git@github.com:uvaes/dotfiles' 'dotfiles'
+checkout = git clone 'urbain@urbainvaes.com:git/dotfiles.git' 'dotfiles'
 
 [/home/urbain/dotfiles/.personal]
 checkout = git clone 'urbain@urbainvaes.com:git/perso/personal.git' '.personal'
diff --git a/.msmtprc b/.msmtprc
index 565459b..f056ee7 100644
--- a/.msmtprc
+++ b/.msmtprc
@@ -4,32 +4,18 @@ tls            on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 logfile        ~/.msmtp.log
 
-account        main
-host           smtp.gmail.com
-port           587
-from           urbain.p.vaes@gmail.com
-user           urbain.p.vaes
-passwordeval   "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/gmail/urbain.p.vaes@gmail.com.gpg"
-
-account        informal
-host           smtp.gmail.com
-port           587
-from           urbainvaes90@gmail.com
-user           urbainvaes90
-passwordeval   "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/gmail/urbainvaes90@gmail.com.gpg"
-
 account        imperial
 host           outlook.office365.com
 from           u.vaes13@imperial.ac.uk
 user           uv113@ic.ac.uk
-passwordeval   "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/imperial/u.vaes13@imperial.ac.uk.gpg"
+passwordeval   "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/email/u.vaes13@imperial.ac.uk.gpg"
 port           587
 
-account        openmailbox
-host           smtp.openmailbox.org
-from           urbain.p.vaes@openmailbox.org
-user           urbain.p.vaes@openmailbox.org
-passwordeval   "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/openmailbox/urbain.p.vaes@openmailbox.org.gpg"
+account        personal
+host           box.bknguyen.org
+from           mail@urbainvaes.com
+user           mail@urbainvaes.com
+passwordeval   "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/email/mail@urbainvaes.com.gpg"
 port           587
 
-account default : main
+account default : personal
diff --git a/.mutt/id_informal b/.mutt/id_informal
deleted file mode 100644
index 0383212..0000000
--- a/.mutt/id_informal
+++ /dev/null
@@ -1,13 +0,0 @@
-set from = "urbainvaes90@gmail.com"
-set sendmail="/usr/bin/msmtp -a informal"
-
-set spoolfile = "+Informal/Informal"
-set record    = "+Informal/Informal.sent"
-set postponed = "+Informal/Informal.drafts"
-set trash     = "+Informal/Informal.bin"
-
-macro index,pager gs "<change-folder> $record<enter>"
-macro index,pager gd "<change-folder> $postponed<enter>"
-macro index,pager gb "<change-folder> $trash<enter>"
-
-unset record
diff --git a/.mutt/id_main b/.mutt/id_main
deleted file mode 100644
index 72dd460..0000000
--- a/.mutt/id_main
+++ /dev/null
@@ -1,13 +0,0 @@
-set from = "urbain.p.vaes@gmail.com"
-set sendmail="/usr/bin/msmtp -a main"
-
-set spoolfile = "+Main/Main"
-set record    = "+Main/Main.sent"
-set postponed = "+Main/Main.drafts"
-set trash     = "+Main/Main.bin"
-
-macro index,pager gs "<change-folder> $record<enter>"
-macro index,pager gd "<change-folder> $postponed<enter>"
-macro index,pager gb "<change-folder> $trash<enter>"
-
-unset record
diff --git a/.mutt/id_personal b/.mutt/id_personal
index 5449002..96892b3 100644
--- a/.mutt/id_personal
+++ b/.mutt/id_personal
@@ -1,5 +1,5 @@
-set from = "urbain.p.vaes@openmailbox.org"
-set sendmail="/usr/bin/msmtp -a openmailbox"
+set from = "mail@urbainvaes.com"
+set sendmail="/usr/bin/msmtp -a personal"
 
 set spoolfile = "+Personal/Personal"
 set record    = "+Personal/Personal.sent"
diff --git a/.mutt/mailboxes b/.mutt/mailboxes
index 14722ea..a4be3a9 100644
--- a/.mutt/mailboxes
+++ b/.mutt/mailboxes
@@ -1 +1 @@
-mailboxes "+Work/Work" "+Work/Work.bin" "+Work/Work.drafts" "+Work/Work.sent" "+Main/Main" "+Main/Main.bin" "+Main/Main.drafts" "+Main/Main.sent" "+Personal/Personal" "+Personal/Personal.bin" "+Personal/Personal.drafts" "+Personal/Personal.sent" "+Informal/Informal" "+Informal/Informal.bin" "+Informal/Informal.drafts" "+Informal/Informal.sent"
+mailboxes "+Work/Work" "+Work/Work.bin" "+Work/Work.drafts" "+Work/Work.sent" "+Personal/Personal" "+Personal/Personal.bin" "+Personal/Personal.drafts" "+Personal/Personal.sent"
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 5fdc682..d5481fd 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -35,6 +35,8 @@ set pgp_timeout = 3600
 set sidebar_width=26
 set sidebar_visible = yes
 set sidebar_delim='|'
+set sidebar_shortpath = yes
+set sidebar_folderindent = yes
 bind index,pager \Cn sidebar-next
 bind index,pager \Cp sidebar-prev
 bind index,pager O sidebar-open
@@ -56,9 +58,7 @@ set editor="vim"
 set include=yes
 
 # Macros
-macro index,pager gm "<change-folder> +Main/Main<enter>"
 macro index,pager gp "<change-folder> +Personal/Personal<enter>"
-macro index,pager gi "<change-folder> +Informal/Informal<enter>"
 macro index,pager gw "<change-folder> +Work/Work<enter>"
 
 # Key bindings
@@ -79,13 +79,8 @@ bind pager k previous-entry
 bind pager R group-reply
 
 # Hooks
-# send-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_work'
-# reply-hook '~t .*@imperial\.ac\.uk$' 'source ~/.mutt/id_work'
-
-folder-hook 'Main*'     'source ~/.mutt/id_main'
-folder-hook 'Informal*' 'source ~/.mutt/id_informal'
-folder-hook 'Personal*' 'source ~/.mutt/id_personal'
 folder-hook 'Work*'     'source ~/.mutt/id_work'
+folder-hook 'Personal*' 'source ~/.mutt/id_personal'
 
 # Source mutt solarized
 `[ "$COLORSCHEME" = "light" ] && echo source $HOME/.mutt/solarized/mutt-colors-solarized-light-16.muttrc || echo set`
diff --git a/.vim/vimrc b/.vim/vimrc
index 36b0c4f..f1c9dcb 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -157,6 +157,7 @@ set linebreak
 set textwidth=0
 set conceallevel=2
 set guifont=Monaco\ 11
+set nojoinspaces
 
 " Case and spell
 set nospell
diff --git a/.zsh/plugins b/.zsh/plugins
index 82f4c22..51cd50e 100644
--- a/.zsh/plugins
+++ b/.zsh/plugins
@@ -32,7 +32,7 @@ if ! zgen saved; then
     # Other plugins
     zgen load rupa/z
     zgen load djui/alias-tips
-    zgen load tarruda/zsh-autosuggestions
+    zgen load tarruda/zsh-autosuggestions dist/autosuggestions.zsh
     zgen load joel-porquet/zsh-dircolors-solarized
 
     # Save all to init script
@@ -43,16 +43,10 @@ fi
 
 # Autosuggestion
 {
-    # Environment variables for plugin
-    AUTOSUGGESTION_HIGHLIGHT_COLOR='fg=6'
-
-    zle-line-init() {
-        zle autosuggest-start
-    }
-    zle -N zle-line-init
-
-    bindkey '^y' autosuggest-execute-suggestion
+    ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=6'
+    autosuggest_start
+    bindkey '^y' autosuggest-accept
 }
 
 # Z
-export _Z_EXCLUDE_DIRS=("$HOME/sshfs")
+export _Z_EXCLUDE_DIRS=("$HOME/sshfs", "$HOME/nfs")
diff --git a/bin/keyboard b/bin/keyboard
index 3c57c73..5a96bcb 100755
--- a/bin/keyboard
+++ b/bin/keyboard
@@ -8,7 +8,7 @@ xmodmap -e "add Control = Control_L"
 
 # Remap modifiers (Keyboard dependent)
 xmodmap -e "keycode 94 = Mode_switch"
-xmodmap -e 'keycode 108 = Super_L'
+# xmodmap -e 'keycode 108 = Super_L'
 
 # Remap modifiers (Keyboard independent)
 xmodmap -e 'keysym space = Super_L'
diff --git a/mail.sieve b/mail.sieve
new file mode 100644
index 0000000..d7dd982
--- /dev/null
+++ b/mail.sieve
@@ -0,0 +1,11 @@
+require ["fileinto"];
+
+if address :is "To" "facebook@urbainvaes.com"
+{
+    fileinto :create "Drafts";
+}
+
+else 
+{
+    keep;
+}