X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc;h=487ee8f1dae06254b7bc6280e0053d8c18423c3b;hb=f6347bfc9e2a597713b2f2758a2cc19214a1cc87;hp=2a1a0a79479dd7d2ba76d82beb394fe7bd629b6c;hpb=0b6d44c7f3d567e0a26138509c8a24cb57c69b50;p=distro-setup

diff --git a/brc b/brc
index 2a1a0a7..487ee8f 100644
--- a/brc
+++ b/brc
@@ -153,7 +153,7 @@ 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 *:[ ]*:lom '
+HISTIGNORE='pass *:[ ]*:lom*:gram*'
 
 export BC_LINE_LENGTH=0
 
@@ -167,6 +167,7 @@ C_DEFAULT_DIR=/a
 # https://superuser.com/questions/366930/how-do-i-get-the-git-pager-to-clean-up-screen-output-after-exit
 # and reading the man
 export LESS=RXi
+export SYSTEMD_LESS=$LESS
 
 # * include files
 for _x in /a/bin/distro-functions/src/* /a/bin/!(githtml)/*-function?(s); do
@@ -181,6 +182,11 @@ if [[ -e /a/bin/errhandle/err ]]; then
   source /a/bin/errhandle/err
   err-allow
 fi
+# if someone exported $SOE (stop on error), catch errors
+if [[ $SOE ]]; then
+  err-catch
+fi
+
 path_add /a/exe
 # end just because it seems safer
 path_add --end node_modules/.bin
@@ -335,6 +341,7 @@ b() {
 }
 
 bbk() {
+  c /
   # run latest
   install-my-scripts
   btrbk-run "$@"
@@ -1080,23 +1087,19 @@ ipdrop() {
   s iptables -A INPUT -s $1 -j DROP
 }
 
-net-dev-info() {
-  e "lspci -nnk|gr -iA2 net"
-  lspci -nnk|gr -iA2 net
-  hr
-  e "s lshw -C network"
-  hr
-  s lshw -C network
-
-}
 
 istext() {
   grep -Il "" "$@" &>/dev/null
 }
 
+jfilter() {
+  grep -Evi -e "^(\S+\s+){4}(sudo|sshd|cron)\[\S*:" \
+       -e "^(\S+\s+){4}systemd\[\S*: (starting|started) (btrfsmaintstop|dynamicipupdate|spamd dns bug fix cronjob|rss2email)\.*$"
+}
 jtail() {
-  journalctl -n 10000 -f "$@" | grep -Evi "^(\S+\s+){4}(sudo|sshd|cron)"
+  journalctl -n 10000 -f "$@" | jfilter
 }
+jr() { journalctl "$@" | jfilter | less ; }
 
 kff() { # keyboardio firmware flash
   pushd /a/bin/distro-setup/Arduino/Model01-Firmware
@@ -1124,9 +1127,12 @@ lld() { ll -d "$@"; }
 lom() {
   local l base
   if [[ $1 == /* ]]; then
+    base=${1##*/}
+    if mountpoint /mnt/$base; then
+      return 0
+    fi
     l=$(sudo losetup -f)
     sudo losetup $l $1
-    base=${1##*/}
     if ! sudo cryptsetup luksOpen $l $base; then
       sudo losetup -d $l
       return 1
@@ -1138,7 +1144,7 @@ lom() {
     base=$1
     sudo umount /mnt/$base
     l=$(sudo cryptsetup status /dev/mapper/$base|sed -rn 's/^\s*device:\s*(.*)/\1/p')
-    sudo cryptsetup luksClose /dev/mapper/$base
+    sudo cryptsetup luksClose /dev/mapper/$base || return 1
     sudo losetup -d $l
   fi
 }
@@ -1231,6 +1237,15 @@ mkdir() { command mkdir -p "$@"; }
 
 mo() { xset dpms force off; } # monitor off
 
+net-dev-info() {
+  e "lspci -nnk|gr -iA2 net"
+  lspci -nnk|gr -iA2 net
+  hr
+  e "s lshw -C network"
+  hr
+  s lshw -C network
+
+}
 
 nopanic() {
   sudo tee -a /var/log/exim4/paniclog-archive </var/log/exim4/paniclog; sudo truncate -s0 /var/log/exim4/paniclog
@@ -1476,7 +1491,7 @@ scssl() {
 }
 
 ser() {
-  local s; [[ $EUID != 0 ]] && s=sudo
+  local s; [[ $EUID != 0 ]] && s=s
   if type -p systemctl &>/dev/null; then
     $s systemctl $1 $2
   else
@@ -1488,7 +1503,7 @@ srestart() {
   local service=$1
   if [[ $(s systemctl --no-pager show -p ActiveState $service ) == ActiveState=active ]]; then
     systemctl restart $service
-    fi
+  fi
 }
 serstopnm() {
   ser stop NetworkManager
@@ -2167,12 +2182,14 @@ reset-xscreensaver() {
   # xscreensaver-command -demo
   # then finding the corresponding option in .xscreensaver
   # spash, i happened to notice in .xscreensaver
+  #
+  # dpmsOff, monitor doesnt come back on using old free software supported nvidia card
   cat > /home/iank/.xscreensaver <<'EOF'
 mode:		blank
 dpmsEnabled:	True
 dpmsStandby:	0:02:00
-dpmsSuspend:	0:02:00
-dpmsOff:	0:03:00
+dpmsSuspend:	0:03:00
+dpmsOff:	0:00:00
 timeout:	0:02:00
 lock:           True
 lockTimeout:	0:03:00
@@ -2195,11 +2212,6 @@ fi
 unset IFS
 
 
-# if someone exported $SOE, catch errors
-if [[ $SOE ]]; then
-  errcatch
-fi
-
 # for mitmproxy to get a newer python.
 # commented until i want to use it because it
 # noticably slows bash startup
@@ -2226,6 +2238,8 @@ path_add --end $HOME/.rvm/bin
 
 export BASEFILE_DIR=/a/bin/fai-basefiles
 
+export ANDROID_HOME=/opt/android
+
 # didnt get drush working, if I did, this seems like the
 # only good thing to include for it.
 # Include Drush completion.