dotlib/cattle.sh

@@ -1,28 +0,0 @@
-reset-elapsed() {
-  (( last_cmd_at = SECONDS ))
-}
-
-ping-timer() {
-  kill -USR1 "$reaper_pid" 2>/dev/null
-}
-
-kill-reaper() {
-  kill -KILL "$reaper_pid"
-}
-
-{
-  trap reset-elapsed USR1
-  last_cmd_at=0
-
-  while sleep 1; do
-    (( elapsed = SECONDS - last_cmd_at ))
-
-    if (( elapsed > 600 )); then
-      kill -KILL "$$"
-      exit
-    fi
-  done
-} &
-
-reaper_pid=$! prompt_cmds+=(ping-timer)
-trap kill-reaper EXIT

dotlib/prompt.sh

@@ -7,7 +7,7 @@ if (( 10#$month == 3 && 10#$day < 18 )); then
     printf "Only %d days left until Saint Patrick's day!\n" "$(( 17 - 10#$day ))"
   fi
 
-  prompt_sym=🍀
+  holiday=🍀
 elif (( 10#$month == 10 )); then
   if (( 31 - 10#$day == 0 )); then
     printf 'Have a spooky halloween!\n'
@@ -15,7 +15,7 @@ elif (( 10#$month == 10 )); then
     printf 'Only %d days left until Halloween!\n' "$(( 31 - 10#$day ))"
   fi
 
-  prompt_sym=🎃
+  holiday=🎃
 elif (( 10#$month == 12 && 10#$day < 26 )); then
   if (( 25 - 10#$day == 0 )); then
     printf 'Merry Christmas!\n'
@@ -23,30 +23,28 @@ elif (( 10#$month == 12 && 10#$day < 26 )); then
     printf 'Only %d days left until Christmas!\n' "$(( 25 - 10#$day ))"
   fi
 
-  prompt_sym=🌲
+  holiday=🌲
 fi
 
 setup-prompt() {
-  local cmd
-
-  if [[ -v prompt_cmds[@] ]]; then
-    for cmd in "${prompt_cmds[@]}"; do
-      "$cmd"
-    done
-  fi
+  tput sgr0
 
   if [[ -d .git ]]; then
-    git_branch="$(command git branch --show-current) "
+    git_branch=" $(command git branch --show-current)"
   else
-    git_branch=""
+    git_branch=
   fi
 }
 
 PROMPT_COMMAND=setup-prompt
-PS1='\w $git_branch'
+PS1='\w$git_branch'
 
 if [[ -v SSH_CLIENT ]]; then
-  PS1+='${HOSTNAME-"$(hostname)"} '
+  if [[ -v HOSTNAME ]]; then
+    PS1+=' $HOSTNAME'
+  else
+    PS1+=' $(hostname)'
+  fi
 fi
 
-PS1+='${prompt_sym-λ} '
+PS1+=' ${holiday-λ} '