Merge remote-tracking branch 'origin/master' into HEAD

5 files changed, 19 insertions, 2 deletions

diff --git a/net:foret/user:hiegel b/net:foret/user:hiegel
deleted file mode 120000
index 1941e64..0000000
--- a/net:foret/user:hiegel
+++ /dev/null
@@ -1 +0,0 @@
-../user:hugues/
\ No newline at end of file
diff --git a/user:hiegel b/user:hiegel
new file mode 120000
index 0000000..5adfc80
--- /dev/null
+++ b/user:hiegel
@@ -0,0 +1 @@
+user:hugues
\ No newline at end of file
diff --git a/user:hugues/KeyBindings.zsh b/user:hugues/KeyBindings.zsh
index 6a50329..e80b58b 100644
--- a/user:hugues/KeyBindings.zsh
+++ b/user:hugues/KeyBindings.zsh
@@ -223,7 +223,7 @@ do
 	bindkey -M $keymap -s ' ' '\\ '
 
 	bindkey -M $keymap -s 'g' 'Q git st .\n'
-	bindkey -M $keymap -s 'G' 'Q git remote -v update\n'
+	bindkey -M $keymap -s 'G' 'Q git updall\n'
 
 	bindkey -M $keymap -s 'S' 'Q sudo !!'
 
diff --git a/user:hugues/net:foret/KeyBindings.zsh b/user:hugues/net:foret/KeyBindings.zsh
new file mode 100644
index 0000000..ad2d1a3
--- /dev/null
+++ b/user:hugues/net:foret/KeyBindings.zsh
@@ -0,0 +1,16 @@
+##
+## Part of configuration files for Zsh 4
+## by Hugues Hiegel <hugues@hiegel.fr>
+## 
+## NO WARRANTY PROVIDED, USE AT YOUR OWN RISKS
+##
+## You are encouraged to use, modify, and redistribute
+## these files with or without this notice.
+## 
+
+for keymap in viins vicmd emacs
+do
+    bindkey -M $keymap -s '+' 'Q for i in {1..$(__get_prompt_lines)} ; tput cuu1; export NPROC=$(($NPROC + 1))\n'
+    bindkey -M $keymap -s '-' 'Q for i in {1..$(__get_prompt_lines)} ; tput cuu1; [ "$NPROC" -gt 0 ] && export NPROC=$(($NPROC - 1)) || unset NPROC\n'
+done
+
diff --git a/zshrc b/zshrc
index acb5ca0..88b7d35 100644
--- a/zshrc
+++ b/zshrc
@@ -61,6 +61,7 @@ if [ -d $ZDOTDIR ]; then
 					"host:$HOST"\
 					"sys:$OSNAME"\
 					"user:$USER"\
+					"user:$USER/net:$DOMAIN"\
 					"user:$SUDO_USER"\
 					"net:$DOMAIN/host:$HOST"\
 					"net:$DOMAIN/sys:$OSNAME"\