fix monitor issue

[distro-setup] / brc

diff --git a/brc b/brc
index 6cbc09ac133bc2ce5c2afb0b8e84f2fe1700c031..1c93c8adbcf4fbee67b23c573428477c4bc92259 100644 (file)
--- 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
 
@@ -181,7 +181,14 @@ 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
 # pip3 --user things go here:
 path_add --end ~/.local/bin
 path_add --ifexists --end /a/work/libremanage
@@ -332,8 +339,8 @@ b() {
   c -
 }
 
-bkr() {
-  # get latest
+bbk() {
+  # run latest
   install-my-scripts
   btrbk-run "$@"
 }
@@ -987,8 +994,10 @@ hrcat() { local f; for f; do [[ -f $f ]] || continue; hr; echo "$f"; cat "$f"; d
 
 # get latest hub and run it
 # main command to use:
-# hub pull-request
-# on first use, you input username/pass and it gets an oath token so you dont have to repeat
+# hub pull-request --no-edit
+# --no-edit means to use the first commit\'s message as the pull request message.
+# Also, you need to use a feature branch, not master in your fork.
+# On first use, you input username/pass and it gets an oath token so you dont have to repeat
 # it\'s at ~/.config/hub
 hub() {
   local up uptar updir p
@@ -1120,9 +1129,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
@@ -1134,7 +1146,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
 }
@@ -1484,7 +1496,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
@@ -1751,8 +1763,8 @@ testexim() {
   # adding -d, etc to COMMONOPTIONS in
   # /etc/default/exim4
   exim -d -t <<'EOF'
-From: root@gnu.org
-To: ian@iankelling.org
+From: ian@iankelling.org
+To: root@lists0p.fsf.org
 Subject: Testing Exim
 
 This is a test message.
@@ -2163,12 +2175,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
@@ -2191,11 +2205,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
@@ -2210,6 +2219,7 @@ fi
 
 export GOPATH=$HOME/go
 path_add $GOPATH/bin
+path_add /usr/local/go/bin
 
 export ARDUINO_PATH=/a/opt/Arduino/build/linux/work
 
@@ -2221,6 +2231,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.