Merge branch 'fixthatshit' into 'home'

shell bits that needed to be fixed.

we lost some of the things with the merge request, not sure how.

See merge request !4
This commit is contained in:
Howland Owl 2016-12-09 21:06:37 +02:00
commit aa802af016
2 changed files with 7 additions and 5 deletions

View file

@ -1,5 +1,5 @@
function powerline_precmd() { function powerline_precmd() {
PS1="$(/home/truck/sturf/powerline-shell/powerline-shell.py $? --shell zsh 2> /dev/null)" PS1="$(/home/truck/sturf/banga-powerline/powerline-shell.py $? --shell zsh 2> /dev/null)"
} }
function install_powerline_precmd() { function install_powerline_precmd() {
@ -13,4 +13,4 @@ function install_powerline_precmd() {
if [ "$TERM" != "linux" ]; then if [ "$TERM" != "linux" ]; then
install_powerline_precmd install_powerline_precmd
fi fi

8
zshrc
View file

@ -9,7 +9,9 @@ SAVEHIST=2000
setopt appendhistory autocd extendedglob setopt appendhistory autocd extendedglob
if [ -x /usr/bin/xset ]; then if [ -x /usr/bin/xset ]; then
xset -b if [ -v DISPLAY]; then
xset -b
fi
fi fi
if [[ ${TERM} == st* ]]; then if [[ ${TERM} == st* ]]; then
@ -59,7 +61,7 @@ fi
. ~/bin/aliases . ~/bin/aliases
#prompt fire 125 234 084 054 020 #prompt fire 125 234 084 054 020
# powerline # powerline
#source ~/.local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh #source ~/.local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh
source ~/bin/powerline-shell-init source ~/bin/powerline-shell-init
@ -72,4 +74,4 @@ unalias cp
setopt NO_SHARE_HISTORY setopt NO_SHARE_HISTORY
setopt HIST_EXPIRE_DUPS_FIRST setopt HIST_EXPIRE_DUPS_FIRST
yellow All Done! yellow All Done!