updating dotfiles

.bash_aliases

@@ -91,6 +91,9 @@ alias git2cl='git log --graph --pretty=medium --color=never > CHANGELOG'
 alias gitlog='git log --all --color --decorate --graph --oneline'
 alias gitinfo='. /$HOME/Bin/sh/gitinfo.sh'
 alias gitignore='cat .gitignore'
+alias gs='git status'
+alias gcm='git ci -m'
+alias gcam='git ci -am'
 alias gap='git add -p'
 alias gpo='git push origin '
 alias gs='git status'
@@ -116,9 +119,9 @@ alias screencast='ffmpeg -f x11grab -r 25 -s wxga -i :0.0 /tmp/outputFile.mpg'
 alias sshlist=". ~/localBin/sshlist.sh"
 alias mybackup="cd /opt/backup/manual/ && php backup.php && cd -"
 alias jsstyle="seed ~/Bin/js/jslint.js"
-alias apache2routes='. ~/Bin/sh/apache2routes.sh'
+alias apache2routes='apachectl -S'
 alias googleBackup='/opt/backup/googledocs/gdatacopier-2.1.2/gcp.py -o -u rguilloux@toog.fr:/all ~/Documents/GoogleDocs/'
-alias whereisraspberrypi="sudo nmap -sV --open 192.168.0.0/25 -p22" 
+alias whereisraspberrypi="sudo nmap -sV --open 192.168.1.0/25 -p22"
 alias allIps='for ip in $(seq 1 254); do ping -c 1 192.168.1.$ip>/dev/null; [ $? -eq 0 ] && echo "192.168.1.$ip UP" || : ; done'
 # Add an "alert" alias for long running commands.  Use like so:
 # #   sleep 10; alert
@@ -155,8 +158,14 @@ alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
 # alias whois="whois -h whois-servers.net"
 # View HTTP traffic
 alias sniff="sudo ngrep -d 'eth1' -t '^(GET|POST) ' 'tcp and port 80'"
-alias httpdump="sudo tcpdump -i eth1 -n -s 0 -w - | grep -a -o -E \"Host\: .*|GET \/.*\""
+alias httpdump="sudo tcpdump -i en3 -n -s 0 -w - | grep -a -o -E \"Host\: .*|GET \/.*\""
+alias httpsniff="sudo tcpdump -A -s0 -ien3 port 80"
+alias httpsniff2="sudo tcpdump -A -s0 -ien0 port 80"
 
 
 # -------------------- Personal aliases -------------------
 alias nw="/Applications/node-webkit.app/Contents/MacOS/node-webkit"
+alias dl="docker ps -l -q"
+alias dcp="docker-compose"
+# http://chiefy.github.io/2015/02/24/up-and-running-w-boot2docker-fig-packer.html
+alias dockerboot='boot2docker shellinit && export DOCKER_IP=$(boot2docker ip)'

.gitconfig

@@ -75,5 +75,10 @@
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true
 [filter "media"]
-	clean = git-media-clean %f
-	smudge = git-media-smudge %f
+	clean = git media clean %f
+	smudge = git media smudge %f
+	required = true
+[filter "lfs"]
+	clean = git-lfs clean %f
+	smudge = git-lfs smudge %f
+	required = true

.gitignore_global

@@ -65,3 +65,6 @@ node_modules/
 
 # IDE (PhpStorm, etc.)
 .idea
+
+#CoverAlls token
+.coveralls.yml

.vim/bundle/ronan/ftdetect/dockerfile.vim

@@ -0,0 +1 @@
+au BufNewFile,BufRead [Dd]ockerfile,Dockerfile.* set filetype=dockerfile

.vim/bundle/ronan/syntax/dockerfile.vim

@@ -0,0 +1,31 @@
+" dockerfile.vim - Syntax highlighting for Dockerfiles
+" Maintainer:   Honza Pokorny <https://honza.ca>
+" Version:      0.5
+
+
+if exists("b:current_syntax")
+    finish
+endif
+
+let b:current_syntax = "dockerfile"
+
+syntax case ignore
+
+syntax match dockerfileKeyword /\v^\s*(ONBUILD\s+)?(ADD|CMD|ENTRYPOINT|ENV|EXPOSE|FROM|MAINTAINER|RUN|USER|LABEL|VOLUME|WORKDIR|COPY)\s/
+highlight link dockerfileKeyword Keyword
+
+syntax region dockerfileString start=/\v"/ skip=/\v\\./ end=/\v"/
+highlight link dockerfileString String
+
+syntax match dockerfileComment "\v^\s*#.*$"
+highlight link dockerfileComment Comment
+
+set commentstring=#\ %s
+
+" match "RUN", "CMD", and "ENTRYPOINT" lines, and parse them as shell
+let s:current_syntax = b:current_syntax
+unlet b:current_syntax
+syntax include @SH syntax/sh.vim
+let b:current_syntax = s:current_syntax
+syntax region shLine matchgroup=dockerfileKeyword start=/\v^\s*(RUN|CMD|ENTRYPOINT)\s/ end=/\v$/ contains=@SH
+" since @SH will handle "\" as part of the same line automatically, this "just works" for line continuation too, but with the caveat that it will highlight "RUN echo '" followed by a newline as if it were a block because the "'" is shell line continuation...  not sure how to fix that just yet (TODO)

.zshrc

@@ -55,6 +55,38 @@ SAVEHIST=1000
 HISTFILE=~/.zsh_history
 
 source $HOME/.pathes
+fpath=(~/.zsh/completion $fpath)
+
+if [ -d "$HOME/Workspace/adt/sdk/" ] ; then
+    export PATH=$PATH:$HOME/Workspace/adt/sdk/platform-tools:$HOME/Workspace/adt/sdk/tools
+fi
+if [ -d "$HOME/Bin" ] ; then
+    export PATH="$HOME/Bin:$PATH"
+fi
+if [ -d "$HOME/bin" ] ; then
+    export PATH="$HOME/bin:$PATH"
+fi
+if [ -d "/usr/local/heroku/bin" ] ; then
+    export PATH="/usr/local/heroku/bin:$PATH"
+fi
+if [ -d "/usr/local/php5/bin" ] ; then
+    export PATH="/usr/local/php5/bin:$PATH"
+fi
+if [ -d "/usr/local/sbin" ] ; then
+    export PATH="/usr/local/sbin:$PATH"
+fi
+
+if [ -d "$HOME/.composer/vendor/bin" ] ; then
+    export PATH="$HOME/.composer/vendor/bin:$PATH"
+fi
+
+if [ -d "$HOME/.rvm/bin" ] ; then
+    export PATH="$HOME/.rvm/bin:$PATH"
+fi
+
+if [ -d "/Applications/Postgres.app/Contents/Versions/9.4/bin" ] ; then
+    export PATH="/Applications/Postgres.app/Contents/Versions/9.4/bin:$PATH"
+fi
 
 # Antigen: cd ~ && git clone https://github.com/zsh-users/antigen.git .antigen 
 source "$HOME/.antigen/antigen.zsh"
@@ -68,6 +100,10 @@ antigen-bundle zsh-users/zsh-history-substring-search
 source $ZSH/oh-my-zsh.sh
 #PROMPT='%{$fg[cyan]%}%n%{$fg[white]%}@%{$fg[cyan]%}%m%{$fg_bold[green]%}:%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
+# Github's hub command: https://github.com/github/hub
+eval "$(hub alias -s)"
+
+
 # Fix the slowness of zsh prompt, by removing the git status stuff that slows it down...
 #https://gist.github.com/msabramo/2355834
 function git_prompt_info() {
@@ -79,5 +115,10 @@ if [ -f ~/dotfiles/functions.sh ]; then
     . ~/dotfiles/functions.sh
 fi
 
+# Vi mode: http://dougblack.io/words/zsh-vi-mode.html
+#bindkey -v
+#zle -N zle-line-init
+#zle -N zle-keymap-select
+#export KEYTIMEOUT=1
+
 
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting