Compare commits

6 Commits

Author SHA1 Message Date
b9a618a514 Add Distrobox indication support (#15)
Distrobox is a modern containerized tool to run development workflows in
the isolated spaces.

Reviewed-on: misc/zsh-config#15
Co-authored-by: Vladimir Hodakov <vladimir@hodakov.me>
Co-committed-by: Vladimir Hodakov <vladimir@hodakov.me>
2024-07-25 14:29:40 +05:00
8d24043cf4 Merge pull request 'Add EndeavourOS support' (#14) from hdkv/zsh-config:hdkv/more_distros into master
Reviewed-on: misc/zsh-config#14
2024-07-24 15:31:51 +05:00
f5b7346b27 Add EndeavourOS support
EndeavourOS is an Arch-based distro with Calamares installer.
2024-07-24 14:27:31 +04:00
5c2a949d3b Fix zsh-autosuggestions enablement. 2023-07-04 21:36:02 +05:00
aab95d22c9 Merge pull request 'Fix grep 3.8 warnings' (#13) from hdkv/zsh-config:hdkv/fix_grep_warnings into master
Reviewed-on: misc/zsh-config#13
2023-04-25 15:07:16 +05:00
fe6e3d0c8a Fix grep 3.8 warnings 2022-10-06 11:30:53 +04:00
4 changed files with 13 additions and 7 deletions

View File

@@ -145,7 +145,7 @@ function gitinfo_get_stashes()
###################################################################### ######################################################################
function gitinfo_get_untracked() function gitinfo_get_untracked()
{ {
GITINFO_UNTRACKED_COUNT=`LC_ALL=C git status | grep -v "be\ committed\|On\ branch\|nothing\ added\|Untracked\ files\|git\ add\|Your\ branch\|new\ file\|git\ reset\|nothing\ to\ commit\|not\ staged\|git\ checkout\|modified\:" | sed '/^$/d' | wc -l | sed "s/ //g"` GITINFO_UNTRACKED_COUNT=`LC_ALL=C git status | grep -v "be committed|On branch|nothing added|Untracked files|git add|Your branch|new file|git reset|nothing to commit|not staged|git checkout|modified:" | sed '/^$/d' | wc -l | sed "s/ //g"`
} }

View File

@@ -1,11 +1,9 @@
AUTOSUGGESTIONS_PATH="" AUTOSUGGESTIONS_PATH="/usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
if [ "${DISTRO}" = "Arch" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi if [ "${DISTRO}" = "Arch" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
if [ "${DISTRO}" = "Debian" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi if [ "${DISTRO}" = "EnveavourOS" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
if [ "${DISTRO}" = "Raspbian" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
if [[ "${DISTRO}" = "Darwin" && "${OS_ARCH}" == "arm64" ]]; then AUTOSUGGESTIONS_PATH="/opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi if [[ "${DISTRO}" = "Darwin" && "${OS_ARCH}" == "arm64" ]]; then AUTOSUGGESTIONS_PATH="/opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
if [[ "${DISTRO}" = "Darwin" && "${OS_ARCH}" == "x86_64" ]]; then AUTOSUGGESTIONS_PATH="/usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi if [[ "${DISTRO}" = "Darwin" && "${OS_ARCH}" == "x86_64" ]]; then AUTOSUGGESTIONS_PATH="/usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
if [ "${DISTRO}" = "Ubuntu" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh"; fi
if [ "${DISTRO}" = "VoidLinux" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions.zsh"; fi if [ "${DISTRO}" = "VoidLinux" ]; then AUTOSUGGESTIONS_PATH="/usr/share/zsh/plugins/zsh-autosuggestions.zsh"; fi
if [ -f "${AUTOSUGGESTIONS_PATH}" ]; then if [ -f "${AUTOSUGGESTIONS_PATH}" ]; then

View File

@@ -23,10 +23,13 @@ prompt_fat0troll_setup () {
vars['brackets_end']="%{$fg[yellow]%}]%{$reset_color%}" vars['brackets_end']="%{$fg[yellow]%}]%{$reset_color%}"
# Session-dependend colorizing. # Session-dependend colorizing.
# Local will be black, remote - yellow. # Local will be black, remote and containers - yellow.
if [[ -n $SSH_TTY ]]; then if [[ -n $SSH_TTY ]]; then
vars['console']="$vars['brackets_start']SSH$vars['brackets_end']" vars['console']="$vars['brackets_start']SSH$vars['brackets_end']"
vars['default_color']="%{$fg[cyan]%}" vars['default_color']="%{$fg[cyan]%}"
elif test -e /run/.containerenv -o -e /.dockerenv; then
vars['console']="$vars['brackets_start']📦$vars['brackets_end']"
vars['default_color']="%{$fg[cyan]%}"
else else
vars['console']="" vars['console']=""
vars['default_color']="%{$fg[green]%}" vars['default_color']="%{$fg[green]%}"

View File

@@ -21,12 +21,17 @@ prompt_pztrn_setup () {
precmd_functions=(${precmd_functions[@]} "prompt_pztrn_gitinfo" "prompt_pztrn_createprompt") precmd_functions=(${precmd_functions[@]} "prompt_pztrn_gitinfo" "prompt_pztrn_createprompt")
# Session-dependend colorizing. # Session-dependend colorizing.
# Local will be black, remote - yellow. # Local will be black, remote and containers - yellow.
if [[ -n $SSH_TTY ]]; then if [[ -n $SSH_TTY ]]; then
vars['brackets_start']="%{$fg[yellow]%}[%{$reset_color%}" vars['brackets_start']="%{$fg[yellow]%}[%{$reset_color%}"
vars['brackets_end']="%{$fg[yellow]%}]%{$reset_color%}" vars['brackets_end']="%{$fg[yellow]%}]%{$reset_color%}"
vars['console']="$vars['brackets_start']SSH$vars['brackets_end']" vars['console']="$vars['brackets_start']SSH$vars['brackets_end']"
vars['default_color']="%{$fg[cyan]%}" 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']📦$vars['brackets_end']"
vars['default_color']="%{$fg[cyan]%}"
else else
vars['brackets_start']="%{$reset_color%}%{$fg[gray]%}[%{$reset_color%}" vars['brackets_start']="%{$reset_color%}%{$fg[gray]%}[%{$reset_color%}"
vars['brackets_end']="%{$reset_color%}%{$fg[gray]%}]%{$reset_color%}" vars['brackets_end']="%{$reset_color%}%{$fg[gray]%}]%{$reset_color%}"