6 files changed, 112 insertions, 34 deletions

diff --git a/emacs/.authinfo.gpg b/emacs/.authinfo.gpg
new file mode 100644
index 0000000..92721db
--- /dev/null
+++ b/emacs/.authinfo.gpg
@@ -0,0 +1,21 @@
+-----BEGIN PGP MESSAGE-----
+
+hQIMA5dnaCz2b+2zARAAuqSVqiMhE0RbRalQYNLvdrTTVn7W3kV/yPVOrYyf8iMm
+eib3UX98wVnfmxLkG0ChtmsGHw69owcnPVKpUMeSztVay1z+BRcQRWkQ3ZgSXrZp
+5o+l76uGYXs11YgWICCNxl6BaNGePosQQ1UpzFxeyC7PLoyVf7r7PYO9Rgcb9AAV
+k1O/2nEhLyamZZIOJCA8dS1YdsJFOtWba8eMMD90OEIwXU8geyTLfWRKbnOF+ktD
+t9of+Uf4+ZtgcbujsPwSTD0hGhPy3QoAP7dB8i6q6vaCP7Mue0cuegXySlurbRJ9
+S832d7FR7j4TFJ9klOm6qf0ImrVzHqnivlq+pihCu0g20DhCHVM58/wyOlLNM0Ze
+YTMbaYpvmwGFG0zQkx4N6pncaaOTca0DuaJP1Xjvq7iujVpQ7QdAxy8bNV4YwiGU
+zC0ZLTqlqM46WEShjzigkUicUzyacPBC3lKunTVnWJ+3yhtphM5dw9s3dSBYFdJU
+tOlHe3XZt7VRpEsIWhFRw2Z7nLrm9QGAK1Vzt199KD5lxnaZMKi1l7LuxwTVJMAy
+w2B4FtI5gBt5N3+XC+Tn2FIbKoWIDU42wGEG/DcpISuFVJTARLDrzsGsb+ufzcoo
+Ul5cnvbpzqdiISRGtrRw7WatC2nPim4SVPLD7THNEm+n5OXCimP/YeCxQvkUC5HS
+wFoB/u214XilaEHNufyNMdWxnLlO/FrArVFFQHI/4MqUqZlFO38jhKO7r0ThN5QG
+pKYhftJ5ZYB8dKx6msv5sbkEPLO9RA29+5RjRSh+KbaAwgiWsCvIRbOr9hdIPnfY
+AkZuYOeGbXPcREftF6Xyb0h94rxLtplOiN/oM/VjLrk/cHvhqlWubsu6U2JGbCA9
+dn5F/t7mvsLv5LtaLurTHwS4s1HYHbqOea02nr+HU4LvYZ8HEWxq0MYDqyK8F9ok
+HEvARG+VWjudBf82GxNTmdRrtkj8y1RpPFL2dQlolx/lDIgaATAAXAsp6HfzikPz
+cMh/nz4qjmqQuaqRE0hjA/4R1pqm0f63xt3/2PG6m2RWAAgHOWVOek0OQuM=
+=jyRe
+-----END PGP MESSAGE-----
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index c10f74f..f01b121 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -175,4 +175,5 @@ exec run-once synclient HorizTwoFingerScroll=1
 exec run-once xfce4-power-manager
 exec run-once blueman-applet
 exec run-once feh --bg-scale "/home/jason/Sync/wallpaper/wallhaven-3601.jpg"
+exec run-once xset dpms 300 600 900
 # exec run-once run_vmtoolsd
diff --git a/procmail/.procmailrc b/procmail/.procmailrc
index 99a57fb..d0b4fd4 100644
--- a/procmail/.procmailrc
+++ b/procmail/.procmailrc
@@ -1,5 +1,5 @@
-MAILDIR="$HOME/Maildir"
-DEFAULT="$MAILDIR/jason/"
+MAILDIR="$HOME/Mail"
+DEFAULT="$MAILDIR/incoming/"
 LOGFILE="$MAILDIR/procmail.log"
 VERBOSE=on
 
diff --git a/scripts/bin/fix_screens_at_work.sh b/scripts/bin/fix_screens_at_work.sh
index a4f20a6..b2f5c35 100755
--- a/scripts/bin/fix_screens_at_work.sh
+++ b/scripts/bin/fix_screens_at_work.sh
@@ -1,11 +1,20 @@
 #!/bin/bash
 
-#xrandr --setprovideroutputsource 1 0
-#xrandr --output DP-2 --mode 1920x1200
-xrandr --output DP-4 --right-of DP-2 --auto --primary #--mode 2560x1440
-xrandr --output DVI-I-1-1 --below DP-4 --auto
-
-# For some reason, occasionally this needs to be executed twice
-xmodmap ~/.Xmodmap-pckeyboard_fix
-sleep 1
-xmodmap ~/.Xmodmap-pckeyboard_fix
+# #xrandr --setprovideroutputsource 1 0
+# #xrandr --output DP-2 --mode 1920x1200
+# xrandr --output DP-4 --right-of DP-2 --auto --primary #--mode 2560x1440
+# xrandr --output DVI-I-1-1 --below DP-4 --auto
+
+# # For some reason, occasionally this needs to be executed twice
+# xmodmap ~/.Xmodmap-pckeyboard_fix
+# sleep 1
+# xmodmap ~/.Xmodmap-pckeyboard_fix
+
+# With USB monitor
+xrandr --output DVI-I-2-1 --mode 1920x1080 --pos 2280x1440 --rotate normal --output eDP-1-1 --primary --mode 1920x1080 --pos 0x144 --rotate normal --output HDMI-0 --off --output DP-3 --off --output DP-2 --off --output DP-1 --off --output DP-0 --mode 2560x1440 --pos 1920x0 --rotate normal
+
+# Without usb monitor
+#xrandr --output eDP-1-1 --primary --mode 1920x1080 --pos 0x256 --rotate normal --output HDMI-0 --off --output DP-3 --off --output DP-2 --off --output DP-1 --off --output DP-0 --mode 2560x1440 --pos 1920x0 --rotate normal
+
+feh --bg-scale ~/Sync/wallpaper/wallhaven-3601.jpg
+xmodmap ~/.Xmodmap
diff --git a/scripts/pny b/scripts/pny
new file mode 100755
index 0000000..f8da92c
--- /dev/null
+++ b/scripts/pny
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [[ $1 == "mount" ]]; then
+    DEVICE=`dmesg | tail | grep 'Attached SCSI' | sed -n 's/.*: \[\(sd[a-z]\)\] Attac.*/\1/p'`
+
+    if [[ $DEVICE == "" ]]; then
+        echo "Error finding device"
+        exit 1
+    fi
+
+    echo "Mounting /dev/${DEVICE}1"
+
+    sudo cryptsetup luksOpen /dev/${DEVICE}1 usbkey
+    sudo mount -o user,exec /dev/mapper/usbkey /home/jason/sdb
+elif [[ $1 == "unmount" ]]; then
+    echo "Unmounting /dev/mapper/usbkey"
+
+    sudo umount /dev/mapper/usbkey
+    sudo cryptsetup luksClose /dev/mapper/usbkey
+else
+    echo "mount or unmount?"
+fi
diff --git a/zsh/.zshrc b/zsh/.zshrc
index f0d1f10..ec8b151 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -53,24 +53,28 @@ plugins=(git git-extras docker fabric gpg-agent pep8 pip pyenv pylint python vag
 ZSH=~/.oh-my-zsh
 
 source $ZSH/oh-my-zsh.sh
+export LANG=en_US.UTF-8
+export MANPATH="/usr/local/man:$MANPATH"
 
-# maybe this stuff should go in .profile. Emacs seems to read from that
-export RUST_SRC_PATH="$HOME/Code/rust-lang/src"
-if [ -f $HOME/.cargo/env ]; then
-    source $HOME/.cargo/env
-fi
-
-export GOROOT=/usr/local/go/
-export GOPATH=$HOME/Code/go
-
+# PATH setup
 export PATH="$HOME/bin:$HOME/.cargo/bin:/usr/local/go/bin/:$PATH"
 if [ -f /usr/local/go/bin/go ]; then
     export PATH="$PATH:$GOROOT/bin:$(go env GOPATH)/bin"
 fi
 
-export MANPATH="/usr/local/man:$MANPATH"
+# Rust
+if [ -f $HOME/.cargo/env ]; then
+    source $HOME/.cargo/env
+fi
 
-export LANG=en_US.UTF-8
+# maybe this stuff should go in .profile. Emacs seems to read from that
+if [ -x $HOME/.cargo/bin/rustup ]; then
+    export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src"
+fi
+
+# Golang
+#export GOROOT=/usr/local/go/
+#export GOPATH=$HOME/Code/go
 
 # Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
@@ -79,7 +83,8 @@ export LANG=en_US.UTF-8
 #   export EDITOR='mvim'
 # fi
 #export EDITOR='/Applications/Emacs\ 25.app/Contents/MacOS/bin/emacsclient'
-export EDITOR='emacsclient'
+export _TERM_EMACS='emacsclient -nw -a "emacs -nw"'
+export EDITOR=$_TERM_EMACS
 
 # Compilation flags
 # export ARCHFLAGS="-arch x86_64"
@@ -89,34 +94,35 @@ export VAGRANT_DOTFILE_PATH=~/.vagrant.d/projects
 #export SSL_CERT_FILE=/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt
 
 # Aliases
-alias fixfileperm='find /music -type f -exec chmod 0644 {} \;'
+#alias fixfileperm='find /music -type f -exec chmod 0644 {} \;'
 alias cleanbranches='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d; git branch -r --merged master | grep -iv "master" | sed "s/origin\///" | xargs -n 1 git push --delete origin'
 alias ducks='du -cks * |sort -rn |head -11'
+alias dc='docker-compose'
+alias define='sdcv'
+alias emacs=$_TERM_EMACS
+alias java18='/usr/local/java/jdk1.8.0_191/bin/java'
+alias javac18='/usr/local/java/jdk1.8.0_191/bin/javac'
 
+# Python
 if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then
     source /usr/local/bin/virtualenvwrapper.sh
 elif [ -f /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh ]; then
     source /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh
 fi
 
-
-
-# emacsclient is a script located in ~/bin
-# alias emacs='emacsclient'
-
-alias dc='docker-compose'
-alias define='sdcv'
-
+# direnv
 DIRENV=`whereis -b direnv | awk {'print $2'}`
 if [[ -f $DIRENV && -x $DIRENV ]]; then
     eval "$(direnv hook zsh)"
 fi
 
+# GPG ssh key
 export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
 
 export GPG_TTY=$(tty)
-export COMPOSE_HTTP_TIMEOUT=600
-export DOCKER_CLIENT_TIMEOUT=120
+
+#export COMPOSE_HTTP_TIMEOUT=600
+#export DOCKER_CLIENT_TIMEOUT=120
 
 show_virtual_env() {
   if [ -n "$VIRTUAL_ENV" ]; then
@@ -127,3 +133,22 @@ show_virtual_env() {
 #PS1='$(show_virtual_env)'$PS1
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+dg() {
+ // credit: doug tolton
+ dg_res=$(ls -1p \
+           | gawk -v target=$1 '$0 ~ target')
+ dg_res_count=$(echo $dg_res \
+                   | gawk 'length($0) > 0' \
+                   | wc -l)
+
+ if [[ "$dg_res_count" -eq 1 ]]
+ then
+   cd $(echo $dg_res)
+ elif [[ "$dg_res_count" -eq 0 ]]; then
+   echo "NO MATCHES"
+ else
+   echo $dg_res
+   echo "MATCHES: "$dg_res_count
+ fi
+}