diff options
35 files changed, 117 insertions, 240 deletions
diff --git a/01_Functions.zsh b/01_Functions.zsh index 958403b..f781358 100644 --- a/01_Functions.zsh +++ b/01_Functions.zsh @@ -19,7 +19,26 @@ cmd_exists () { - which -p $1 >/dev/null 2>&1 + \which -p $1 >/dev/null 2>&1 +} + +git () { + GIT=$(\which -p git) + case $1 in + init|clone|config) + ;; + *) + if [ "$( ( $GIT ls-files ; $GIT ls-tree HEAD . ) 2>&- | head -n1)" = ""\ + -a \( ! -d .git -o "$($GIT rev-parse --git-dir 2>&-)" != ".git" \)\ + -a "$($GIT rev-parse --is-inside-git-dir 2>&-)" != "true" ] + then + echo >&2 "git $1: the current folder is not managed by git" + return + fi + ;; + esac + + $(\which -p git) $@ } term_title() @@ -52,22 +71,22 @@ term_title() screen*) local _sep="" [ $# -gt 0 ] && _sep=$1 && shift # gets and discards the separator, if any. - if [ ! -z "$TMUX" ] - then + #if [ ! -z "$TMUX" ] + #then # Tmux #print -Pn "\e]0;%n@%m (%l) %~${_sep:+$_sep #[fg=yellow,bold]}$@\a" # Sets term title print -Pn "\e]0;#[fg=red]%n#[fg=default,bold]@#[fg=red]%m#[default] (#[fg=cyan]%l#[fg=default]) #[fg=red]%~${_sep:+#[default,fg=default]$_sep #[fg=yellow,bold]$@}#[default,fg=default]\a" - else + #else # Classic screen # hardstatus #print -Pn "\e]2;{+b W}SCREEN #n {-b W}| {R}?u(u) ?{W}{r}%n@%m{W} ({c}%l{W}) {R}%~{W}${_sep:+$_sep \{+b Y\}}$@{-b W}\a" # Sets hardstatus line (term title) - print -Pn "\e]2;{R}?u(u) ?{W}{r}%n{R}@{r}%m{-b W} ({+b c}%l{-b W}) {R}%~{W}${_sep:+$_sep \{+b Y\}}$@{-b W}\a" # Sets hardstatus line (term title) + # print -Pn "\e]2;{R}?u(u) ?{W}{r}%n{R}@{r}%m{-b W} ({+b c}%l{-b W}) {R}%~{W}${_sep:+$_sep \{+b Y\}}$@{-b W}\a" # Sets hardstatus line (term title) # caption - print -Pn "\ek" - [ "$SUDO_USER" != "" ] && print -Pn "($USER) " - print -Pn "${@:-%~}" - print -Pn "\e\\" - fi + # print -Pn "\ek" + # [ "$SUDO_USER" != "" ] && print -Pn "($USER) " + # print -Pn "${@:-%~}" + # print -Pn "\e\\" + #fi ;; *) ;; @@ -93,14 +112,32 @@ preprint() fi } -get_git_branch () +get_gcl_branch () { - local my_git_branch checkouted_branch="yes" + case $1 in + git) + get_git_branch + ;; + hg) + get_hg_branch + ;; + *) + ;; + esac +} - if [ ! -z "$DO_NOT_CHECK_GIT_BRANCH" ] +get_hg_branch () +{ + HGROOT=$(hg root 2>/dev/null) + if [ ! -z "$HGROOT" ] then - return + hg branch fi +} + +get_git_branch () +{ + local my_git_branch checkouted_branch="yes" if [ -f ".repo/manifests.git/config" ] then @@ -283,6 +320,7 @@ set_prompt_colors () #prompt_colors[term]="$prompt_colors[generic]" # tty - unused, see term title prompt_colors[user]="$prompt_colors[generic]" # login - generic prompt_colors[host]="$prompt_colors[generic]" # hostname - generic + prompt_colors[display]="$prompt_colors[generic]" # hostname - generic #prompt_colors[hist]="$color[none]" # history number - unused prompt_colors[arob]="$color[bold];$prompt_colors[generic]" # <login>@<hostname> - bold generic prompt_colors[dies]="$prompt_colors[generic]" # the bottom-end of the prompt - generic diff --git a/10_Environment.zsh b/10_Environment.zsh index 99b0d19..a64c5e3 100644 --- a/10_Environment.zsh +++ b/10_Environment.zsh @@ -40,6 +40,7 @@ _C="$_c%}" PS1_ROOT=${PS1_ROOT:-$color[red]} PS1_USER=${PS1_USER:-$color[blue]} +PS1_YEAH="38;5;82" ## Variables d'environnement ``classiques'' # @@ -61,12 +62,18 @@ typeset -gU PATH MANPATH INFOPATH PKG_CONFIG_PATH LD_LIBRARY_PATH ## Gestion de l'historique # Voir le fichier d'Options pour plus de contrôle là-dessus -HISTFILE=$ZDOTDIR/.history.$USER.$HOSTNAME # Pour éviter les conflits de conf +HISTFILE=$ZDOTDIR/.history.$USER.$HOST # Pour éviter les conflits de conf HISTSIZE=42000 SAVEHIST=42000 export GPG_TTY=`tty` +# YeahConsole.. +if ( ps fx | grep $$ -B1 | grep -q yeahconsole ) +then + YEAHCONSOLE=true +fi + # Display guess CURRENT_DISPLAY=$(finger 2>&- | tail -n+2 | grep -E $USER'[[:blank:]]+.*[[:blank:]]+tty[0-9][[:blank:]]+($DISPLAY)' | head -n1 | cut -d'(' -f2 | cut -d')' -f1) if [ "$DISPLAY" = "" -a "$CURRENT_DISPLAY" = "" ] @@ -80,3 +87,4 @@ then fi fi +export COLUMNS diff --git a/12_Prompts.zsh b/12_Prompts.zsh index 0819595..aa0fc38 100644 --- a/12_Prompts.zsh +++ b/12_Prompts.zsh @@ -13,6 +13,10 @@ if privileged_user then prompt_colors[generic]=${PS1_ROOT:-$color[bold];$color[red]} fi +if [ "$YEAHCONSOLE" = "true" ] +then + prompt_colors[generic]=${PS1_YEAH} +fi set_prompt_colors @@ -30,20 +34,19 @@ set_prompt_colors expand_text() { - # strips the %{...%} - print -Pn -- "$(echo $@ | sed 's/%{[^(%})]*%}//g')" + # strips the %{...%} and newlines characters + print -Pn -- "$(echo $@ | tr -d '\n' | sed 's/%{[^(%})]*%}//g')" } preexec () { term_title "$(echo $1 | tr ' \n' ' ;' | sed 's/%/%%/g;s/\\/\\\\/g;s/;$//')" - local lines="$(expand_text "$PROMPT$1" | sed "s/\\(.\{$COLUMNS\}\\)/\\1\\n/g" | wc -l)" prompt_colors[date]=$date_colors[exec] set_prompt_date prompt_colors[date]=$date_colors[normal] - spaceleft=$(($COLUMNS - $AGENTSSIZE - $MAILSTATSIZE - $DATESIZE - $BATTERYSIZE)) + spaceleft=$(($COLUMNS - $AGENTSSIZE - $STLINUXSIZE - $DATESIZE - $BATTERYSIZE)) unset HBAR for h in {1..$spaceleft} do @@ -51,9 +54,8 @@ preexec () done redefine_prompt - local string="$(expand_text "$PROMPT$1")" - local lines=$(( (${#string} - 1) / $COLUMNS + $(echo ${string} | wc -l) - 2 )) - for i in {0..$lines} ; print -Pn "\e[1A\e[2K" + local lines="$(($(expand_text "$PROMPT$1" | sed "s/\\(.\{0,$COLUMNS\}\\)/\\1\\n/g" | wc -l)))" + for i in {1..$lines} ; print -Pn "\e[1A\e[2K" print -Pn "\r$PROMPT" print -Pn "$C_$color[cyan]$_C" print "${(q)1}" | sed "s/'$//;s/^'//" @@ -61,24 +63,6 @@ preexec () print -Pn "$C_$prompt_colors[exec]$_C" } -new_precmd() -{ - # - # Arrays - # [0] prompt-style string - # [1] total size - # [2] color - # [3] pre-string - # [4] post-string - # - typeset -A ERROR DATE MAILS LOGIN HOST CWD GITINFO SVNINFO PRECMD - ERROR[color] = $prompt_colors[error] - ERROR[string] = "%(?;;%?)" - ERROR[pre] = "-" - ERROR[post] = - ERROR[size] = ${#$(print -Pn $ERROR[pre]$ERROR[string]$ERROR[post])} -} - set_prompt_date() { # Date @@ -92,7 +76,6 @@ set_prompt_date() update_prompt_elements() { # Error - error=$(print -Pn "%(?;;-%?)") ## MUST BE the first operation else we lose the error code... [ "$DEBUG" = "yes" ] && echo -n " Error code..." ERRORSIZE=${#error} ERROR="%(?;;"$C_$prompt_colors[bar]$_C"-"$C_$prompt_colors[error]$_C"%?)" @@ -165,13 +148,14 @@ update_prompt_elements() AGENTSSIZE=$#AGENTSSIZE [ "$DEBUG" = "yes" ] && echo - # Mailcheck - [ "$DEBUG" = "yes" ] && echo -n " Mails..." - MAILSTAT=$(eval echo "`[ -s ~/.procmail/procmail.log ] && < ~/.procmail/procmail.log awk 'BEGIN {RS="From" ; HAM=-1 ; LISTES=0 } !/JUNK|dev.null/ { HAM++ } /Listes|Newsletters|Notifications/ { LISTES++ } END { if ((HAM - LISTES) > 0) { print "$C_$prompt_colors[bar]$_C""-""$C_$mail_colors[unread]$_C""@" } else if (LISTES > 0) { print "$C_$prompt_colors[bar]$_C""-""$C_$mail_colors[listes]$_C""@" } }'`") - MAILSTATEXPAND=$(expand_text "$MAILSTAT") - MAILSTATSIZE=${#MAILSTATEXPAND} - [ "$DEBUG" = "yes" ] && echo - + if [ "${PWD/$STSDKROOT/}" != "$PWD" ] + then + export STLINUX="-${DVD_PLATFORM:-?}-${DVD_BACKEND:-?}-${DVD_OS:-?}" + STLINUXSIZE=${#STLINUX} + else + unset STLINUX + STLINUXSIZE=0 + fi if [ -e /proc/pmu/battery_0 ] then @@ -218,7 +202,7 @@ update_prompt_elements() [ "$DEBUG" = "yes" ] && echo -n " Horizontal bar..." # First line of prompt, calculation of the remaining place - spaceleft=$(($COLUMNS - $ERRORSIZE - $AGENTSSIZE - $MAILSTATSIZE - $DATESIZE - $BATTERYSIZE)) + spaceleft=$(($COLUMNS - $ERRORSIZE - $AGENTSSIZE - $STLINUXSIZE - $DATESIZE - $BATTERYSIZE)) unset HBAR for h in {1..$spaceleft} do @@ -247,7 +231,7 @@ update_prompt_elements() SVNREVSIZE=${#${SVNREV:+ r$SVNREV}} if [ "$SVNREV" != "" ] then - if [ -z "$DO_NOT_CHECK_SVN_STATUS" ] + if [ ! -z "$CHECK_SVN_STATUS" ] then SVNSTATUS="$(svn diff 2>&-)" SVNSTATUS=${${SVNSTATUS:+$prompt_colors[not_up_to_date]}:-$prompt_colors[up_to_date]} @@ -256,10 +240,16 @@ update_prompt_elements() SVNREV=${SVNREV:+$C_$prompt_colors[doubledot]$_C $C_$SVNSTATUS$_C"r"$SVNREV} [ "$DEBUG" = "yes" ] && echo + # get hg status + [ "$DEBUG" = "yes" ] && echo -n " HG status..." + HGBRANCH=$(get_gcl_branch hg) + [ ! -z "$HGBRANCH" ] && HGBRANCH=" "$HGBRANCH + [ "$DEBUG" = "yes" ] && echo + # get git status # [ "$DEBUG" = "yes" ] && echo -n " GIT status..." - GITBRANCH=$(get_git_branch) + GITBRANCH=$(get_gcl_branch git) GITBRANCHSIZE=${#GITBRANCH} [ $GITBRANCHSIZE -gt 0 ] && GITBRANCHSIZE=$(($GITBRANCHSIZE)) [ "$DEBUG" = "yes" ] && echo @@ -315,10 +305,27 @@ update_prompt_elements() redefine_prompt () { + case "$YEAHCONSOLE" in + "true") + yeah_prompt + ;; + *) + two_lines_prompt + ;; + esac +} + +yeah_prompt () +{ + PS1=$C_$prompt_color[default]$_C$C_$prompt_colors[user]$_C"%n"$C_$prompt_colors[arob]$_C"@"$C_$prompt_colors[host]$_C"%m "$CURDIR" "$C_$prompt_colors[dies]$_C">"$C_$prompt_colors[cmd]$_C" " +} + +two_lines_prompt () +{ ## Le prompt le plus magnifique du monde, et c'est le mien ! # Affiche l'user, l'host, le tty et le pwd. Rien que ça... - PS1=$AGENTS$MAILSTAT$ERROR$BATTERY$C_$prompt_colors[bar]$_C$HBAR$DATE" -"$C_"30;1"$_C$SHLVL"-"$C_$prompt_color[default]$_C$C_$prompt_colors[user]$_C"%n"$C_$prompt_colors[arob]$_C"@"$C_$prompt_colors[host]$_C"%m "$CURDIR$CVSTAG$SVNREV$GITBRANCH" "$C_$prompt_colors[dies]$_C"%#"$C_$prompt_colors[cmd]$_C" " + PS1=$AGENTS$MAILSTAT$ERROR$BATTERY$C_$prompt_colors[bar]$_C$STLINUX$HBAR$DATE" +"$C_"30;1"$_C$SHLVL"-"$C_$prompt_color[default]$_C$C_$prompt_colors[user]$_C"%n"$C_$prompt_colors[arob]$_C"@"$C_$prompt_colors[host]$_C"%m"$C_$prompt_colors[display]$_C"($DISPLAY) "$CURDIR$CVSTAG$SVNREV$GITBRANCH$HGBRANCH" "$C_$prompt_colors[dies]$_C"%#"$C_$prompt_colors[cmd]$_C" " } @@ -333,6 +340,9 @@ fi precmd() { + # this MUST BE the real first operation else we lose the error code... + error=$(print -Pn "%(?;;-%?)") + NEW_STATUS=$(zsh_status) if [ $NEW_STATUS != $ZSH_STATUS ] then diff --git a/20_Options.zsh b/20_Options.zsh index e90ddf6..89e117c 100644 --- a/20_Options.zsh +++ b/20_Options.zsh @@ -107,6 +107,7 @@ SetOPT INC_APPEND_HISTORY SetOPT MAGIC_EQUAL_SUBST SetOPT MAIL_WARNING SetOPT MARK_DIRS +UnsetOPT MULTI_OS SetOPT NO_BG_NICE SetOPT NO_HUP SetOPT NO_PROMPT_CR diff --git a/host:groumpf b/host:groumpf deleted file mode 120000 index 0ac9f03..0000000 --- a/host:groumpf +++ /dev/null @@ -1 +0,0 @@ -net:opera.openwide.fr/host:groumpf
\ No newline at end of file diff --git a/host:rmm-p1197486 b/host:rmm-p1197486 deleted file mode 120000 index f35a2fa..0000000 --- a/host:rmm-p1197486 +++ /dev/null @@ -1 +0,0 @@ -net:sagem.ads.sagem
\ No newline at end of file diff --git a/net:eurodec/Environment.zsh b/net:eurodec/Environment.zsh deleted file mode 100644 index a70c7b4..0000000 --- a/net:eurodec/Environment.zsh +++ /dev/null @@ -1,15 +0,0 @@ -export m_SVIM=/users/picard/local/share/vim/syntax -export m_VIM_USER_NAME="H. Hiegel" - -export LOGCHECK=0 # Don't want to get fucked up by this trick... - -hash -d data=/data/$USER -#hash -d workset=~data/workset -hash -d targets=/targets/$USER - -eval $(~data/sagem-script44/set-env.pl 2>/dev/null) && source ~/.env - -export TARGET_PATH=~targets/target -export KERNEL_PATH=~data/forge/kernel-$(cat ~data/workset/project.txt) -export KERNEL_PATH_BASE=~data/forge/kernel- -export COMP=ARCH=sh\ CROSS_COMPILE=sh4-linux-uclibc- diff --git a/net:eurodec/Hashes.zsh b/net:eurodec/Hashes.zsh deleted file mode 100644 index e69de29..0000000 --- a/net:eurodec/Hashes.zsh +++ /dev/null diff --git a/net:eurodec/Prompts.zsh b/net:eurodec/Prompts.zsh deleted file mode 120000 index 3cf29e6..0000000 --- a/net:eurodec/Prompts.zsh +++ /dev/null @@ -1 +0,0 @@ -../net:osn.sagem/Prompts.zsh
\ No newline at end of file diff --git a/net:eurodec/host:osn08002/Environment.zsh b/net:eurodec/host:osn08002/Environment.zsh deleted file mode 100644 index d21d723..0000000 --- a/net:eurodec/host:osn08002/Environment.zsh +++ /dev/null @@ -1,6 +0,0 @@ - -[ "$TERM" = "rxvt-unicode" ] && export TERM=rxvt-color - - -PS1_USER=$color[white] - diff --git a/net:eurodec/user:g178241 b/net:eurodec/user:g178241 deleted file mode 120000 index ecec344..0000000 --- a/net:eurodec/user:g178241 +++ /dev/null @@ -1 +0,0 @@ -../user:hugues
\ No newline at end of file diff --git a/net:example.com/Aliases.zsh b/net:example.com/Aliases.zsh deleted file mode 100644 index f7e6048..0000000 --- a/net:example.com/Aliases.zsh +++ /dev/null @@ -1,6 +0,0 @@ - -# Marre de se faire avoir avec la reconstruction de la BDD -a cscope='cscope -d' - -# Ptit alias bien pratique, pour afficher rapidos les patches appliqués et ceux qui ne le sont pas -a q='quilt applied ; echo " -- TOP -- " ; quilt unapplied' diff --git a/net:example.com/Environment.zsh b/net:example.com/Environment.zsh deleted file mode 100644 index d86a417..0000000 --- a/net:example.com/Environment.zsh +++ /dev/null @@ -1,33 +0,0 @@ -## -## 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. -## - -## Mettez le nom de votre station de travail habituelle ici ## -if [ ! -e ~/.workstation ] -then - echo >&2 "Quelle est votre station de travail attitrée ? (`hostname -s`) " && read $workstation - echo ${workstation:-$(hostname -s)} > ~/.workstation -fi -WORKSTATION=$(cat ~/.workstation) - -export LC_ALL=fr_FR -[ "$TERM" = "rxvt-unicode" ] && export TERM=rxvt - -#export PATH=${PATH:+$PATH:}~/souche_linux_pl/tools/bin:/usr/local/urd2/bin:/usr/local/urd2/openrg2_6/mips-linux-uclibc/bin/ -#export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}~/souche_linux_pl/tools/lib -#export MANPATH=${MANPATH:+$MANPATH:}/usr/local/urd2/man:~/souche_linux_pl/tools/man:~/souche_linux_pl/tools/share/man - -PATH=$PATH:/opt/edtm/bin -PATH=$PATH:/opt/openrg/mips-linux-uclibc/bin -typeset -gU PATH MANPATH - -#__PREFIX=/filer1/dev_users/hiegel/souche_linux_pl/tools/ - -export http_proxy="http://proxy:3128" -export ftp_proxy=$http_proxy diff --git a/net:example.com/Hashes.zsh b/net:example.com/Hashes.zsh deleted file mode 100644 index ef2666f..0000000 --- a/net:example.com/Hashes.zsh +++ /dev/null @@ -1,6 +0,0 @@ -hash -d dev=/developpement/$WORKSTATION/sagem-box/$(whoami) -hash -d public=/public/$WORKSTATION -hash -d Public=/public/$(hostname -s) -hash -d archives=/projets/sagem-box/archives -hash -d doc=/projets/sagem-box/doc -hash -d tftp=/public/$WORKSTATION/tftp diff --git a/net:example.com/KeyBindings.zsh b/net:example.com/KeyBindings.zsh deleted file mode 100644 index 0691d95..0000000 --- a/net:example.com/KeyBindings.zsh +++ /dev/null @@ -1,5 +0,0 @@ - -# Lance l'alias ``q'' (voir le fichier d'aliases) pour -# afficher rapidement la pile des patches, avec une marque -# au niveau du dernier patch appliqué. - diff --git a/net:lan.theoris.fr/Colors.zsh b/net:lan.theoris.fr/Colors.zsh deleted file mode 100644 index f0ec6fc..0000000 --- a/net:lan.theoris.fr/Colors.zsh +++ /dev/null @@ -1,6 +0,0 @@ -if [ "$TMUX" != "" ] -then - PS1_USER="38;5;53" -else - PS1_USER="38;5;40" -fi diff --git a/net:lan.theoris.fr/Environment.zsh b/net:lan.theoris.fr/Environment.zsh deleted file mode 100644 index 05be04d..0000000 --- a/net:lan.theoris.fr/Environment.zsh +++ /dev/null @@ -1 +0,0 @@ -export MUSICPLAYER=audacious diff --git a/net:opera.openwide.fr/Sanity.zsh b/net:opera.openwide.fr/Sanity.zsh deleted file mode 100644 index 300e92f..0000000 --- a/net:opera.openwide.fr/Sanity.zsh +++ /dev/null @@ -1 +0,0 @@ -umask 002 diff --git a/net:opera.openwide.fr/host:groumpf/Colors.zsh b/net:opera.openwide.fr/host:groumpf/Colors.zsh deleted file mode 100644 index ef903a1..0000000 --- a/net:opera.openwide.fr/host:groumpf/Colors.zsh +++ /dev/null @@ -1,7 +0,0 @@ - -#PS1_USER=$color[red] -#PS1_ROOT=$color[black] - -PS1_USER="38;5;69" -PS1_ROOT=$color[red] - diff --git a/net:opera.openwide.fr/host:openwide-desktop/Environment.zsh b/net:opera.openwide.fr/host:openwide-desktop/Environment.zsh deleted file mode 100644 index f5588d0..0000000 --- a/net:opera.openwide.fr/host:openwide-desktop/Environment.zsh +++ /dev/null @@ -1,4 +0,0 @@ - -PS1_USER=$color[yellow] - -source /etc/dash.conf diff --git a/net:opera.openwide.fr/host:patate/user:hugues/Aliases.zsh b/net:opera.openwide.fr/host:patate/user:hugues/Aliases.zsh deleted file mode 100644 index a2832cd..0000000 --- a/net:opera.openwide.fr/host:patate/user:hugues/Aliases.zsh +++ /dev/null @@ -1,3 +0,0 @@ - -a vim=$EDITOR - diff --git a/net:opera.openwide.fr/host:patate/user:hugues/Environment.zsh b/net:opera.openwide.fr/host:patate/user:hugues/Environment.zsh deleted file mode 100644 index 7862fa1..0000000 --- a/net:opera.openwide.fr/host:patate/user:hugues/Environment.zsh +++ /dev/null @@ -1,3 +0,0 @@ -export EDITOR=~/sbin/vim -export VISUAL=$EDITOR -export FCEDIT=$EDITOR diff --git a/net:opera.openwide.fr/host:vlab/Environment.zsh b/net:opera.openwide.fr/host:vlab/Environment.zsh deleted file mode 100644 index 17a5003..0000000 --- a/net:opera.openwide.fr/host:vlab/Environment.zsh +++ /dev/null @@ -1,3 +0,0 @@ - -PS1_USER=$color[red] - diff --git a/net:osn.sagem/Prompts.zsh b/net:osn.sagem/Prompts.zsh deleted file mode 100644 index eae5bfa..0000000 --- a/net:osn.sagem/Prompts.zsh +++ /dev/null @@ -1,13 +0,0 @@ - -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" " -} - - diff --git a/net:osn.sagem/host:osnp1260077/Environment.zsh b/net:osn.sagem/host:osnp1260077/Environment.zsh deleted file mode 100644 index f868f12..0000000 --- a/net:osn.sagem/host:osnp1260077/Environment.zsh +++ /dev/null @@ -1,3 +0,0 @@ - -export PATH=$PATH:/opt/openoffice.org3/program - diff --git a/net:osn.sagem/host:osnp1260077/user:g178241 b/net:osn.sagem/host:osnp1260077/user:g178241 deleted file mode 120000 index 5f7df0c..0000000 --- a/net:osn.sagem/host:osnp1260077/user:g178241 +++ /dev/null @@ -1 +0,0 @@ -user:hugues/
\ No newline at end of file diff --git a/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh b/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh deleted file mode 100644 index 26ddb04..0000000 --- a/net:osn.sagem/host:osnp1260077/user:hugues/Environment.zsh +++ /dev/null @@ -1,53 +0,0 @@ -#--------[ UserDir ]------------------------------------------------- -[ "$LOGNAME" = "g178241" ] && HOME=~hugues - -#--------[ Hashes ]------------------------------------------------- -hash -d work=~/Wr0k -hash -d targets=/targets -hash -d tools=~work/t00lz - -#--------[ Generic Config ]----------------------------------------- -#eval $(~tools/sagem-script44/set-env.pl 2>/dev/null) -source ~/.env - -#--------[ Specific Config ]---------------------------------------- - -#STLinux 2.2 -#export STLINUXRELEASE=${STLINUXRELEASE:-2.2} -#export ST40RELEASE=${ST403RELEASE:-3.1.1_patch1} -#STLinux 2.3 -export STLINUXRELEASE=${STLINUXRELEASE:-2.3} -export ST40RELEASE=${ST403RELEASE:-4.1.1} - -export STLINUXBASE=/opt/STM/STLinux-$STLINUXRELEASE -export STLINUXROOT=$STLINUXBASE/devkit/sh4/ - -#export FORGE=http://g178241@forge-urd44.osn.sagem/svn/ -export GET_KERNEL_METHOD=svn -#export GET_KERNEL_METHOD=git - -export KERNEL_PATH_BASE=~work/Kernel/exports/ -export COMP=ARCH=sh\ CROSS_COMPILE=sh4-linux- -export TARGET_PATH=~targets/target - - -export THIRDPARTYLIBS=~work/3rdparty/lib - -export PATH=$PATH:$STLINUXROOT/bin -export PATH=$PATH:$STLINUXBASE/host/bin -export PATH=$PATH:/opt/STM/ST40R$ST40RELEASE/bin -export PATH=~/local/bin:~/local/sbin:$PATH - -#--------[ Shared Folders ]----------------------------------------- -hash -d K:=/media/osn01001/Projets_STB -hash -d J:=/media/osn02001/Echanges - -# proxy -if cmd_exists tsocks -then - . tsocks -on -else - export http_proxy="http://190.99.3.97:3128" - export ftp_proxy=$http_proxy -fi - diff --git a/net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh b/net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh deleted file mode 120000 index 19de494..0000000 --- a/net:osn.sagem/host:osnp1260077/user:hugues/KeyBindings.zsh +++ /dev/null @@ -1 +0,0 @@ -../../../net:sweethome/host:paranoid/user:hugues/KeyBindings.zsh
\ No newline at end of file diff --git a/net:osn.sagem/user:g178241 b/net:osn.sagem/user:g178241 deleted file mode 120000 index 1941e64..0000000 --- a/net:osn.sagem/user:g178241 +++ /dev/null @@ -1 +0,0 @@ -../user:hugues/
\ No newline at end of file diff --git a/net:osn.sagem/user:root/Exec.zsh b/net:osn.sagem/user:root/Exec.zsh deleted file mode 100644 index 6522a96..0000000 --- a/net:osn.sagem/user:root/Exec.zsh +++ /dev/null @@ -1,3 +0,0 @@ - -< /var/log/sudo.log sed 's/^\([^ ]\)/---> \1/' | awk 'BEGIN { RS="---> " ; FS=" ;" } ! /COMMAND=\/usr\/bin\/zsh/ { printf $0 }' > /var/log/.sudo.log && mv -f /var/log/.sudo.log /var/log/sudo.log - diff --git a/net:sagem.ads.sagem/Colors.zsh b/net:sagem.ads.sagem/Colors.zsh deleted file mode 100644 index ce8fe26..0000000 --- a/net:sagem.ads.sagem/Colors.zsh +++ /dev/null @@ -1,6 +0,0 @@ -if [ "$TMUX" != "" ] -then - PS1_USER="38;5;55" -else - PS1_USER="38;5;54" -fi diff --git a/net:sweethome/host:paranoid/user:hugues/KeyBindings.zsh b/net:sweethome/host:paranoid/user:hugues/KeyBindings.zsh deleted file mode 100644 index 3eb2808..0000000 --- a/net:sweethome/host:paranoid/user:hugues/KeyBindings.zsh +++ /dev/null @@ -1 +0,0 @@ -[ -d ~$USER/.procmail ] && bindkey -s 'm' 'Q mails\n' diff --git a/user:hugues/Aliases.zsh b/user:hugues/Aliases.zsh index c8f16ec..1d788af 100644 --- a/user:hugues/Aliases.zsh +++ b/user:hugues/Aliases.zsh @@ -45,6 +45,7 @@ autoload zmv a mmv='noglob zmv -W' normal_user && cmd_exists apt-get && a apt-get='sudo apt-get' +normal_user && cmd_exists pacman && a pacman='sudo pacman' a rt='find -maxdepth 1 -type f \( -name "*~" -o -name ".*~" -o -name "#*#" -o -name ".*.swp" \) -exec rm -vf \{\} \;' a RT='find -type f \( -name "*~" -o -name ".*~" -o -name "#*#" -o -name ".*.swp" \) -exec rm -vf \{\} \;' diff --git a/user:hugues/Environment.zsh b/user:hugues/Environment.zsh index c29e13d..6dc32aa 100644 --- a/user:hugues/Environment.zsh +++ b/user:hugues/Environment.zsh @@ -23,7 +23,7 @@ export GIT_COMMITTER_NAME=$FULLNAME export BC_ENV_ARGS="-q" ## Editeur par défaut -export EDITOR=`which -p vim || which -p vi || which -p emacs` +export EDITOR=`\which -p vim || \which -p vi || \which -p emacs` export VISUAL=$EDITOR export FCEDIT=$EDITOR @@ -47,6 +47,7 @@ done # Couleurs pour grep --color=auto export GREP_COLOR=$color[yellow]\;$color[bold] +export GREP_COLORS="sl="":cx="$color[cyan]":ms="$color[yellow]";"$color[bold]":mc="$color[red]";"$color[bold]"" cmd_exists dircolors && eval $(dircolors ~/.dir_colors) export TZ="Europe/Paris" diff --git a/user:hugues/KeyBindings.zsh b/user:hugues/KeyBindings.zsh index b671415..941cb1e 100644 --- a/user:hugues/KeyBindings.zsh +++ b/user:hugues/KeyBindings.zsh @@ -209,6 +209,9 @@ do bindkey -M $keymap -s 'é' ' 2>/dev/null ' bindkey -M $keymap -s '2' ' 2>&1 ' + bindkey -M $keymap -s 'c' 'Q ./configure\n' + bindkey -M $keymap -s '©' 'Q !?configure\n' + bindkey -M $keymap -s 'm' 'Q make\n' bindkey -M $keymap -s 'M' 'Q make\n' @@ -216,7 +219,7 @@ do bindkey -M $keymap -s ' ' '\\ ' - bindkey -M $keymap -s 'g' 'Q git status\n' + bindkey -M $keymap -s 'g' 'Q git st .\n' bindkey -M $keymap -s 'G' 'Q git remote -v update\n' bindkey -M $keymap -s 'S' 'Q sudo !!' |