# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1567000282 14400
# Node ID cbfc3c8ecf62449f989b8c53bb1774bebb8e5963
# Parent  5c6597e570716f72044fa5afe2e085c6192fae53# Parent  9d8af88da734df74652c5c9082fa3880cc9d2707
Merge.

diff -r 9d8af88da734 -r cbfc3c8ecf62 gitconfig
--- a/gitconfig	Mon Aug 26 18:29:46 2019 -0400
+++ b/gitconfig	Wed Aug 28 09:51:22 2019 -0400
@@ -17,8 +17,8 @@
 
     l   = log -18 --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
     ll  = log     --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
-    gl  = log -12 --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(by %an)%Creset%C(yellow bold)%d%Creset%n'
-    gll = log     --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(%cr by %an)%Creset%C(yellow bold)%d%Creset%n'
+    gl  = log -12 --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(by %an)%Creset%C(auto)%d%Creset%n'
+    gll = log     --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(%cr by %an)%Creset%C(auto)%d%Creset%n'
 
     pull = pull --ff-only
     up = merge --ff-only
diff -r 9d8af88da734 -r cbfc3c8ecf62 mutt/muttrc
--- a/mutt/muttrc	Mon Aug 26 18:29:46 2019 -0400
+++ b/mutt/muttrc	Wed Aug 28 09:51:22 2019 -0400
@@ -222,7 +222,7 @@
 bind compose p postpone-message
 bind compose P pgp-menu
 
-macro compose H "| pandoc -r markdown -w html -o ~/.mutt/temp/neomutt-alternative.html<enter><attach-file>~/.mutt/temp/neomutt-alternative.html<enter><tag-entry><previous-entry><tag-entry><group-alternatives>"
+macro compose H "| pandoc -r markdown-blank_before_blockquote -w html -o ~/.mutt/temp/neomutt-alternative.html<enter><attach-file>~/.mutt/temp/neomutt-alternative.html<enter><tag-entry><previous-entry><tag-entry><group-alternatives>"
 
 # }}}
 # Attachment {{{
diff -r 9d8af88da734 -r cbfc3c8ecf62 stumpwm/zoom.lisp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stumpwm/zoom.lisp	Wed Aug 28 09:51:22 2019 -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 120
+                 :WINDOWS NIL
+                 :CURRENT NIL)
+              #S(FDUMP
+                 :NUMBER 6
+                 :X 1452
+                 :Y 120
+                 :WIDTH 2348
+                 :HEIGHT 1320
+                 :WINDOWS (23068677)
+                 :CURRENT 23068677)))
+            (#S(FDUMP
+                :NUMBER 3
+                :X 3800
+                :Y 0
+                :WIDTH 660
+                :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)
\ No newline at end of file
diff -r 9d8af88da734 -r cbfc3c8ecf62 stumpwmrc
--- a/stumpwmrc	Mon Aug 26 18:29:46 2019 -0400
+++ b/stumpwmrc	Wed Aug 28 09:51:22 2019 -0400
@@ -301,8 +301,9 @@
                                    (,extern ("--auto"))
                                    (,extern ("--primary"))
 
-                                   (,laptop ("--auto"))
-                                   (,laptop ("--right-of" ,extern)))
+                                   ;; (,laptop ("--auto"))
+                                   ;; (,laptop ("--right-of" ,extern))
+                                   )
         do (pr (uiop:run-program `("xrandr" "--output" ,output ,@commands)))))
 
 (defcommand vlime () ()
@@ -359,6 +360,11 @@
 
 
 ;;;; Terminal Fonts -----------------------------------------------------------
+(defparameter *terminal-font-size* (if (probe-file "~/.terminal-font")
+                                     (with-open-file (f "~/.terminal-font")
+                                       (read f))
+                                     11))
+
 (defcommand st-font-up ()
     ()
   (loop :repeat 7 :do (meta (kbd "C-S-SunPageUp"))))
@@ -389,7 +395,7 @@
   (run-or-raise "firefox" '(:class "Firefox")))
 
 (defcommand terminal () ()
-  (run-shell-command "st -f 'Ubuntu Mono:size=11'"))
+  (run-shell-command (format nil "st -f 'Ubuntu Mono:size=~D'" *terminal-font-size*)))
 
 
 ;;;; Timers -------------------------------------------------------------------
@@ -517,7 +523,8 @@
 (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-w" "restore-from-file ~/src/dotfiles/stumpwm/work.lisp")
+  ("s-H-z" "restore-from-file ~/src/dotfiles/stumpwm/zoom.lisp"))
 
 (define-top-keys ;; timers
   ("s-F7"  "tea-timer")