aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2017-10-05 23:33:39 +0200
committerKarel Kočí <cynerd@email.cz>2017-10-05 23:33:39 +0200
commit2fc8d93ef509f583f6977588c7b3fb2cf8ebd332 (patch)
tree086220f9fadb46bcaea62167733687e9f154fac0
parent5193d42151091b2d15b28f1095a5ee19589bc312 (diff)
downloadmyconfigs-2fc8d93ef509f583f6977588c7b3fb2cf8ebd332.tar.gz
myconfigs-2fc8d93ef509f583f6977588c7b3fb2cf8ebd332.tar.bz2
myconfigs-2fc8d93ef509f583f6977588c7b3fb2cf8ebd332.zip
Drop annoyme from shell and some other small changes
-rw-r--r--bashrc5
-rw-r--r--shellrc2
-rw-r--r--zshrc11
3 files changed, 5 insertions, 13 deletions
diff --git a/bashrc b/bashrc
index 14ded1a..f36391e 100644
--- a/bashrc
+++ b/bashrc
@@ -22,10 +22,7 @@ PS1='$(
if [ `id -u` -eq "0" ]; then
echo -n "\[\e[1;31m\]\u@\h:\[\e[1;34m\]\W\[\e[1;31m\]\$\[\e[0m\] "
else
- if ls ~/.annoyme/*.pid 2>/dev/null >/dev/null; then
- ANNOYME_PS="\[\e[1;31m\]!\[\e[0m\]"
- fi
- echo -n "$ANNOYME_PS\[\e[1;32m\]\u@\h:\[\e[1;34m\]\W\[\e[1;32m\]\$\[\e[0m\] "
+ echo -n "\[\e[1;32m\]\u@\h:\[\e[1;34m\]\W\[\e[1;32m\]\$\[\e[0m\] "
fi)'
PROMPT_COMMAND='
diff --git a/shellrc b/shellrc
index 2979249..10f6f2c 100644
--- a/shellrc
+++ b/shellrc
@@ -14,7 +14,7 @@ else
eval $(dircolors -b)
alias make="make -j$(nproc)"
fi
-alias ll='ls -l'
+alias ll='ls -lh'
alias grep='grep --color=auto'
alias git='LANG=en_GB git'
alias gdb='gdb -q'
diff --git a/zshrc b/zshrc
index c8f8f31..ed2058d 100644
--- a/zshrc
+++ b/zshrc
@@ -37,14 +37,9 @@ bindkey "^[[3~" delete-char
bindkey "^[3;5~" delete-char
# PROMPT #######################################################
-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: %?
-)\$(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%} "
unset NCOLOR
if [ -e ~/.local/git-prompt.sh ]; then
@@ -71,9 +66,9 @@ lrbell_active_window_id() {
lrbell_begin() {
lrbell_timestamp=$EPOCHSECONDS
- lrbell_message="`pwd`: $1"
if [ -n "$DISPLAY" ]; then
- lrbell_window_id=$(lrbell_active_window_id)
+ lrbell_message="`pwd`: $1"
+ lrbell_window_id="$(lrbell_active_window_id)"
fi
}
lrbell_end() {