Merge branch 'pztrn_changes' into 'master'

Full hostname in prompt and useful aliases

Closes #7

See merge request !4
This commit is contained in:
Stanislav Nikitin 2017-01-15 09:59:07 +03:00
commit f5c89e1f6a
4 changed files with 23 additions and 1 deletions

View File

@ -0,0 +1,9 @@
# Default aliases. They can be overriden by other files with higher
# index.
# Files navigation.
alias ls="ls --color"
alias sl="ls --color"
# Git.
alias got="git"

View File

@ -0,0 +1,6 @@
# Some good aliases for FreeBSD.
if [ "${OS/FreeBSD}" != "${OS}" ]; then
# Files navigation.
alias ls="ls -G"
fi

View File

@ -0,0 +1,6 @@
# Some good aliases for macOS.
if [ "${OS/DarwinD}" != "${OS}" ]; then
# Files navigation.
alias ls="ls -G"
fi

View File

@ -46,7 +46,8 @@ prompt_pztrn_setup () {
vars['usercolor']="%{$fg[blue]%}"
fi
p_userpwd="$vars['brackets_start']$vars['usercolor']%n$reset_color@%{$fg[magenta]%}%M$vars['brackets_end']"
p_hostname=$(hostname -f)
p_userpwd="$vars['brackets_start']$vars['usercolor']%n$reset_color@%{$fg[magenta]%}$p_hostname$vars['brackets_end']"
p_shlvlhist="$vars['brackets_start']$vars['default_color']%B%h%b$vars['brackets_end']"
p_rc="%(?..$vars['brackets_start']$fg[red]%?%1v$vars['brackets_end'])"