diff --git a/.gitmodules b/.gitmodules index d6bf699..cfcbd12 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "fonts/codeface"] path = fonts/codeface url = https://github.com/chrissimpkins/codeface -[submodule "powerline-shell"] - path = powerline-shell - url = https://github.com/banga/powerline-shell.git diff --git a/powerlevel_vars b/powerlevel_vars new file mode 100644 index 0000000..8790f0f --- /dev/null +++ b/powerlevel_vars @@ -0,0 +1,16 @@ +POWERLEVEL9K_MODE=nerdfont-complete +POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=( root_indicator ssh virtualenv context dir disk_usage ram newline vcs ) +POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status background_jobs battery os_icon time ) +POWERLEVEL9K_BATTERY_STAGES=( + $'▏ ▏' $'▎ ▏' $'▍ ▏' $'▌ ▏' $'▋ ▏' $'▊ ▏' $'▉ ▏' $'█ ▏' + $'█▏ ▏' $'█▎ ▏' $'█▍ ▏' $'█▌ ▏' $'█▋ ▏' $'█▊ ▏' $'█▉ ▏' $'██ ▏' + $'██ ▏' $'██▎ ▏' $'██▍ ▏' $'██▌ ▏' $'██▋ ▏' $'██▊ ▏' $'██▉ ▏' $'███ ▏' + $'███ ▏' $'███▎ ▏' $'███▍ ▏' $'███▌ ▏' $'███▋ ▏' $'███▊ ▏' $'███▉ ▏' $'████ ▏' + $'████ ▏' $'████▎▏' $'████▍▏' $'████▌▏' $'████▋▏' $'████▊▏' $'████▉▏' $'█████▏' ) +POWERLEVEL9K_VCS_GIT_GITLAB_ICON=🤘 +POWERLEVEL9K_USER_ROOT_BACKGROUND=red +POWERLEVEL9K_USER_ROOT_FOREGROUND=white +POWERLEVEL9K_DIR_DEFAULT_BACKGROUND=202 +POWERLEVEL9K_DIR_DEFAULT_FOREGROUND=020 +POWERLEVEL9K_HOST_REMOTE_BACKGROUND=016 +POWERLEVEL9K_HOST_REMOTE_FOREGROUND=082 diff --git a/powerline-shell b/powerline-shell deleted file mode 160000 index 800b9cd..0000000 --- a/powerline-shell +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 800b9cdac77ff0dccd88b5dfc8c81a478ed1c544 diff --git a/zshrc b/zshrc index b11d664..fd4901a 100644 --- a/zshrc +++ b/zshrc @@ -2,8 +2,8 @@ echo "Loading zgen..." source ~/bin/zgen/zgen.zsh - source ~/bin/fixcolors + HIST_STAMPS="yyyy-mm-dd" HISTFILE=~/.histfile HISTSIZE=2000 @@ -11,9 +11,7 @@ SAVEHIST=2000 setopt appendhistory autocd extendedglob if [ -x /usr/bin/xset ]; then - if [ ${DISPLAY} ]; then - xset -b - fi + xset -b fi if [[ ${TERM} == st* ]]; then @@ -28,11 +26,7 @@ export LESS="-X -R -F" alias http='python -m http.server' export PATH=$HOME/bin:/usr/local/bin:$PATH export PAGER=most -alias t=todo.sh export EDITOR=mg -export VISUAL=emacs -export PAGER=most -export TERMINAL=${HOME}/bin/quickterm.sh autoload insert-composed-char zle -N insert-composed-char @@ -61,16 +55,20 @@ if ! zgen saved; then zgen load Tarrasch/zsh-bd zgen load Tarrasch/zsh-colors zgen load supercrabtree/k - zgen load bobsoppe/zsh-ssh-agent zgen save fi -. ~/bin/aliases +#prompt fire 178 142 106 070 034 -#prompt fire 125 234 084 054 020 -# powerline -#source ~/.local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh -source ~/bin/powerline-shell-init +. ~/bin/aliases +if [[ ${TERM} == linux ]]; then + prompt pure +else + . ~/bin/powerlevel_vars + prompt powerlevel9k +fi + +#alias t=todo.sh unalias rm unalias mv