From c01ee8942ace93d3cb7e5e6b2c414541fe66b867 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues.hiegel@sagem.com>
Date: Thu, 26 Feb 2009 17:16:55 +0100
Subject: [VIM] aliases and env updates for sbin/vims

---
 user:hugues/Aliases.zsh     | 4 ++--
 user:hugues/Environment.zsh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/user:hugues/Aliases.zsh b/user:hugues/Aliases.zsh
index 728b171..7e0b4b0 100644
--- a/user:hugues/Aliases.zsh
+++ b/user:hugues/Aliases.zsh
@@ -30,9 +30,9 @@ then
 
 	if ( vim --version | grep -E "+clientserver" >/dev/null )
 	then
-		if ( cmd_exists vimtab )
+		if ( cmd_exists vims )
 		then
-			a vim='vimtab'
+			a vim='vim --servername `print -P "%l"`'
 		fi
 	fi
 fi
diff --git a/user:hugues/Environment.zsh b/user:hugues/Environment.zsh
index 2e4d302..8b5dc64 100644
--- a/user:hugues/Environment.zsh
+++ b/user:hugues/Environment.zsh
@@ -15,7 +15,7 @@
 export BC_ENV_ARGS="-q"
 
 ## Editeur par défaut
-export EDITOR=`which vim || which vi || which emacs`
+export EDITOR=`which -p vim || which -p vi || which -p emacs`
 export VISUAL=$EDITOR
 export FCEDIT=$EDITOR
 
-- 
cgit v1.2.3


From 5d86bb11e3303acc7ed57b7b2f0ad63dfc24c6f7 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues.hiegel@sagem.com>
Date: Wed, 4 Mar 2009 16:12:19 +0100
Subject: [OSNY] utilisation de tsocks avec ssh -D

---
 net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh b/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh
index 7c15a49..26ddb04 100644
--- a/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh
+++ b/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh
@@ -43,5 +43,11 @@ hash -d K:=/media/osn01001/Projets_STB
 hash -d J:=/media/osn02001/Echanges
 
 # proxy
-export http_proxy="http://190.99.3.97:3128"
-export ftp_proxy=$http_proxy
+if cmd_exists tsocks
+then
+	. tsocks -on
+else
+	export http_proxy="http://190.99.3.97:3128"
+	export ftp_proxy=$http_proxy
+fi
+
-- 
cgit v1.2.3


From c279bd73eefcffca0bc032d28142f05050f40396 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues.hiegel@sagem.com>
Date: Fri, 6 Mar 2009 15:28:03 +0100
Subject: [OSNY/Prompts] shows kernel-mode when available

---
 net:eurodec/Prompts.zsh   |  1 +
 net:osn.sagem/Prompts.zsh | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 120000 net:eurodec/Prompts.zsh
 create mode 100644 net:osn.sagem/Prompts.zsh

diff --git a/net:eurodec/Prompts.zsh b/net:eurodec/Prompts.zsh
new file mode 120000
index 0000000..3cf29e6
--- /dev/null
+++ b/net:eurodec/Prompts.zsh
@@ -0,0 +1 @@
+../net:osn.sagem/Prompts.zsh
\ No newline at end of file
diff --git a/net:osn.sagem/Prompts.zsh b/net:osn.sagem/Prompts.zsh
new file mode 100644
index 0000000..eae5bfa
--- /dev/null
+++ b/net:osn.sagem/Prompts.zsh
@@ -0,0 +1,13 @@
+
+redisplay_prompt ()
+{
+	# Reprise du redisplay_prompt officiel + ajout du mode workset
+
+	local KERNEL_MODE
+	[ -e ../../kernel_mode.txt ] && KERNEL_MODE="$C_$color[bg-black];$color[blue]$_C `cat ../../kernel_mode.txt` $C_$prompt_colors[generic]$_C "
+
+	PS1="$AGENTS""$MAILSTAT""$ERROR""$BATTERY"$C_$prompt_colors[bar]$_C"$HBAR""$DATE
+"$C_$prompt_colors[user]$_C"%n"$C_$prompt_colors[arob]$_C"@"$C_$prompt_colors[host]$_C"%m $CURDIR$SVNREV$GITBRANCH $KERNEL_MODE"$C_$prompt_colors[dies]$_C"%#"$C_$prompt_colors[cmd]$_C" "
+}
+
+
-- 
cgit v1.2.3