From 014c4e6252e829c5e546f9d05ed7ec999e75d3d0 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 27 Jan 2016 13:46:46 +0000 Subject: Add nfs share in z_exclude_dir --- .zsh/plugins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zsh/plugins b/.zsh/plugins index 82f4c22..e87140c 100644 --- a/.zsh/plugins +++ b/.zsh/plugins @@ -55,4 +55,4 @@ fi } # Z -export _Z_EXCLUDE_DIRS=("$HOME/sshfs") +export _Z_EXCLUDE_DIRS=("$HOME/sshfs", "$HOME/nfs") -- cgit v1.2.3 From 1f7386bca8116a012e7f296f778373abf80d90b6 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 3 Feb 2016 18:40:29 +0000 Subject: Use email server --- .mbsyncrc | 81 ++++++++++++++----------------------------------------- .msmtprc | 26 +++++------------- .mutt/id_informal | 13 --------- .mutt/id_main | 13 --------- .mutt/id_personal | 4 +-- .mutt/mailboxes | 2 +- .mutt/muttrc | 9 +------ 7 files changed, 30 insertions(+), 118 deletions(-) delete mode 100644 .mutt/id_informal delete mode 100644 .mutt/id_main diff --git a/.mbsyncrc b/.mbsyncrc index 9945cdc..0b0637b 100644 --- a/.mbsyncrc +++ b/.mbsyncrc @@ -1,20 +1,7 @@ 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 @@ -24,68 +11,24 @@ 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 me@urbainvaes.com +PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/bknguyen.org/me@uvaes.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" @@ -117,3 +60,19 @@ Slave :Personal-local:"Personal.sent" Channel Personal-bin Master :Personal-remote:"Trash" Slave :Personal-local:"Personal.bin" + +Channel Personal-accounts +Master :Personal-remote:"Accounts" +Slave :Personal-local:"Personal.accounts" + +Channel Personal-personal +Master :Personal-remote:"Personal" +Slave :Personal-local:"Personal.personal" + +Channel Personal-jobs +Master :Personal-remote:"Jobs" +Slave :Personal-local:"Personal.jobs" + +Channel Personal-archive +Master :Personal-remote:"Archive" +Slave :Personal-local:"Personal.archive" diff --git a/.msmtprc b/.msmtprc index 565459b..22b5950 100644 --- a/.msmtprc +++ b/.msmtprc @@ -4,20 +4,6 @@ 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 @@ -25,11 +11,11 @@ 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" 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 me@urbainvaes.com +user me@urbainvaes.com +passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/bknguyen.org/me@uvaes.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 " $record" -macro index,pager gd " $postponed" -macro index,pager gb " $trash" - -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 " $record" -macro index,pager gd " $postponed" -macro index,pager gb " $trash" - -unset record diff --git a/.mutt/id_personal b/.mutt/id_personal index 5449002..a1ff085 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 = "me@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..f69ff63 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" "+Main/Main" "+Main/Main.bin" "+Main/Main.drafts" "+Main/Main.sent" "+Personal/Personal" "+Personal/Personal.personal" "+Personal/Personal.archive" "+Personal/Personal.accounts" "+Personal/Personal.jobs" "+Personal/Personal.bin" "+Personal/Personal.drafts" "+Personal/Personal.sent" "+Informal/Informal" "+Informal/Informal.bin" "+Informal/Informal.drafts" "+Informal/Informal.sent" "+Informal/Informal" "+Informal/Informal.bin" "+Informal/Informal.drafts" "+Informal/Informal.sent" diff --git a/.mutt/muttrc b/.mutt/muttrc index 5fdc682..ed8de24 100644 --- a/.mutt/muttrc +++ b/.mutt/muttrc @@ -56,9 +56,7 @@ set editor="vim" set include=yes # Macros -macro index,pager gm " +Main/Main" macro index,pager gp " +Personal/Personal" -macro index,pager gi " +Informal/Informal" macro index,pager gw " +Work/Work" # Key bindings @@ -79,13 +77,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` -- cgit v1.2.3 From 64b385426badc6f6e745081ee973c2914ed5de3e Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 3 Feb 2016 22:20:39 +0000 Subject: Simplify config --- .mbsyncrc | 2 +- .msmtprc | 2 +- .mutt/mailboxes | 2 +- .vim/vimrc | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.mbsyncrc b/.mbsyncrc index 0b0637b..15cb5fc 100644 --- a/.mbsyncrc +++ b/.mbsyncrc @@ -13,7 +13,7 @@ CertificateFile /etc/ssl/certs/ca-certificates.crt IMAPAccount Personal Host box.bknguyen.org User me@urbainvaes.com -PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/bknguyen.org/me@uvaes.com.gpg" +PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/mailinabox/me@urbainvaes.com.gpg" SSLType IMAPS CertificateFile /etc/ssl/certs/ca-certificates.crt diff --git a/.msmtprc b/.msmtprc index 22b5950..8e44cc8 100644 --- a/.msmtprc +++ b/.msmtprc @@ -15,7 +15,7 @@ account personal host box.bknguyen.org from me@urbainvaes.com user me@urbainvaes.com -passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/bknguyen.org/me@uvaes.com.gpg" +passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/mailinabox/me@urbainvaes.com.gpg" port 587 account default : personal diff --git a/.mutt/mailboxes b/.mutt/mailboxes index f69ff63..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.personal" "+Personal/Personal.archive" "+Personal/Personal.accounts" "+Personal/Personal.jobs" "+Personal/Personal.bin" "+Personal/Personal.drafts" "+Personal/Personal.sent" "+Informal/Informal" "+Informal/Informal.bin" "+Informal/Informal.drafts" "+Informal/Informal.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/.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 -- cgit v1.2.3 From da34dcfa5a78e34b5ccc013a1aa6324fe9d851a2 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Thu, 4 Feb 2016 16:08:15 +0000 Subject: Update mail passwords --- .mbsyncrc | 4 ++-- .msmtprc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.mbsyncrc b/.mbsyncrc index 15cb5fc..9b66301 100644 --- a/.mbsyncrc +++ b/.mbsyncrc @@ -6,14 +6,14 @@ 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 box.bknguyen.org User me@urbainvaes.com -PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/mailinabox/me@urbainvaes.com.gpg" +PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/email/me@urbainvaes.com.gpg" SSLType IMAPS CertificateFile /etc/ssl/certs/ca-certificates.crt diff --git a/.msmtprc b/.msmtprc index 8e44cc8..ef6a177 100644 --- a/.msmtprc +++ b/.msmtprc @@ -8,14 +8,14 @@ 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 personal host box.bknguyen.org from me@urbainvaes.com user me@urbainvaes.com -passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/mailinabox/me@urbainvaes.com.gpg" +passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/email/me@urbainvaes.com.gpg" port 587 account default : personal -- cgit v1.2.3 From 4af51165d21ee4c97f3a92a00fac321e1a8cad03 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 6 Feb 2016 08:38:41 +0000 Subject: [uzbl] Enable scroll with e --- .uzbl/config | 2 -- 1 file changed, 2 deletions(-) diff --git a/.uzbl/config b/.uzbl/config index 23d07ea..2074388 100644 --- a/.uzbl/config +++ b/.uzbl/config @@ -441,7 +441,5 @@ sync_spawn_exec @scripts_dir/load_cookies.sh @data_home/uzbl/session-cookies.txt # Set the "home" page. set uri = "" -@cbind e = event SET_CURSOR_POS -1 - @on_event DOWNLOAD_COMPLETE spawn @scripts_dir/downloadviewer.sh %s # vim: set fdm=syntax: -- cgit v1.2.3 From fe5e311fa9e6b3fa25ccd9ce455032b2e126ca09 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 6 Feb 2016 15:51:26 +0000 Subject: Update email address --- .mbsyncrc | 20 ++------------------ .msmtprc | 6 +++--- .mutt/id_personal | 2 +- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/.mbsyncrc b/.mbsyncrc index 9b66301..08a006e 100644 --- a/.mbsyncrc +++ b/.mbsyncrc @@ -12,8 +12,8 @@ CertificateFile /etc/ssl/certs/ca-certificates.crt IMAPAccount Personal Host box.bknguyen.org -User me@urbainvaes.com -PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.password-store/email/me@urbainvaes.com.gpg" +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 @@ -60,19 +60,3 @@ Slave :Personal-local:"Personal.sent" Channel Personal-bin Master :Personal-remote:"Trash" Slave :Personal-local:"Personal.bin" - -Channel Personal-accounts -Master :Personal-remote:"Accounts" -Slave :Personal-local:"Personal.accounts" - -Channel Personal-personal -Master :Personal-remote:"Personal" -Slave :Personal-local:"Personal.personal" - -Channel Personal-jobs -Master :Personal-remote:"Jobs" -Slave :Personal-local:"Personal.jobs" - -Channel Personal-archive -Master :Personal-remote:"Archive" -Slave :Personal-local:"Personal.archive" diff --git a/.msmtprc b/.msmtprc index ef6a177..f056ee7 100644 --- a/.msmtprc +++ b/.msmtprc @@ -13,9 +13,9 @@ port 587 account personal host box.bknguyen.org -from me@urbainvaes.com -user me@urbainvaes.com -passwordeval "gpg --use-agent --quiet --for-your-eyes-only --no-tty --decrypt ~/.password-store/email/me@urbainvaes.com.gpg" +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 : personal diff --git a/.mutt/id_personal b/.mutt/id_personal index a1ff085..96892b3 100644 --- a/.mutt/id_personal +++ b/.mutt/id_personal @@ -1,4 +1,4 @@ -set from = "me@urbainvaes.com" +set from = "mail@urbainvaes.com" set sendmail="/usr/bin/msmtp -a personal" set spoolfile = "+Personal/Personal" -- cgit v1.2.3 From 4350b747f91ec9d6f775f0315a868e0eaa1b4e7c Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 12 Feb 2016 11:27:33 +0100 Subject: Correct bugs xmodmap --- .mr/mrconfig | 2 +- .zsh/plugins | 14 ++++---------- bin/keyboard | 2 +- mail.sieve | 11 +++++++++++ 4 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 mail.sieve 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/.zsh/plugins b/.zsh/plugins index e87140c..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,15 +43,9 @@ 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 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; +} -- cgit v1.2.3 From 4a62bba8be5e18d0e4e487598ed525f3dd7c12e7 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 12 Feb 2016 11:46:34 +0100 Subject: Update mutt-sidebar options for new patch --- .mutt/muttrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mutt/muttrc b/.mutt/muttrc index ed8de24..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 -- cgit v1.2.3