From 570e726884b8a121397484a4bd29f321927cdd6f Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Sun, 16 Nov 2014 11:08:35 -0500 Subject: [PATCH] Added liquidprompt and liquidpromptrc. Fixed terminal colors --- scripts/sync.sh | 1 + shells/Xresources | 148 ++++++------------------------------------ shells/liquidpromptrc | 6 ++ shells/zshrc | 5 +- vim/vimrc | 2 +- 5 files changed, 30 insertions(+), 132 deletions(-) create mode 100644 shells/liquidpromptrc diff --git a/scripts/sync.sh b/scripts/sync.sh index 53f0ac1..32a7b77 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -74,6 +74,7 @@ while getopts ":hbsdclw" VALUE "$@"; do fi # Install antigen bundles zsh -c "source ~/.zshrc;exit" + ln -s $ABSPATH/shells/liquidpromptrc /home/stonewareslord/.config/liquidpromptrc if [ "$(uname)" != "Darwin" ]; then if which trash >/dev/null; then trash ~/.i3/config ~/.i3/sleep.sh ~/.i3/wall.sh ~/.Xmodmap ~/.xsession ~/.Xresources diff --git a/shells/Xresources b/shells/Xresources index 02fbb67..9873fef 100644 --- a/shells/Xresources +++ b/shells/Xresources @@ -13,132 +13,22 @@ xterm*selectToClipboard: true Home: string(0x01)\n\ End: string(0x05)\n -XTerm*foreground : #bea492 -XTerm*background : #181512 -XTerm*cursorColor : #bea492 -XTerm*color0 : #332d29 -XTerm*color8 : #817267 -XTerm*color1 : #8c644c -XTerm*color9 : #9f7155 -XTerm*color2 : #746c48 -XTerm*color10 : #857b52 -XTerm*color3 : #908a66 -XTerm*color11 : #9c956e -XTerm*color4 : #646a6d -XTerm*color12 : #71777a -XTerm*color5 : #605655 -XTerm*color13 : #656565 -XTerm*color6 : #4b5c5e -XTerm*color14 : #556d70 -XTerm*color7 : #504339 -XTerm*color15 : #9a875f - -!BLK Cursor -#define _color0 #ffffff -#define _color8 #ffffff -!RED Tag -#define _color1 #ff0000 -#define _color9 #ff0000 -!GRN SpecialKey -#define _color2 #ff5f00 -#define _color10 #ff5f00 -!YEL Keyword -#define _color3 #ffff00 -#define _color11 #ffff00 -!BLU Number -#define _color4 #00d7ff -#define _color12 #00d7ff -!MAG Precondit -#define _color5 #ff0087 -#define _color13 #ff0087 -!CYN Float -#define _color6 #0087ff -#define _color14 #0087ff -!WHT Search -#define _color7 #ffffff -#define _color15 #ffffff -!FMT Include, StatusLine, ErrorMsg -#define _colorBD #ffcfaf -#define _colorUL #ccdc90 -#define _colorIT #80d4aa -!TXT Normal, Normal, Cursor -#define _foreground #ffffff -#define _background #121212 -!#define _background #121212 -#define _cursorColor #8faf9f -!!BLK Cursor -!#define _color0 #000d18 -!#define _color8 #000d18 -!!RED Tag -!#define _color1 #e89393 -!#define _color9 #e89393 -!!GRN SpecialKey -!#define _color2 #9ece9e -!#define _color10 #9ece9e -!!YEL Keyword -!#define _color3 #f0dfaf -!#define _color11 #f0dfaf -!!BLU Number -!#define _color4 #8cd0d3 -!#define _color12 #8cd0d3 -!!MAG Precondit -!#define _color5 #c0bed1 -!#define _color13 #c0bed1 -!!CYN Float -!#define _color6 #dfaf8f -!#define _color14 #dfaf8f -!!WHT Search -!#define _color7 #efefef -!#define _color15 #efefef -!!FMT Include, StatusLine, ErrorMsg -!#define _colorBD #ffcfaf -!#define _colorUL #ccdc90 -!#define _colorIT #80d4aa -!!TXT Normal, Normal, Cursor -!#define _foreground #dcdccc -!#define _background #1f1f1f -!#define _cursorColor #8faf9f -! URxvt*color0 : _color0 -! URxvt*color1 : _color1 -! URxvt*color2 : _color2 -! URxvt*color3 : _color3 -! URxvt*color4 : _color4 -! URxvt*color5 : _color5 -! URxvt*color6 : _color6 -! URxvt*color7 : _color7 -! URxvt*color8 : _color8 -! URxvt*color9 : _color9 -! URxvt*color10 : _color10 -! URxvt*color11 : _color11 -! URxvt*color12 : _color12 -! URxvt*color13 : _color13 -! URxvt*color14 : _color14 -! URxvt*color15 : _color15 -! URxvt*colorBD : _colorBD -! URxvt*colorIT : _colorIT -! URxvt*colorUL : _colorUL -! URxvt*foreground : _foreground -! URxvt*background : _background -! URxvt*cursorColor : _cursorColor -XTerm*color0 : _color0 -XTerm*color1 : #008e00 -XTerm*color2 : #00ff00 -XTerm*color3 : _color2 -XTerm*color4 : _color4 -XTerm*color5 : _color5 -XTerm*color6 : _color6 -XTerm*color7 : _color7 -XTerm*color8 : _color8 -XTerm*color9 : _color10 -XTerm*color10 : #00ff00 -XTerm*color11 : _color11 -XTerm*color12 : _color12 -XTerm*color13 : _color13 -XTerm*color14 : _color14 -XTerm*color15 : _color15 -XTerm*colorBD : _colorBD -XTerm*colorIT : _colorIT -XTerm*colorUL : _colorUL -XTerm*foreground : _foreground -XTerm*background : _background -XTerm*cursorColor : _cursorColor +XTerm*foreground: #ffffff +XTerm*background: #121212 +XTerm*cursorColor: #ffffff +XTerm*color0: #121212 +XTerm*color8: #606060 +XTerm*color1: #ff0000 +XTerm*color9: #ff5f00 +XTerm*color2: #00ff00 +XTerm*color10: #00ff00 +XTerm*color3: #ffff00 +XTerm*color11: #ffff00 +XTerm*color4: #0087ff +XTerm*color12: #0087ff +XTerm*color5: #ff0087 +XTerm*color13: #ff0087 +XTerm*color6: #00d7ff +XTerm*color14: #00d7ff +XTerm*color7: #ffffff +XTerm*color15: #ffffff diff --git a/shells/liquidpromptrc b/shells/liquidpromptrc new file mode 100644 index 0000000..ddc3bb7 --- /dev/null +++ b/shells/liquidpromptrc @@ -0,0 +1,6 @@ +LP_ENABLE_GIT=0 +LP_ENABLE_TIME=1 +LP_ENABLE_BATT=1 +LP_ENABLE_SSH_COLORS=1 +LP_USER_ALWAYS=0 +# vim: ft=sh: diff --git a/shells/zshrc b/shells/zshrc index 1e69f5c..1a6203b 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -15,12 +15,12 @@ setopt EXTENDED_HISTORY export PAGER=/usr/bin/w3m alias less=$PAGER alias zless=$PAGER - source "$HOME/.antigen/antigen.zsh" antigen bundle stonewareslord/oh-my-git #antigen bundle arialdomartini/oh-my-git antigen use oh-my-zsh antigen theme stonewareslord/oh-my-git-themes af-magic +antigen bundle stonewareslord/liquidprompt antigen apply # Would you like to use another custom folder than $ZSH/custom? @@ -36,6 +36,7 @@ export EDITOR='vim' if [ "$(uname)" != "Darwin" ]; then alias ls='ls --color=always -F' fi +alias pass='DISPLAY= pass' alias ehistory='cat ~/.bash_eternal_history|egrep -iP $@' alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"' alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' @@ -90,7 +91,7 @@ alias fvim="vim -u NONE +\"so ~/.vim/bundle/flappyvird-vim/plugin/flappyvird.vim alias fk='k `fzf --no-mouse -m -1 -x`' alias fh='eval $(([ -n "$ZSH_NAME" ] && fc --no-mouse -m -1 -x -l 1 || history) | fzf +s | sed "s/ *[0-9]* *//")' alias fkill='ps -ef | sed 1d | fzf --no-mouse -m -1 -x | awk "{print $2}" | xargs kill -${1:-9}' -alias slp='smon ./x&i3lock -di `echo $(shuf -n1 -e ~/.i3/wall/*) | tee /tmp/wall`' +alias slp='smon ./x&DISPLAY=:0.0 i3lock -di `echo $(shuf -n1 -e ~/.i3/wall/*) | tee /tmp/wall`' alias -s html="firefox" alias -s log="less -MN" alias -s odt="libreoffice" diff --git a/vim/vimrc b/vim/vimrc index 45d1bf3..82ab31c 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -318,7 +318,7 @@ Plugin 'Rykka/colorv.vim' " "Autoclose brackets | https://github.com/Townk/vim-autoclose Plugin 'mhinz/vim-signify' "Git information inline | https://github.com/mhinz/vim-signify -Bundle 'jamessan/vim-gnupg' +Plugin 'jamessan/vim-gnupg' " | https://github.com/jamessan/vim-gnupg " | "DO NOT DELETE LINE ABOVE OR \bun WILL BREAK