From d856e16a625c1f134f985c977617a6d485dabd9b Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 22 Nov 2013 14:55:39 +0100 Subject: [Compsys] files++ --- net:foret/completion/_endurance | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net:foret/completion/_endurance b/net:foret/completion/_endurance index b37a266..1af5d51 100644 --- a/net:foret/completion/_endurance +++ b/net:foret/completion/_endurance @@ -18,9 +18,11 @@ _endurance() { case "$service" in do.sh) _arguments \ - ':actions:(( $(list-commands) ))' \ - ':tests:(( $(list-tests) ))' \ - ':nodes:(( $(list-nodes) ))' + ':actions:(( $(list-commands) ))' \ + ':tests:(( $(list-tests) ))' \ + ':nodes:(( $(list-nodes) ))' + _alternative \ + '*:files: _files' ;; esac -- cgit v1.2.3 From f9553215ad2a35127aef32dab0655966ddf41be5 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 22 Nov 2013 16:17:22 +0100 Subject: zsh-syntax ++ --- zsh-syntax-highlighting | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh-syntax-highlighting b/zsh-syntax-highlighting index 4519467..f289a9f 160000 --- a/zsh-syntax-highlighting +++ b/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit 45194671af8e1d6b37b16e214a58674762ab8e49 +Subproject commit f289a9f8e7a8a1752cd88f2366e6dacf8a0036e7 -- cgit v1.2.3 From 8d49e389d45f8e0554e72fad4230f50dd7497262 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 24 Jan 2014 12:18:46 +0100 Subject: [Submodules] uses pretty-names --- 12_Prompts.zsh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/12_Prompts.zsh b/12_Prompts.zsh index f3139af..d49b947 100644 --- a/12_Prompts.zsh +++ b/12_Prompts.zsh @@ -229,10 +229,13 @@ __subvcsbranches () { # Get recursive submodules statuses for SUBMODULE in $(git config --get zsh.recurse-dirs) do - if [ -d $(dirname $GIT_DIR)/$SUBMODULE/.git -o -d $GIT_DIR/modules/$SUBMODULE ] + _sub=$(dirname $GIT_DIR)/$SUBMODULE/.git + [ ! -d $_sub ] && _sub=$(dirname $GIT_DIR)/modules/$SUBMODULE + if [ -d $_sub ] then GITBRANCH+=${GITBRANCH:+$(tput cuf1)} - GITBRANCH+=$C_$_prompt_colors[bar]$_C"[%{%B%}$SUBMODULE%{%b%}:" + _name=$(GIT_DIR=$_sub git config --get zsh.pretty-name ) + GITBRANCH+=$C_$_prompt_colors[bar]$_C"[%{%B%}"${_name:-$SUBMODULE}"%{%b%}:" GITBRANCH+=$(__get_git_fullstatus $(dirname $GIT_DIR)/$SUBMODULE) GITBRANCH+=$C_$_prompt_colors[bar]$_C"]" fi -- cgit v1.2.3 From f28647c61780df2b5cbb2473e97182d49bd244e3 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 24 Jan 2014 12:19:03 +0100 Subject: Colors. --- 60_Completion.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/60_Completion.zsh b/60_Completion.zsh index a3561a2..69dae43 100644 --- a/60_Completion.zsh +++ b/60_Completion.zsh @@ -28,5 +28,8 @@ zstyle ':completion:*' squeeze-slashes true zstyle ':completion:*' use-compctl true # End of lines added by compinstall +typeset -A ZLS_COLOURS +ZLS_COLOURS[ma]=7 + autoload -Uz compinit compinit -i -- cgit v1.2.3 From ee68c60cbd06193a377df46482031b3f35f0b5e7 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 24 Jan 2014 12:19:54 +0100 Subject: Revert "[Colors] hugues != hiegel" This reverts commit a0103af7c8fa6540ca807a229e8979e12214e1e2. --- net:foret/Prompts.zsh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net:foret/Prompts.zsh b/net:foret/Prompts.zsh index a7d6722..d93120d 100644 --- a/net:foret/Prompts.zsh +++ b/net:foret/Prompts.zsh @@ -10,11 +10,6 @@ _prompt_colors[target]="1;31" -if ( id | grep -q Integration ) -then - sc "38;5;54" -fi - __static_dynamic () { [ $(( ${STATIC:-$(( 1 ^ ${DYNAMIC:-0} ))} + ${DYNAMIC:-$(( 1 ^ ${STATIC:-0} ))} )) -lt 2 ] && \ -- cgit v1.2.3 From 365c1000b0c55d1e96c9c8469a97ed690ae394ef Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 24 Jan 2014 12:20:15 +0100 Subject: hiegel / hugues account fuckup --- net:foret/user:hiegel/Hashes.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/net:foret/user:hiegel/Hashes.zsh b/net:foret/user:hiegel/Hashes.zsh index 8f564ca..fc58d3c 100644 --- a/net:foret/user:hiegel/Hashes.zsh +++ b/net:foret/user:hiegel/Hashes.zsh @@ -1,4 +1,5 @@ hash -d work=/work/$USER hash -d share=/share/public/hugues +hash -d hugues=/home/hugues -- cgit v1.2.3 From 438448c867ca7afda907f17a884b417a1743ac05 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 24 Jan 2014 12:20:37 +0100 Subject: [Keys] don’t ask. seriously. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user:hugues/KeyBindings.zsh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/user:hugues/KeyBindings.zsh b/user:hugues/KeyBindings.zsh index 1c4a693..fb241f4 100644 --- a/user:hugues/KeyBindings.zsh +++ b/user:hugues/KeyBindings.zsh @@ -164,15 +164,9 @@ bindkey -v # This setup may change the `ESC' keybinding to `C-d'. That defeats the # possibility to exit zsh by pressing `C-d' (which usually sends EOF). # With this widget, you can type `:q' to exit the shell from vicmd. -if [ $( _process_tree | grep -o zsh | wc -l ) -gt 1 ] -then - CONFIRM_EXIT="" -else - CONFIRM_EXIT="confirm " -fi function ft-zshexit { [[ -o hist_ignore_space ]] && BUFFER=' ' - BUFFER="${BUFFER}${CONFIRM_EXIT}exit" + BUFFER="${BUFFER}exit" zle .accept-line } zle -N q ft-zshexit -- cgit v1.2.3 From a619da8a796876ac62857f54f41f444e2e12d087 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 24 Jan 2014 12:21:22 +0100 Subject: [Git] aliases. --- user:hugues/Aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user:hugues/Aliases.zsh b/user:hugues/Aliases.zsh index 435daa9..4a2322b 100644 --- a/user:hugues/Aliases.zsh +++ b/user:hugues/Aliases.zsh @@ -72,6 +72,9 @@ a lc='ls -c' a l1='\ls -1' a gitk='\gitk --date-order' +a gm='\git mergetool' +a grc='\git rebase --continue' +a gra='\git rebase --abort' __cmd_exists dict && a definition='dict -h dict.org' __cmd_exists dict && a traduction='dict -h hiegel.fr -P-' -- cgit v1.2.3