Merge branch 'master' of /home/manu/public_git/kolter-dotfiles

.gitconfig

@@ -1,24 +1,24 @@
 [user]
-	name=Emmanuel Bouthenot
-	email=kolter@openics.org
+    name=Emmanuel Bouthenot
+    email=kolter@openics.org
 
 [alias]
-	br = branch
-	st = status
-	rlog = log --pretty=format:\"%h %Cblue%cr%Creset %cn %Cgreen%s%Creset\"
+    br = branch
+    st = status
+    l = log --graph --decorate --pretty=format:\"%h %C(magenta)%ci%Creset%C(yellow)%d %Creset%s %C(cyan)%cn <%cE>\"
 
 [color]
-	ui = auto
-	pager = true
+    ui = auto
+    pager = true
 
 [color "diff"]
-	meta = green
-	frag = yellow
-	old = magenta
-	new = cyan
+    meta = green
+    frag = yellow
+    old = magenta
+    new = cyan
 
 [color "status"]
-	header = bold blue
-	added  = green
-	changed = bold red
-	untracked = bold yellow
+    header = bold blue
+    added  = green
+    changed = bold red
+    untracked = bold yellow

.pbuilder/hooks.d/B90lintian

@@ -1,4 +1,4 @@
 #!/bin/sh
-
+echo "[$@]"
 apt-get install -y --force-yes lintian
-lintian /tmp/buildd/*.deb
+lintian --color=always -IEm --pedantic /tmp/buildd/*.changes

.pbuilderrc

@@ -5,7 +5,9 @@ DISTRIBUTION=${DIST}
 
 BASEPATH="/var/cache/pbuilder/${DIST}.cow"
 
-MIRRORSITE="http://ftp.de.debian.org/debian"
+#BINDMOUNTS="/var/cache/apt/archives"
+
+MIRRORSITE="http://ftp.fr.debian.org/debian"
 COMPONENTS="main contrib non-free"
 HOOKDIR="${HOME}/.pbuilder/hooks.d/"
 

.zsh.d/config.d/alias.zsh

@@ -4,11 +4,14 @@
 if -exe emacs; then
     export EDITOR='emacs -nw'
 fi
+if -exe vim; then
+    export EDITOR='vim'
+fi
+
+alias e=$EDITOR
 
 if [ -n "$EDITOR" -a -n "$SUDO_USER" -a "$UID" = 0 -a "$EDITOR[1,5]" = 'emacs' ]; then
     e="$EDITOR -u $SUDO_USER"
-else
-    alias e=$EDITOR
 fi
 
 #
@@ -46,9 +49,11 @@ alias reload="exec zsh"
 if -exe ccze; then
     alias slog="tail -n 300 -f /var/log/syslog | ccze"
     alias mlog="tail -n 300 -f /var/log/mail.log | ccze"
+    alias xlog="tail -n 300 -f /var/log/Xorg.0.log | ccze"
 else
-    alias slog="tail -n 60 -f /var/log/syslog"
-    alias mlog="tail -n 60 -f /var/log/mail.log"
+    alias slog="tail -n 300 -f /var/log/syslog"
+    alias mlog="tail -n 300 -f /var/log/mail.log"
+    alias xlog="tail -n 300 -f /var/log/Xorg.0.log"
 fi
 # using colortail if available (freebsd)
 if -exe colortail; then

.zsh.d/config.d/prompt.zsh

@@ -19,14 +19,29 @@ export PR_OS_NAME=$(uname -s)
 export PR_OS_ARCH=$(uname -m)
 
 if [ -f /etc/debian_version ]; then
+
+    # ugly way to detect Ubuntu chroots
+    LSB_NAME=$(egrep 'DISTRIB_(ID|CODENAME)' /etc/lsb-release 2>/dev/null \
+                | tr '\n' '=' | cut -d'=' -f2,4 | tr '=' ' ')
+
     if [ "$PR_OS_NAME" = "Linux" ]; then
-        PR_OS_NAME="debian $(</etc/debian_version)"
+        PR_OS_NAME="Debian $(</etc/debian_version)"
     else
-        PR_OS_NAME="debian/${PR_OS_NAME} $(</etc/debian_version)"
+        PR_OS_NAME="Debian/${PR_OS_NAME} $(</etc/debian_version)"
     fi
     if [ -f /etc/debian_chroot ]; then
-        PR_OS_NAME="${PR_OS_NAME} ${PR_LIGHT_RED}chroot:${PR_WHITE}$(</etc/debian_version)"
+        if [ -n "$LSB_NAME" ]; then
+            PR_OS_NAME="${PR_OS_NAME} ${PR_LIGHT_RED}chroot:${PR_WHITE}$LSB_NAME"
+        else
+            PR_OS_NAME="${PR_OS_NAME} ${PR_LIGHT_RED}chroot:${PR_WHITE}Debian $(</etc/debian_version)"
+        fi
+    else
+        if [ -n "$LSB_NAME" ]; then
+            PR_OS_NAME="$LSB_NAME"
+        fi
     fi
+
+    unset LSB_NAME
 fi
 PR_OS_NAME="${PR_OS_NAME} ${PR_OS_ARCH}"
 

.zsh.d/os.d/Debian.zsh

@@ -29,9 +29,11 @@ cow-dist () {
     return $?
 }
 
-alias cow-stable="cow-dist stable"
+alias cow-sid32="cow-dist sid32"
+alias cow-stable32="cow-dist stable32"
+alias cow-sid64="cow-dist sid64"
+alias cow-stable64="cow-dist stable64"
 alias cow-stable-bpo="cow-dist stable-bpo"
-alias cow-sid="cow-dist sid"
 
 # tools
 apt-rbdepends () {