From 91b84c4d809ef2110097b34034ad321db4993ea5 Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Wed, 24 Jul 2024 14:49:35 +0400 Subject: [PATCH 1/3] Add Distrobox indication support Distrobox is a modern containerized tool to run development workflows in the isolated spaces. --- zsh/prompts/fat0troll.zsh | 5 ++++- zsh/prompts/pztrn.zsh | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/zsh/prompts/fat0troll.zsh b/zsh/prompts/fat0troll.zsh index 5266b06..20401ab 100644 --- a/zsh/prompts/fat0troll.zsh +++ b/zsh/prompts/fat0troll.zsh @@ -23,10 +23,13 @@ prompt_fat0troll_setup () { vars['brackets_end']="%{$fg[yellow]%}]%{$reset_color%}" # Session-dependend colorizing. - # Local will be black, remote - yellow. + # Local will be black, remote and Distrobox - yellow. if [[ -n $SSH_TTY ]]; then vars['console']="$vars['brackets_start']SSH$vars['brackets_end']" vars['default_color']="%{$fg[cyan]%}" + elif [[ test -e /run/.containerenv -o -e /.dockerenv ]]; then + vars['console']="$vars['brackets_start']Distrobox$vars['brackets_end']" + vars['default_color']="%{$fg[cyan]%}" else vars['console']="" vars['default_color']="%{$fg[green]%}" diff --git a/zsh/prompts/pztrn.zsh b/zsh/prompts/pztrn.zsh index 2866945..5ea793d 100644 --- a/zsh/prompts/pztrn.zsh +++ b/zsh/prompts/pztrn.zsh @@ -21,12 +21,17 @@ prompt_pztrn_setup () { precmd_functions=(${precmd_functions[@]} "prompt_pztrn_gitinfo" "prompt_pztrn_createprompt") # Session-dependend colorizing. - # Local will be black, remote - yellow. + # Local will be black, remote and Distrobox - yellow. if [[ -n $SSH_TTY ]]; then vars['brackets_start']="%{$fg[yellow]%}[%{$reset_color%}" vars['brackets_end']="%{$fg[yellow]%}]%{$reset_color%}" vars['console']="$vars['brackets_start']SSH$vars['brackets_end']" vars['default_color']="%{$fg[cyan]%}" + elif [[ test -e /run/.containerenv -o -e /.dockerenv ]]; then + vars['brackets_start']="%{$fg[yellow]%}[%{$reset_color%}" + vars['brackets_end']="%{$fg[yellow]%}]%{$reset_color%}" + vars['console']="$vars['brackets_start']Distrobox$vars['brackets_end']" + vars['default_color']="%{$fg[cyan]%}" else vars['brackets_start']="%{$reset_color%}%{$fg[gray]%}[%{$reset_color%}" vars['brackets_end']="%{$reset_color%}%{$fg[gray]%}]%{$reset_color%}" -- 2.45.2 From 60daeca14cfb06a9d1a647f16fc479678ec71ee8 Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Wed, 24 Jul 2024 14:53:11 +0400 Subject: [PATCH 2/3] Use box emoji for Distrobox indication We're in 2024 anyway, so emojis in terminal are kinda okay. --- zsh/prompts/fat0troll.zsh | 4 ++-- zsh/prompts/pztrn.zsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zsh/prompts/fat0troll.zsh b/zsh/prompts/fat0troll.zsh index 20401ab..4b86645 100644 --- a/zsh/prompts/fat0troll.zsh +++ b/zsh/prompts/fat0troll.zsh @@ -27,8 +27,8 @@ prompt_fat0troll_setup () { if [[ -n $SSH_TTY ]]; then vars['console']="$vars['brackets_start']SSH$vars['brackets_end']" vars['default_color']="%{$fg[cyan]%}" - elif [[ test -e /run/.containerenv -o -e /.dockerenv ]]; then - vars['console']="$vars['brackets_start']Distrobox$vars['brackets_end']" + elif test -e /run/.containerenv -o -e /.dockerenv; then + vars['console']="$vars['brackets_start']📦$vars['brackets_end']" vars['default_color']="%{$fg[cyan]%}" else vars['console']="" diff --git a/zsh/prompts/pztrn.zsh b/zsh/prompts/pztrn.zsh index 5ea793d..f7ad0d6 100644 --- a/zsh/prompts/pztrn.zsh +++ b/zsh/prompts/pztrn.zsh @@ -27,10 +27,10 @@ prompt_pztrn_setup () { vars['brackets_end']="%{$fg[yellow]%}]%{$reset_color%}" vars['console']="$vars['brackets_start']SSH$vars['brackets_end']" vars['default_color']="%{$fg[cyan]%}" - elif [[ test -e /run/.containerenv -o -e /.dockerenv ]]; then + elif test -e /run/.containerenv -o -e /.dockerenv; then vars['brackets_start']="%{$fg[yellow]%}[%{$reset_color%}" vars['brackets_end']="%{$fg[yellow]%}]%{$reset_color%}" - vars['console']="$vars['brackets_start']Distrobox$vars['brackets_end']" + vars['console']="$vars['brackets_start']📦$vars['brackets_end']" vars['default_color']="%{$fg[cyan]%}" else vars['brackets_start']="%{$reset_color%}%{$fg[gray]%}[%{$reset_color%}" -- 2.45.2 From d5739f19ec72a16704fb5c42485a8b231cbcef42 Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Thu, 25 Jul 2024 13:21:46 +0400 Subject: [PATCH 3/3] Update comment --- zsh/prompts/fat0troll.zsh | 2 +- zsh/prompts/pztrn.zsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zsh/prompts/fat0troll.zsh b/zsh/prompts/fat0troll.zsh index 4b86645..5eb07de 100644 --- a/zsh/prompts/fat0troll.zsh +++ b/zsh/prompts/fat0troll.zsh @@ -23,7 +23,7 @@ prompt_fat0troll_setup () { vars['brackets_end']="%{$fg[yellow]%}]%{$reset_color%}" # Session-dependend colorizing. - # Local will be black, remote and Distrobox - yellow. + # Local will be black, remote and containers - yellow. if [[ -n $SSH_TTY ]]; then vars['console']="$vars['brackets_start']SSH$vars['brackets_end']" vars['default_color']="%{$fg[cyan]%}" diff --git a/zsh/prompts/pztrn.zsh b/zsh/prompts/pztrn.zsh index f7ad0d6..2b5a0cb 100644 --- a/zsh/prompts/pztrn.zsh +++ b/zsh/prompts/pztrn.zsh @@ -21,7 +21,7 @@ prompt_pztrn_setup () { precmd_functions=(${precmd_functions[@]} "prompt_pztrn_gitinfo" "prompt_pztrn_createprompt") # Session-dependend colorizing. - # Local will be black, remote and Distrobox - yellow. + # Local will be black, remote and containers - yellow. if [[ -n $SSH_TTY ]]; then vars['brackets_start']="%{$fg[yellow]%}[%{$reset_color%}" vars['brackets_end']="%{$fg[yellow]%}]%{$reset_color%}" -- 2.45.2