Merge branch 'master' of jason.zzq.org:repos/dotfiles

2 files changed, 40 insertions, 9 deletions

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