X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc;h=6cbc09ac133bc2ce5c2afb0b8e84f2fe1700c031;hb=917ca4a71b5c456b741456dc173c144ee7042d89;hp=16b7eb74e341abfb8a3c08da20ee72084ac2775f;hpb=2d3ce30754a3f24d922635647bab4990b60f5c27;p=distro-setup

diff --git a/brc b/brc
index 16b7eb7..6cbc09a 100644
--- a/brc
+++ b/brc
@@ -147,13 +147,13 @@ HISTFILE=$HOME/.bh
 # the time format display when doing the history command
 # also, setting this makes the history file record time
 # of each command as seconds from the epoch
-HISTTIMEFORMAT="%I:%M %p %m/%d "
+HISTTIMEFORMAT="%Y-%m-%d %I:%M %p "
 # consecutive duplicate lines dont go in history
 HISTCONTROL=ignoredups
 # works in addition to HISTCONTROL to do more flexible things
 # it could also do the same things as HISTCONTROL and thus replace it,
 # but meh. dunno why, but just " *" does glob expansion, so use [ ] to avoid it.
-HISTIGNORE='pass *:k *:[ ]*:lom '
+HISTIGNORE='pass *:[ ]*:lom '
 
 export BC_LINE_LENGTH=0
 
@@ -332,9 +332,10 @@ b() {
   c -
 }
 
-bkrun() {
-  # use -p from interactive shell
-  btrbk-run -p "$@"
+bkr() {
+  # get latest
+  install-my-scripts
+  btrbk-run "$@"
 }
 
 bfg() { java -jar /a/opt/bfg-1.12.14.jar "$@"; }
@@ -343,6 +344,21 @@ bigclock() {
   xclock -digital -update 1 -face 'arial black-80:bold'
 }
 
+bpush() {
+  case $HOSTNAME in
+    tp) target=x2 ;;
+    x2) target=tp ;;
+  esac
+  btrbk-run -t $target && switch-mail-host $HOSTNAME $target
+}
+bpull() {
+  case $HOSTNAME in
+    tp) source=x2 ;;
+    x2) source=tp ;;
+  esac
+  btrbk-run -s $source && switch-mail-host $source $HOSTNAME
+}
+
 btc() {
   local f=/etc/bitcoin/bitcoin.conf
   # importprivkey will timeout if using the default of 15 mins.
@@ -440,6 +456,7 @@ cgpl()
     cp /a/bin/data/COPYING .
   fi
 }
+
 capache()
 {
   if (($#)); then
@@ -448,6 +465,20 @@ capache()
     cp /a/bin/data/LICENSE .
   fi
 }
+
+cat-new-files() {
+  local start=$SECONDS
+  local dir="$1"
+  inotifywait -m "$dir" -e create -e moved_to |
+    while read filedir _ file; do
+      cat "$filedir$file"
+      hr
+      calc $((SECONDS - start)) / 60
+      sleep 5
+    done
+
+}
+
 chown() {
   # makes it so chown -R symlink affects the symlink and its target.
   if [[ $1 == -R ]]; then
@@ -1003,6 +1034,7 @@ ic() {
   git commit -am "$*"
 }
 
+
 idea() {
   /a/opt/idea-IC-163.7743.44/bin/idea.sh "$@" &r
 }
@@ -1079,6 +1111,8 @@ l() {
 
 lcn() { locate -i "*$**"; }
 
+lg() { LC_COLLATE=C.UTF-8 ll --group-directories-first; }
+
 lt() { ll -tr "$@"; }
 
 lld() { ll -d "$@"; }
@@ -1149,6 +1183,7 @@ mbenable() {
   dst=/m/4e/$1
   src=/m/md/$1
   set -x
+  [[ -e $src ]] || { set +x; return 1; }
   mv -T $src $dst || { set +x; return 1; }
   ln -s -T $dst $src
   /a/exe/lnf /p/.mu ~
@@ -1160,6 +1195,7 @@ mbdisable() {
   dst=/m/md/$1
   src=/m/4e/$1
   set -x
+  [[ -e $src ]] || { set +x; return 1; }
   if [[ -L $dst ]]; then rm $dst; fi
   mv -T $src $dst
   set +x
@@ -1443,6 +1479,13 @@ ser() {
     $s service $2 $1
   fi
 }
+# like restart, but do nothing if its not already started
+srestart() {
+  local service=$1
+  if [[ $(s systemctl --no-pager show -p ActiveState $service ) == ActiveState=active ]]; then
+    systemctl restart $service
+    fi
+}
 serstopnm() {
   ser stop NetworkManager
   ser stop dnsmasq
@@ -1550,6 +1593,10 @@ splay() { # script replay
   scriptreplay "$1.t" "$1.s"
 }
 
+smeld() { # usage host1 host2 file
+  meld <(ssh $1 cat $3) <(ssh $2 cat $3)
+}
+
 spd() {
   PATH=/usr/local/spdhackfix:$PATH command spd "$@"
 }
@@ -1735,14 +1782,6 @@ tm() {
   (sleep $(calc "$@ * 60") && mpv --no-config --volume 50 /a/bin/data/alarm.mp3) > /dev/null 2>&1 &
 }
 
-tpx2() {
-  case $HOSTNAME in
-    tp) target=x2 ;;
-    x2) target=tp ;;
-  esac
-  btrbk-run -t $target -pv && switch-mail-host $HOSTNAME $target
-}
-
 trg() { transmission-remote-gtk&r; }
 trc() {
   # example, set global upload limit to 100 kilobytes:
@@ -1881,6 +1920,9 @@ vspicy() { # usage: VIRSH_DOMAIN
                sed -r "s/.*port='([0-9]+).*/\1/")
 }
 
+wian() {
+  cat-new-files /m/4e/INBOX/new
+}
 
 wtr() { curl wttr.in/boston; }
 
@@ -2164,27 +2206,7 @@ fi
 #  eval "$(pyenv virtualenv-init -)"
 #fi
 
-# id prefer to have system-wide, plus user ruby, due to bug in it
-# https://github.com/rubygems/rubygems/pull/1002
-# further problems: installing multi-user ruby and user ruby,
-# you dont get multi-user ruby when you sudo to root, unless its sudo -i.
-# There a third hybrid form, which passenger error suggested I use,
-# but it didnt actually work.
-
-# in cased I never need this
-# rvm for non-interactive shell: modified from https://rvm.io/rvm/basics
-#if [[ $(type -t rvm) == file && ! $(type -t ruby) ]]; then
-#    source $(rvm 1.9.3 do rvm env --path)
-#fi
-
-# based on warning from rvmsudo
-export rvmsudo_secure_path=1
 
-if [[ -s "/usr/local/rvm/scripts/rvm" ]]; then
-  source "/usr/local/rvm/scripts/rvm"
-elif [[ -s $HOME/.rvm/scripts/rvm ]]; then
-  source $HOME/.rvm/scripts/rvm
-fi
 
 export GOPATH=$HOME/go
 path_add $GOPATH/bin
@@ -2193,6 +2215,10 @@ export ARDUINO_PATH=/a/opt/Arduino/build/linux/work
 
 path_add --end ~/.npm-global
 
+# taken from default changes to bashrc and bash_profile
+path_add --end $HOME/.rvm/bin
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+
 export BASEFILE_DIR=/a/bin/fai-basefiles
 
 # didnt get drush working, if I did, this seems like the