aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2017-06-05 07:22:17 +0200
committerKarel Kočí <karel.koci@nic.cz>2017-06-05 07:22:17 +0200
commit704dfec4a151169187fb24108413fe7dc43a33eb (patch)
treeab450a9287f5659648c0cdc6adf88aed79b90ead
parentd37ca99f25cc745db3bed37a81952235613fa731 (diff)
downloadmyconfigs-704dfec4a151169187fb24108413fe7dc43a33eb.tar.gz
myconfigs-704dfec4a151169187fb24108413fe7dc43a33eb.tar.bz2
myconfigs-704dfec4a151169187fb24108413fe7dc43a33eb.zip
Conditionally integrate annoyme
-rw-r--r--profile8
-rw-r--r--shellrc2
-rw-r--r--zshrc10
3 files changed, 16 insertions, 4 deletions
diff --git a/profile b/profile
index 445f471..76a201c 100644
--- a/profile
+++ b/profile
@@ -13,4 +13,10 @@ export EDITOR=vim
~/.service/syncthing -q status || ~/.service/syncthing start
# And if we are on first terminal also automatically start x server
-[ "$(tty)" = "/dev/tty1" ] && exec startx -- vt1
+if [ "$(tty)" = "/dev/tty1" ]; then
+ if which annoyme >/dev/null 2>&1; then # Check if we are using annoyme
+ sleep 1 # just little bit of time to give systemd to start tasks
+ ls ~/.annoyme/*.pid 2>/dev/null >&2 && annoyme
+ fi
+ exec startx -- vt1
+fi
diff --git a/shellrc b/shellrc
index 2465d96..be99e18 100644
--- a/shellrc
+++ b/shellrc
@@ -18,7 +18,7 @@ alias gdb='gdb -q'
alias cgdb='cgdb -q'
alias octave='octave-cli -q'
alias ssh='TERM="xterm-256color" ssh'
-alias feh='feh --magick-timeout 1 -.'
+alias feh='feh --magick-timeout 10 -.'
export LESS=-R
export LESS_TERMCAP_mb=$'\E[1;31m'
diff --git a/zshrc b/zshrc
index 6f4944e..150d286 100644
--- a/zshrc
+++ b/zshrc
@@ -36,9 +36,15 @@ bindkey "^[[3~" delete-char
bindkey "^[3;5~" delete-char
# PROMPT #######################################################
-if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
+annoyme_check() {
+ which annoyme >/dev/null 2>&1 && ls ~/.annoyme/*.pid 2>/dev/null >&2 && \
+ echo "%{$fg_bold[red]%}!"
+}
+
+[ $UID -eq 0 ] && NCOLOR="red" || NCOLOR="green"
PROMPT="%(?..%{$fg_bold[yellow]%}EXIT: %?
-)%{$fg_bold[$NCOLOR]%}%n@%m:%{$fg_bold[blue]%}%1~%{$fg_bold[$NCOLOR]%}%(!.#.$)%{$reset_color%} "
+)\$(annoyme_check)%{$fg_bold[$NCOLOR]%}%n@%m:%{$fg_bold[blue]%}%1~%{$fg_bold[$NCOLOR]%}%(!.#.$)%{$reset_color%} "
+unset NCOLOR
if [ -e ~/.local/git-prompt.sh ]; then
source ~/.local/git-prompt.sh