aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--shellrc2
-rw-r--r--zshrc9
2 files changed, 3 insertions, 8 deletions
diff --git a/shellrc b/shellrc
index 6b2a11c..c112183 100644
--- a/shellrc
+++ b/shellrc
@@ -16,7 +16,7 @@ alias gdb='gdb -q'
alias cgdb='cgdb -q'
alias octave='octave-cli -q'
alias ssh='TERM="xterm-256color" ssh'
-alias feh='feh -.'
+alias feh='feh --magick-timeout 1 -.'
alias make='make -j 8'
export LESS=-R
diff --git a/zshrc b/zshrc
index 1ce5fdf..6f4944e 100644
--- a/zshrc
+++ b/zshrc
@@ -36,14 +36,9 @@ bindkey "^[[3~" delete-char
bindkey "^[3;5~" delete-char
# PROMPT #######################################################
-annoyme_check() {
- if ls ~/.annoyme/*.pid 2>/dev/null >/dev/null; then
- echo "%{$fg_bold[red]%}!"
- fi
-}
if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
PROMPT="%(?..%{$fg_bold[yellow]%}EXIT: %?
-)\$(annoyme_check)%{$fg_bold[$NCOLOR]%}%n@%m:%{$fg_bold[blue]%}%1~%{$fg_bold[$NCOLOR]%}%(!.#.$)%{$reset_color%} "
+)%{$fg_bold[$NCOLOR]%}%n@%m:%{$fg_bold[blue]%}%1~%{$fg_bold[$NCOLOR]%}%(!.#.$)%{$reset_color%} "
if [ -e ~/.local/git-prompt.sh ]; then
source ~/.local/git-prompt.sh
@@ -53,7 +48,7 @@ if [ -e ~/.local/git-prompt.sh ]; then
export GIT_PS1_STATESEPARATOR=""
export GIT_PS1_SHOWUPSTREAM=y
export GIT_PS1_DESCRIBE_STYLE="branch"
- RPROMPT=$RPROMPT'$(__git_ps1 "%s")'
+ RPROMPT='$(__git_ps1 "%s")'
fi
# Long running bell ############################################
# Inspired by: https://gist.github.com/jpouellet/5278239