From 50216d7ba3a208eb62a746ac2a213a584e54ade3 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 21 Oct 2014 14:38:41 +0100 Subject: General update --- .colormutt | 12 ++++++++++++ .dotfilesrc | 12 ++++++------ .mailfilter | 5 ++++- .muttrc | 24 +++++++++++++++++------- .mynotes | 13 +++++++++++++ .tmux.conf | 3 +++ .vimrc | 6 +++--- .xmodmap | 8 ++++++-- .zathurarc | 0 .zshrc | 38 +++++++++++++++++++++++++++++--------- 10 files changed, 93 insertions(+), 28 deletions(-) create mode 100644 .colormutt create mode 100644 .tmux.conf create mode 100644 .zathurarc diff --git a/.colormutt b/.colormutt new file mode 100644 index 0000000..41bf46d --- /dev/null +++ b/.colormutt @@ -0,0 +1,12 @@ +#!/bin/bash +h=`date +%H` + +if [ $h -lt 9 ]; then + theme=dark +elif [ $h -lt 18 ]; then + theme=light +else + theme=dark +fi + +echo "/home/urbain/mutt-colors-solarized/mutt-colors-solarized-"$theme"-16.muttrc" diff --git a/.dotfilesrc b/.dotfilesrc index c4949e8..d3ce980 100755 --- a/.dotfilesrc +++ b/.dotfilesrc @@ -4,7 +4,7 @@ dir=~/dotfiles olddir=~/dotfiles_old # Files: bash, vim, zsh, mutt, vim, xmodmap, notes, fetchmail, maildrop, installation file. -files="bashrc vimrc zshrc muttrc vim xmodmap mynotes mailfilter krystle tmux.conf dotfilesrc" +files="bashrc vimrc zshrc muttrc colormutt vim xmodmap mynotes mailfilter krystle tmux.conf zathurarc dotfilesrc" rm -rf $olddir mkdir -p $olddir @@ -17,11 +17,11 @@ for file in $files; do done # Fetchmailrc (protect sensitive information) -echo Enter fetchmail password -read password mv ~/.fetchmailrc $olddir -cp $dir/.fetchmailrc ~ -sed -i 's/xx_change_me_xx/'$password'/g' ~/.fetchmailrc +# cp $dir/.fetchmailrc ~ +# vim ~/.fetchmailrc +# read password +# sed -i 's/xx_change_me_xx/'$password'/g' ~/.fetchmailrc # SSMTP config echo ssmtp.conf @@ -29,7 +29,7 @@ sudo mv /etc/ssmtp/ssmtp.conf $olddir sudo ln -s $dir/ssmtp.conf /etc/ssmtp/ # Permissions -sudo chmod 600 ~/.fetchmailrc +# sudo chmod 600 ~/.fetchmailrc sudo chmod 600 $dir/.mailfilter sudo rm -rf .vim/bundle diff --git a/.mailfilter b/.mailfilter index 00b1f3e..a7c9743 100644 --- a/.mailfilter +++ b/.mailfilter @@ -2,4 +2,7 @@ HOME=/home/urbain DEFAULT=/home/urbain/.mail logfile "$HOME/.maillog" - +# if (/^To:.*.ac.uk/) +# { +# to .mail/imperial +# } diff --git a/.muttrc b/.muttrc index a084343..93c281c 100644 --- a/.muttrc +++ b/.muttrc @@ -1,5 +1,5 @@ -set from = "chabog91@hotmail.com" -set realname = "Charles Bogosse" +set from = "u.vaes13@imperial.ac.uk" +set realname = "Urbain Vaes" set use_from = yes set envelope_from = "yes" @@ -15,20 +15,30 @@ set certificate_file = ~/.mutt/certificates set editor="vim" set edit_headers +my_hdr Return-Receipt-To: urbainvaes90@gmail.com set include=yes set sendmail="/usr/sbin/ssmtp" +# Sorting options set sort = threads set sort_aux = reverse-last-date-received set sort_browser = reverse-date -set allow_ansi = yes -source ~/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc +# Colorscheme for inside mutt +source `sh /home/urbain/.colormutt` +# macro index G "|fetchmail\n" +macro index G "!fetchmail \n" + +# HTML messages +auto_view text/html + +set reverse_alias alias krystle Krystle Acquah -alias khoi Binh-Khoi Nguyen +alias khoi Khoi Nguyen alias me Urbain Vaes -alias amanda \"Diez Fernandez, Amanda\" -alias vaes Christophe & Nathalie Vaes Van den Bogaert +alias amanda Amanda Diez +alias vaes Christophe & Nathalies Vaes +alias greg Supervisor diff --git a/.mynotes b/.mynotes index 2d954a4..7f794bc 100644 --- a/.mynotes +++ b/.mynotes @@ -3,6 +3,12 @@ Money - Thames water - Khoi: Oyster card +To read +- Terence Tao measure +- Sobolev spaces +- Elliptic PDEs +- Probability theory + To do - By Torpe ticket - Get Nino @@ -15,5 +21,12 @@ Expecting - Taste card - Oyster card +Calendar +- Jeudi 18h : skype with Mathieu +- Jeudi soir : Meal at Khoi's +- Mercredi soir : Common dinner +- Friday : Theme park +- Saturday : Skype Delft + Interesting http://www.drbunsen.org/the-text-triumvirate/ diff --git a/.tmux.conf b/.tmux.conf new file mode 100644 index 0000000..439680e --- /dev/null +++ b/.tmux.conf @@ -0,0 +1,3 @@ +set -g default-terminal "screen-256color" +set -g mode-mouse on +set -g mouse-resize-pane on diff --git a/.vimrc b/.vimrc index 38ccba4..9bcfd7a 100644 --- a/.vimrc +++ b/.vimrc @@ -83,7 +83,7 @@ set undofile set undodir=/home/urbain/.vimundo/ " Layout window -set number +set nonumber set ruler set showcmd set listchars=tab:▸\ ,eol:¬ @@ -104,11 +104,11 @@ set wrap set linebreak set textwidth=0 set conceallevel=2 -set guifont=Monaco\ 12 +set guifont=Monaco\ 11 " Colorscheme function! UpdateColorscheme() - if strftime("%H") >= 9 && strftime("%H") < 19 + if strftime("%H") >= 9 && strftime("%H") < 18 set background=light else set background=dark diff --git a/.xmodmap b/.xmodmap index 2265f1b..94b320f 100644 --- a/.xmodmap +++ b/.xmodmap @@ -3,9 +3,13 @@ keycode 94 = backslash asciicircum ! Make caps lock a modifier clear Lock -keycode 66 = Mode_switch +keycode 66 = Control_L +add Control = Control_L -! Numbers + +keycode 94 = Mode_switch + +!Numbers keycode 43 = d D 0 keycode 58 = m M 1 keycode 59 = w W 2 diff --git a/.zathurarc b/.zathurarc new file mode 100644 index 0000000..e69de29 diff --git a/.zshrc b/.zshrc index ea122d2..7ac52e8 100644 --- a/.zshrc +++ b/.zshrc @@ -1,8 +1,4 @@ # Key remapping -# todo: add vim support -# -~/xcape/xcape -e 'Shift_L=Escape' -xmodmap -quiet ~/.xmodmap # Path to your oh-my-zsh installation. export ZSH=$HOME/.oh-my-zsh @@ -29,10 +25,10 @@ ZSH_THEME="eastwood" # DISABLE_AUTO_TITLE="true" # Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" +ENABLE_CORRECTION="true" # Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" +COMPLETION_WAITING_DOTS="true" # Uncomment the following line if you want to disable marking untracked files # under VCS as dirty. This makes repository status check for large repositories @@ -81,7 +77,31 @@ alias -s vim=vim alias -s cpp=vim alias -s c=vim alias -s tex=vim - +alias -s pdf=zathura alias tmux="TERM=screen-256color-bce tmux" - -bindkey -v +alias g='git' +alias v=$EDITOR +alias u='cd ~/phd' +alias up='cd ~/phd/programs' +alias ul='cd ~/phd/literature' +alias ur='cd ~/phd/reports' +alias mutt='fetchmail -s & mutt' + +# Fix smart search history +bindkey "^[[A" history-beginning-search-backward +bindkey "^[[B" history-beginning-search-forward + +sleep 1 +h=`date +%H` +if [ $h -lt 9 ]; then + xdotool key Alt+t p Down Return +elif [ $h -lt 18 ]; then + xdotool key Alt+t p Down Down Return +else + xdotool key Alt+t p Down Return +fi + +# setxkbmap -option ctrl:swapcaps +xmodmap ~/.xmodmap +~/xcape/xcape -e 'Shift_L=Escape' +# ~/xcape/xcape -e 'Shift_R=Tab' -- cgit v1.2.3