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

diff --git a/brc b/brc
index 2a1a0a7..1c93c8a 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
 
@@ -181,6 +181,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
@@ -1124,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
@@ -1138,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
 }
@@ -1488,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
@@ -2167,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
@@ -2195,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
@@ -2226,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.