# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1532360960 0
# Node ID 4049cfd97ffb1695e4f5337d278002646d4ad147
# Parent  dca6294262582bf864b9b91435ab57aec83a5c0b# Parent  3f66d0d6e710341d8361e1a0b88536dd26d8444b
Merge.

diff -r dca629426258 -r 4049cfd97ffb bin/backup
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/backup	Mon Jul 23 15:49:20 2018 +0000
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+backup-local
+backup-backblaze
diff -r dca629426258 -r 4049cfd97ffb bin/backup-backblaze
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/backup-backblaze	Mon Jul 23 15:49:20 2018 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source /home/sjl/.restic-backblaze-creds
+
+restic --repo b2:backups-ouroboros:restic-repo \
+       --exclude-file=/home/sjl/src/dotfiles/restic/excludes.txt \
+       --password-file /home/sjl/.restic-password-backblaze \
+       backup /home/sjl
diff -r dca629426258 -r 4049cfd97ffb bin/backup-local
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/backup-local	Mon Jul 23 15:49:20 2018 +0000
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+restic --repo /backup/restic-repo \
+       --exclude-file=/home/sjl/src/dotfiles/restic/excludes.txt \
+       --password-file /home/sjl/.restic-password-local \
+       backup /home/sjl
diff -r dca629426258 -r 4049cfd97ffb bin/mount-encrypted-stick
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/mount-encrypted-stick	Mon Jul 23 15:49:20 2018 +0000
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+sudo cryptsetup luksOpen "/dev/$1" "$1_crypt"
+sudo mkdir -p "/media/sjl/encrypted_drive_$1"
+sudo mount "/dev/mapper/$1_crypt" "/media/sjl/encrypted_drive_$1"
diff -r dca629426258 -r 4049cfd97ffb bin/rb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/rb	Mon Jul 23 15:49:20 2018 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source /home/sjl/.restic-backblaze-creds
+
+restic --repo b2:backups-ouroboros:restic-repo \
+       --password-file /home/sjl/.restic-password-backblaze \
+       "$@"
diff -r dca629426258 -r 4049cfd97ffb bin/rl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/rl	Mon Jul 23 15:49:20 2018 +0000
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+restic --repo /backup/restic-repo \
+       --password-file /home/sjl/.restic-password-local \
+       "$@"
diff -r dca629426258 -r 4049cfd97ffb bin/screenshot-area
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/screenshot-area	Mon Jul 23 15:49:20 2018 +0000
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+sleep 0.2 ; scrot 'screenshot_%Y-%m-%d_%H-%M-%S.png' -s -e 'mv $f ~/screenshots && echo -n ~/screenshots/$f' | xsel --clipboard --input
diff -r dca629426258 -r 4049cfd97ffb bin/screenshot-screen
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/screenshot-screen	Mon Jul 23 15:49:20 2018 +0000
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+sleep 0.2 ; scrot 'screenshot_%Y-%m-%d_%H-%M-%S.png' -m -e 'mv $f ~/screenshots && echo -n ~/screenshots/$f' | xsel --clipboard --input
diff -r dca629426258 -r 4049cfd97ffb bin/unmount-encrypted-stick
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/unmount-encrypted-stick	Mon Jul 23 15:49:20 2018 +0000
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+sudo umount "/media/sjl/encrypted_drive_$1"
+sudo cryptsetup luksClose "$1_crypt"
diff -r dca629426258 -r 4049cfd97ffb gitconfig
--- a/gitconfig	Mon Jul 23 15:47:10 2018 +0000
+++ b/gitconfig	Mon Jul 23 15:49:20 2018 +0000
@@ -5,7 +5,7 @@
 [core]
     pager = cat
     editor = nvim
-    excludesfile = /home/sjl/.gitignore
+    excludesfile = ~/.gitignore
 
 [alias]
     tags = tag -l
diff -r dca629426258 -r 4049cfd97ffb gitignore
--- a/gitignore	Mon Jul 23 15:47:10 2018 +0000
+++ b/gitignore	Mon Jul 23 15:49:20 2018 +0000
@@ -11,3 +11,4 @@
 .cache-main
 .cache-tests
 *.fasl
+.notmylispwords
diff -r dca629426258 -r 4049cfd97ffb restic/excludes.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/restic/excludes.txt	Mon Jul 23 15:49:20 2018 +0000
@@ -0,0 +1,7 @@
+.cache
+cache2
+/home/sjl/.dbus
+/home/sjl/src/dotfiles/vim/tmp
+/home/sjl/.mozilla
+/home/sjl/Dropbox/.dropbox.cache
+
diff -r dca629426258 -r 4049cfd97ffb roswell/lispindent.lisp
--- a/roswell/lispindent.lisp	Mon Jul 23 15:47:10 2018 +0000
+++ b/roswell/lispindent.lisp	Mon Jul 23 15:49:20 2018 +0000
@@ -63,7 +63,8 @@
 
 (defparameter *config-files*
   (list (merge-pathnames ".lispwords" (user-homedir-pathname))
-        ".lispwords" ))
+        ".lispwords"
+        ".notmylispwords"))
 
 
 (defun source-config-files ()
diff -r dca629426258 -r 4049cfd97ffb stumpwmrc
--- a/stumpwmrc	Mon Jul 23 15:47:10 2018 +0000
+++ b/stumpwmrc	Mon Jul 23 15:49:20 2018 +0000
@@ -101,6 +101,15 @@
 ;;;; Load ---------------------------------------------------------------------
 (load-module "pass")
 
+;;;; Screenshotting -----------------------------------------------------------
+(defcommand screenshot-area () ()
+  ;; todo why the hell do these not pick up my fuckin path?
+  (run-shell-command "/home/sjl/src/dotfiles/bin/screenshot-area"))
+
+(defcommand screenshot-screen () ()
+  (run-shell-command "/home/sjl/src/dotfiles/bin/screenshot-screen"))
+
+
 ;;;; Brightness ---------------------------------------------------------------
 (defparameter *brightness-values* #(0 1 25 50 75 100))
 (defparameter *brightness-index* 2)
@@ -184,7 +193,7 @@
   (toggle-mode-line (current-screen) (current-head)))
 
 (defcommand pass-personal () ()
-  (let ((pass:*password-store* "/home/sjl/Dropbox/password-store/"))
+  (let ((pass:*password-store* "/home/sjl/.password-store/"))
     (pass:pass-copy)))
 
 ;; (defcommand pass-work () ()
@@ -223,8 +232,8 @@
   ("H-o" "spotify")
   ("H-I" "intellij")
   ("H-q" "exec slock")
-  ("H-y" "exec scrot 'screenshot_%Y-%m-%d_%H-%M-%S.png' -s -e 'mv $f ~/screenshots && echo -n ~/screenshots/$f' | xclip -sel clip")
-  ("H-Y" "exec scrot 'screenshot_%Y-%m-%d_%H-%M-%S.png' -m    'mv $f ~/screenshots && echo -n ~/screenshots/$f' | xclip -sel clip")
+  ("H-y" "screenshot-area")
+  ("H-Y" "screenshot-screen")
   ("H-r" "loadrc")
   ("H-V" "vlime"))
 
@@ -245,7 +254,8 @@
 
 (define-top-keys ;; splitting
   ("H-s" "sane-vsplit")
-  ("H-v" "sane-hsplit"))
+  ("H-v" "sane-hsplit")
+  ("H-=" "balance-frames"))
 
 (define-top-keys ;; killing
   ("H-w" "delete")