bash: ++hstr, ++git user

etc/shell/bash/bashrc

@@ -1,6 +1,6 @@
 #!/bin/bash ####################################################################
 #
-# Изменён: Ср 14 апр 2021 14:24:39
+# Изменён: ср 26 май 2021 11:22:07
 #
 ################################################################################
 
@@ -231,9 +231,10 @@ __prompt_command() {
 	# Сокращение текущей директории. В отличие от PROMPT_DIRTRIM выводит две директории в начале пути
 	local PS1_PWD=$(pwd | sed 's@'$HOME'@~@; s@^\(\([~/][^/]*\)\{2\}/\).*\(\(/[^/]*\)\{2\}\)$@\1...\3@')
 
-	local PS1_GIT=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/  \1/')
+	local PS1_GIT_USER=$(git user 2> /dev/null | sed -e 's/^/ (/' -e 's/$/)/')
+	local PS1_GIT_BRANCH=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/  \1/')
 
-	local PS1_PATH="─[\[${red}\]${VIFM_SHELL}\[${yellow}\]${PS1_PWD}\[${PROMPT_COLOR}\]\[${magenta}\]${PS1_GIT}\[${PROMPT_COLOR}\]]"
+	local PS1_PATH="─[\[${red}\]${VIFM_SHELL}\[${yellow}\]${PS1_PWD}\[${PROMPT_COLOR}\]\[${magenta}\]${PS1_GIT_BRANCH}${PS1_GIT_USER}\[${PROMPT_COLOR}\]]"
 
 	PS1="${PS1_JOBS}${PS1_HOST}${PS1_PATH}\n\[${PROMPT_COLOR}\]─[\[${PROMPT_COLOR}\]\t]"
 

etc/shell/bash/bashrc_macos

@@ -1,4 +1,4 @@
-PATH="$SHELLRC/bin:$SHELLRC/bin/scripts:$HOME/.rbenv/shims:/usr/local/opt/coreutils/libexec/gnubin/:/Applications/:~/go/bin/:~/Library/Python/3.7/bin/:$HOME/.cabal/bin:${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/bin:$PATH:~/.cargo/bin"
+PATH="$SHELLRC/bin:$SHELLRC/bin/scripts:$HOME/.rbenv/shims:/usr/local/opt/coreutils/libexec/gnubin/:/Applications/:~/go/bin/:~/Library/Python/3.9/bin/:$HOME/.cabal/bin:${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/bin:$PATH:~/.cargo/bin"
 
 # Homebrew settings
 export HOMEBREW_NO_ANALYTICS=1

etc/shell/hstr/hstr_blacklist

@@ -1,49 +0,0 @@
-startx
-.shellrc/
-dus
-alsamixer
-,ww
-ping ya.ru
-,w,w
-htop
-g url
-g df .
-g p
-g u
-vifm
-hstr
-dus *
-dus .
-vim
-docker ps
-make
-mpd
-.shellrc
-g lf
-g st
-g lu
-g ls
-docker images
-,m
-..
-.-
-g add .
-z
-~
-reload
-:q
-g u | sh
-geeqie .
-mutt
-g df
-easytag .
-./Downloads/
-cd
-hh
-kz
-mc
-ls
-g st .
-su
-shutdown -h now
-tt