# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1600878888 14400
# Node ID 0ad0176a5755cc4465a995049ceaa87cd243b70b
# Parent  8c32f46d08e88c74b4f9a16f8f8d3e3e3f539e9b# Parent  18cc4d4f4ac43a363fecabe562a296764db75cc0
Merge

diff -r 18cc4d4f4ac4 -r 0ad0176a5755 fish/config.fish
--- a/fish/config.fish	Fri Sep 18 17:21:49 2020 -0400
+++ b/fish/config.fish	Wed Sep 23 12:34:48 2020 -0400
@@ -10,6 +10,7 @@
 function es; cd ~/src/stumpwm; nvim ~/.stumpwmrc; end
 function ev; nvim ~/.vimrc; end
 function eff; nvim ~/.config/fish/functions; end
+function efh; nvim ~/.local/share/fish/fish_history; end # I have visited https://github.com/fish-shell/fish-shell/issues/862 nine thousand times and I'm fucking sick of opening a web browser to figure out where the fuck fish keeps its equivalent of ~/.bash_history
 function essh; nvim ~/.ssh/config; end
 
 function js; cd ~/scratch; end
diff -r 18cc4d4f4ac4 -r 0ad0176a5755 stumpwm/dev.lisp
--- a/stumpwm/dev.lisp	Fri Sep 18 17:21:49 2020 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#S(GDUMP
-   :NUMBER 4
-   :NAME "Default"
-   :TREE (((#S(FDUMP
-               :NUMBER 0
-               :X 0
-               :Y 0
-               :WIDTH 835
-               :HEIGHT 870
-               :WINDOWS (16777221 27262981 50331649 52428805)
-               :CURRENT 16777221)
-            #S(FDUMP
-               :NUMBER 2
-               :X 0
-               :Y 870
-               :WIDTH 835
-               :HEIGHT 570
-               :WINDOWS (60817413)
-               :CURRENT 60817413))
-           (((#S(FDUMP
-                 :NUMBER 1
-                 :X 835
-                 :Y 0
-                 :WIDTH 617
-                 :HEIGHT 720
-                 :WINDOWS NIL
-                 :CURRENT NIL)
-              #S(FDUMP
-                 :NUMBER 5
-                 :X 835
-                 :Y 720
-                 :WIDTH 617
-                 :HEIGHT 720
-                 :WINDOWS NIL
-                 :CURRENT NIL))
-             #S(FDUMP
-                :NUMBER 4
-                :X 1452
-                :Y 0
-                :WIDTH 2348
-                :HEIGHT 1440
-                :WINDOWS (41943045 31457296)
-                :CURRENT 41943045))
-            #S(FDUMP
-               :NUMBER 3
-               :X 3800
-               :Y 0
-               :WIDTH 1320
-               :HEIGHT 1440
-               :WINDOWS NIL
-               :CURRENT NIL))))
-   :CURRENT 4)
\ No newline at end of file
diff -r 18cc4d4f4ac4 -r 0ad0176a5755 stumpwm/local-share-stumpwm/dev.dump
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stumpwm/local-share-stumpwm/dev.dump	Wed Sep 23 12:34:48 2020 -0400
@@ -0,0 +1,52 @@
+#S(GDUMP
+   :NUMBER 4
+   :NAME "Default"
+   :TREE (((#S(FDUMP
+               :NUMBER 0
+               :X 0
+               :Y 0
+               :WIDTH 835
+               :HEIGHT 870
+               :WINDOWS (16777221 27262981 50331649 52428805)
+               :CURRENT 16777221)
+            #S(FDUMP
+               :NUMBER 2
+               :X 0
+               :Y 870
+               :WIDTH 835
+               :HEIGHT 570
+               :WINDOWS (60817413)
+               :CURRENT 60817413))
+           (((#S(FDUMP
+                 :NUMBER 1
+                 :X 835
+                 :Y 0
+                 :WIDTH 617
+                 :HEIGHT 720
+                 :WINDOWS NIL
+                 :CURRENT NIL)
+              #S(FDUMP
+                 :NUMBER 5
+                 :X 835
+                 :Y 720
+                 :WIDTH 617
+                 :HEIGHT 720
+                 :WINDOWS NIL
+                 :CURRENT NIL))
+             #S(FDUMP
+                :NUMBER 4
+                :X 1452
+                :Y 0
+                :WIDTH 2348
+                :HEIGHT 1440
+                :WINDOWS (41943045 31457296)
+                :CURRENT 41943045))
+            #S(FDUMP
+               :NUMBER 3
+               :X 3800
+               :Y 0
+               :WIDTH 1320
+               :HEIGHT 1440
+               :WINDOWS NIL
+               :CURRENT NIL))))
+   :CURRENT 4)
\ No newline at end of file
diff -r 18cc4d4f4ac4 -r 0ad0176a5755 stumpwm/local-share-stumpwm/streaming.dump
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stumpwm/local-share-stumpwm/streaming.dump	Wed Sep 23 12:34:48 2020 -0400
@@ -0,0 +1,52 @@
+#S(GDUMP
+   :NUMBER 1
+   :NAME "Default"
+   :TREE ((((#S(FDUMP
+                :NUMBER 0
+                :X 0
+                :Y 0
+                :WIDTH 1237
+                :HEIGHT 731
+                :WINDOWS (29360133)
+                :CURRENT 29360133)
+             #S(FDUMP
+                :NUMBER 5
+                :X 0
+                :Y 731
+                :WIDTH 1237
+                :HEIGHT 709
+                :WINDOWS (33554437)
+                :CURRENT 33554437))
+            (#S(FDUMP
+                :NUMBER 1
+                :X 1237
+                :Y 0
+                :WIDTH 2100
+                :HEIGHT 1440
+                :WINDOWS (25165829)
+                :CURRENT 25165829)
+             (#S(FDUMP
+                 :NUMBER 2
+                 :X 3337
+                 :Y 0
+                 :WIDTH 523
+                 :HEIGHT 1020
+                 :WINDOWS (31457285 46137349)
+                 :CURRENT 31457285)
+              #S(FDUMP
+                 :NUMBER 4
+                 :X 3337
+                 :Y 1020
+                 :WIDTH 523
+                 :HEIGHT 420
+                 :WINDOWS (44040197)
+                 :CURRENT 44040197))))
+           #S(FDUMP
+              :NUMBER 3
+              :X 3860
+              :Y 0
+              :WIDTH 1260
+              :HEIGHT 1440
+              :WINDOWS (69206017 62914565 52428816 27262981 23068677)
+              :CURRENT 69206017)))
+   :CURRENT 3)
\ No newline at end of file
diff -r 18cc4d4f4ac4 -r 0ad0176a5755 stumpwm/local-share-stumpwm/work.dump
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stumpwm/local-share-stumpwm/work.dump	Wed Sep 23 12:34:48 2020 -0400
@@ -0,0 +1,44 @@
+#S(GDUMP
+   :NUMBER 1
+   :NAME "Default"
+   :TREE ((#S(FDUMP
+              :NUMBER 0
+              :X 0
+              :Y 0
+              :WIDTH 1920
+              :HEIGHT 2160
+              :WINDOWS (41943045 39845893 54525957 16777221)
+              :CURRENT 41943045)
+           #S(FDUMP
+              :NUMBER 4
+              :X 1920
+              :Y 0
+              :WIDTH 1920
+              :HEIGHT 2160
+              :WINDOWS (44040195 77594629)
+              :CURRENT 44040195))
+          (#S(FDUMP
+              :NUMBER 1
+              :X 3840
+              :Y 0
+              :WIDTH 960
+              :HEIGHT 1080
+              :WINDOWS (23068677)
+              :CURRENT 23068677)
+           (#S(FDUMP
+               :NUMBER 2
+               :X 4800
+               :Y 0
+               :WIDTH 960
+               :HEIGHT 465
+               :WINDOWS (35651589)
+               :CURRENT 35651589)
+            #S(FDUMP
+               :NUMBER 3
+               :X 4800
+               :Y 465
+               :WIDTH 960
+               :HEIGHT 615
+               :WINDOWS (27262977)
+               :CURRENT 27262977))))
+   :CURRENT 4)
diff -r 18cc4d4f4ac4 -r 0ad0176a5755 stumpwm/local-share-stumpwm/zoom.dump
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stumpwm/local-share-stumpwm/zoom.dump	Wed Sep 23 12:34:48 2020 -0400
@@ -0,0 +1,76 @@
+#S(GDUMP
+   :NUMBER 1
+   :NAME "Default"
+   :TREE (((#S(FDUMP
+               :NUMBER 0
+               :X 0
+               :Y 0
+               :WIDTH 835
+               :HEIGHT 870
+               :WINDOWS NIL
+               :CURRENT NIL)
+            #S(FDUMP
+               :NUMBER 2
+               :X 0
+               :Y 870
+               :WIDTH 835
+               :HEIGHT 570
+               :WINDOWS NIL
+               :CURRENT NIL))
+           (((#S(FDUMP
+                 :NUMBER 5
+                 :X 835
+                 :Y 0
+                 :WIDTH 617
+                 :HEIGHT 720
+                 :WINDOWS NIL
+                 :CURRENT NIL)
+              #S(FDUMP
+                 :NUMBER 1
+                 :X 835
+                 :Y 720
+                 :WIDTH 617
+                 :HEIGHT 720
+                 :WINDOWS NIL
+                 :CURRENT NIL))
+             (#S(FDUMP
+                 :NUMBER 4
+                 :X 1452
+                 :Y 0
+                 :WIDTH 2348
+                 :HEIGHT 40
+                 :WINDOWS NIL
+                 :CURRENT NIL)
+              #S(FDUMP
+                 :NUMBER 6
+                 :X 1452
+                 :Y 40
+                 :WIDTH 2300
+                 :HEIGHT 1400
+                 :WINDOWS NIL
+                 :CURRENT NIL)))
+            (#S(FDUMP
+                :NUMBER 3
+                :X 3752 
+                :Y 0
+                :WIDTH 708 
+                :HEIGHT 1440
+                :WINDOWS NIL
+                :CURRENT NIL)
+             (#S(FDUMP
+                 :NUMBER 7
+                 :X 4460
+                 :Y 0
+                 :WIDTH 660
+                 :HEIGHT 945
+                 :WINDOWS NIL
+                 :CURRENT NIL)
+              #S(FDUMP
+                 :NUMBER 8
+                 :X 4460
+                 :Y 945
+                 :WIDTH 660
+                 :HEIGHT 495
+                 :WINDOWS NIL
+                 :CURRENT NIL))))))
+   :CURRENT 6)
diff -r 18cc4d4f4ac4 -r 0ad0176a5755 stumpwm/streaming.lisp
--- a/stumpwm/streaming.lisp	Fri Sep 18 17:21:49 2020 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#S(GDUMP
-   :NUMBER 1
-   :NAME "Default"
-   :TREE ((((#S(FDUMP
-                :NUMBER 0
-                :X 0
-                :Y 0
-                :WIDTH 1237
-                :HEIGHT 731
-                :WINDOWS (29360133)
-                :CURRENT 29360133)
-             #S(FDUMP
-                :NUMBER 5
-                :X 0
-                :Y 731
-                :WIDTH 1237
-                :HEIGHT 709
-                :WINDOWS (33554437)
-                :CURRENT 33554437))
-            (#S(FDUMP
-                :NUMBER 1
-                :X 1237
-                :Y 0
-                :WIDTH 2100
-                :HEIGHT 1440
-                :WINDOWS (25165829)
-                :CURRENT 25165829)
-             (#S(FDUMP
-                 :NUMBER 2
-                 :X 3337
-                 :Y 0
-                 :WIDTH 523
-                 :HEIGHT 1020
-                 :WINDOWS (31457285 46137349)
-                 :CURRENT 31457285)
-              #S(FDUMP
-                 :NUMBER 4
-                 :X 3337
-                 :Y 1020
-                 :WIDTH 523
-                 :HEIGHT 420
-                 :WINDOWS (44040197)
-                 :CURRENT 44040197))))
-           #S(FDUMP
-              :NUMBER 3
-              :X 3860
-              :Y 0
-              :WIDTH 1260
-              :HEIGHT 1440
-              :WINDOWS (69206017 62914565 52428816 27262981 23068677)
-              :CURRENT 69206017)))
-   :CURRENT 3)
\ No newline at end of file
diff -r 18cc4d4f4ac4 -r 0ad0176a5755 stumpwm/work.lisp
--- a/stumpwm/work.lisp	Fri Sep 18 17:21:49 2020 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#S(GDUMP
-   :NUMBER 1
-   :NAME "Default"
-   :TREE ((#S(FDUMP
-              :NUMBER 0
-              :X 0
-              :Y 0
-              :WIDTH 1920
-              :HEIGHT 2160
-              :WINDOWS (41943045 39845893 54525957 16777221)
-              :CURRENT 41943045)
-           #S(FDUMP
-              :NUMBER 4
-              :X 1920
-              :Y 0
-              :WIDTH 1920
-              :HEIGHT 2160
-              :WINDOWS (44040195 77594629)
-              :CURRENT 44040195))
-          (#S(FDUMP
-              :NUMBER 1
-              :X 3840
-              :Y 0
-              :WIDTH 960
-              :HEIGHT 1080
-              :WINDOWS (23068677)
-              :CURRENT 23068677)
-           (#S(FDUMP
-               :NUMBER 2
-               :X 4800
-               :Y 0
-               :WIDTH 960
-               :HEIGHT 465
-               :WINDOWS (35651589)
-               :CURRENT 35651589)
-            #S(FDUMP
-               :NUMBER 3
-               :X 4800
-               :Y 465
-               :WIDTH 960
-               :HEIGHT 615
-               :WINDOWS (27262977)
-               :CURRENT 27262977))))
-   :CURRENT 4)
diff -r 18cc4d4f4ac4 -r 0ad0176a5755 stumpwm/zoom.lisp
--- a/stumpwm/zoom.lisp	Fri Sep 18 17:21:49 2020 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-#S(GDUMP
-   :NUMBER 1
-   :NAME "Default"
-   :TREE (((#S(FDUMP
-               :NUMBER 0
-               :X 0
-               :Y 0
-               :WIDTH 835
-               :HEIGHT 870
-               :WINDOWS NIL
-               :CURRENT NIL)
-            #S(FDUMP
-               :NUMBER 2
-               :X 0
-               :Y 870
-               :WIDTH 835
-               :HEIGHT 570
-               :WINDOWS NIL
-               :CURRENT NIL))
-           (((#S(FDUMP
-                 :NUMBER 5
-                 :X 835
-                 :Y 0
-                 :WIDTH 617
-                 :HEIGHT 720
-                 :WINDOWS NIL
-                 :CURRENT NIL)
-              #S(FDUMP
-                 :NUMBER 1
-                 :X 835
-                 :Y 720
-                 :WIDTH 617
-                 :HEIGHT 720
-                 :WINDOWS NIL
-                 :CURRENT NIL))
-             (#S(FDUMP
-                 :NUMBER 4
-                 :X 1452
-                 :Y 0
-                 :WIDTH 2348
-                 :HEIGHT 40
-                 :WINDOWS NIL
-                 :CURRENT NIL)
-              #S(FDUMP
-                 :NUMBER 6
-                 :X 1452
-                 :Y 40
-                 :WIDTH 2300
-                 :HEIGHT 1400
-                 :WINDOWS NIL
-                 :CURRENT NIL)))
-            (#S(FDUMP
-                :NUMBER 3
-                :X 3752 
-                :Y 0
-                :WIDTH 708 
-                :HEIGHT 1440
-                :WINDOWS NIL
-                :CURRENT NIL)
-             (#S(FDUMP
-                 :NUMBER 7
-                 :X 4460
-                 :Y 0
-                 :WIDTH 660
-                 :HEIGHT 945
-                 :WINDOWS NIL
-                 :CURRENT NIL)
-              #S(FDUMP
-                 :NUMBER 8
-                 :X 4460
-                 :Y 945
-                 :WIDTH 660
-                 :HEIGHT 495
-                 :WINDOWS NIL
-                 :CURRENT NIL))))))
-   :CURRENT 6)
diff -r 18cc4d4f4ac4 -r 0ad0176a5755 stumpwmrc
--- a/stumpwmrc	Fri Sep 18 17:21:49 2020 -0400
+++ b/stumpwmrc	Wed Sep 23 12:34:48 2020 -0400
@@ -448,6 +448,9 @@
 (defcommand browser () ()
   (run-or-raise "firefox" '(:class "Firefox")))
 
+(defcommand vlc () ()
+  (run-or-raise "vlc" '(:class "vlc")))
+
 (defcommand terminal () ()
   (run-shell-command (format nil "st -f 'Ubuntu Mono:size=~D'" *terminal-font-size*)))
 
@@ -534,7 +537,7 @@
   ("H-F" "delete-fucked-screenshot")
   ("H-R" "loadrc")
   ("H-r" "rain")
-  ("H-V" "vlime"))
+  ("H-V" "vlc"))
 
 (define-top-keys ;; clipboard
   ("H-u" "generate-random-uuid")
@@ -598,10 +601,10 @@
   ("H-F8" "screen-external"))
 
 (define-top-keys ;; layout
-  ("s-H-m" "restore-from-file ~/src/dotfiles/stumpwm/dev.lisp")
-  ("s-H-s" "restore-from-file ~/src/dotfiles/stumpwm/streaming.lisp")
-  ("s-H-w" "restore-from-file ~/src/dotfiles/stumpwm/work.lisp")
-  ("s-H-z" "restore-from-file ~/src/dotfiles/stumpwm/zoom.lisp"))
+  ("s-H-m" "restore-from-file dev")
+  ("s-H-s" "restore-from-file streaming")
+  ("s-H-w" "restore-from-file work")
+  ("s-H-z" "restore-from-file zoom"))
 
 (define-top-keys ;; timers
   ("s-F7"  "tea-timer")