# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1560010050 14400
# Node ID 25592561dd6fcdfc5e8eda38bb6daac7f42d83ee
# Parent  93292b5dede067c3bddeb0ecb805e23e53985360# Parent  e6377c64c49b820f712fd985bd882973bc3b203e
Merge.

diff -r 93292b5dede0 -r 25592561dd6f Xmodmap
--- a/Xmodmap	Sat Jun 08 12:07:02 2019 -0400
+++ b/Xmodmap	Sat Jun 08 12:07:30 2019 -0400
@@ -15,7 +15,8 @@
 keycode 108 = Mode_switch
 
 keycode 900 = F16
-keycode 901 = F17
+! for some reason this fucks up keycode 133.  I have no idea why this happens.
+! keycode 901 = F17
 keycode 902 = F18
 keycode 903 = F19
 keycode 904 = F20
diff -r 93292b5dede0 -r 25592561dd6f bin/keysettings
--- a/bin/keysettings	Sat Jun 08 12:07:02 2019 -0400
+++ b/bin/keysettings	Sat Jun 08 12:07:30 2019 -0400
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
+killall xbindkeys
+xbindkeys
+
 xmodmap ~/.Xmodmap
 xset r rate 220 55
 
-killall xbindkeys
-xbindkeys
diff -r 93292b5dede0 -r 25592561dd6f bin/tea
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/tea	Sat Jun 08 12:07:30 2019 -0400
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+sleep "$1"s
+say 'The tea is ready.'
diff -r 93292b5dede0 -r 25592561dd6f fish/functions/epp.fish
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fish/functions/epp.fish	Sat Jun 08 12:07:30 2019 -0400
@@ -0,0 +1,14 @@
+function epp -d "Edit personal .plan"
+    switch (hostname)
+    case alephnull
+        cd ~/.personal-plan
+    case '*'
+        cd ~/.plan
+    end
+
+    hg pull -u
+    nvim README.markdown
+    hg ci -m 'Update'
+    hg pa
+    cd -
+end
diff -r 93292b5dede0 -r 25592561dd6f stumpwmrc
--- a/stumpwmrc	Sat Jun 08 12:07:02 2019 -0400
+++ b/stumpwmrc	Sat Jun 08 12:07:30 2019 -0400
@@ -271,7 +271,7 @@
   (run-or-raise "firefox" '(:class "Firefox")))
 
 
-;;;; EQ Timers ----------------------------------------------------------------
+;;;; Timers -------------------------------------------------------------------
 (defparameter *pop-timer-minutes* nil)
 (defparameter *pop-timer-seconds* nil)
 
@@ -304,6 +304,10 @@
   (setf *pop-timer-minutes* minutes
         *pop-timer-seconds* seconds))
 
+(defcommand tea-timer (seconds)
+    ((:number "Seconds: "))
+  (run-shell-command (format nil "tea ~D" seconds)))
+
 
 ;;;; Key Mapping --------------------------------------------------------------
 ;;; Conventions:
@@ -394,6 +398,7 @@
   ("s-H-s" "restore-from-file ~/src/dotfiles/stumpwm/streaming.lisp"))
 
 (define-top-keys ;; timers
+  ("s-F7"  "tea-timer")
   ("s-F9"  "run-pop-timer")
   ("s-F10" "set-pop-timer"))
 
diff -r 93292b5dede0 -r 25592561dd6f vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Sat Jun 08 12:07:02 2019 -0400
+++ b/vim/custom-dictionary.utf-8.add	Sat Jun 08 12:07:30 2019 -0400
@@ -284,3 +284,6 @@
 virtualization
 rebasing
 destructure
+upsert
+upserts
+lysed
diff -r 93292b5dede0 -r 25592561dd6f vim/vimrc
--- a/vim/vimrc	Sat Jun 08 12:07:02 2019 -0400
+++ b/vim/vimrc	Sat Jun 08 12:07:30 2019 -0400
@@ -271,6 +271,8 @@
 silent! digr // 9585 "U+2571=╱    BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT
 silent! digr \\ 9586 "U+2572=╲    BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT
 
+silent! digr \|\| 8214 "U+2016=‖    DOUBLE VERTICAL LINE
+
 " }}}
 " Convenience mappings ---------------------------------------------------- {{{
 
@@ -1780,6 +1782,7 @@
 
     " au BufNewFile,BufRead ~/.plan/README.markdown nnoremap <buffer> <localleader>l :call PlanLinkPaste()<cr>
     au BufNewFile,BufRead ~/.plan/README.markdown nnoremap <buffer> <localleader>d o##<esc>:r!date +\%Y-\%m-\%d<cr>kJ
+    au BufNewFile,BufRead ~/.personal-plan/README.markdown nnoremap <buffer> <localleader>d o##<esc>:r!date +\%Y-\%m-\%d<cr>kJ
 augroup END
 
 " }}}
@@ -2247,6 +2250,19 @@
 let g:ackprg = 'ag --smart-case --nogroup --nocolor --column'
 
 " }}}
+" Boxdraw {{{
+
+vmap <space> +O
+vmap -. +>
+vmap -, +<
+vmap -6 +^
+vmap -v +v
+vmap -> ++>
+vmap -< ++<
+vmap -^ ++^
+vmap -V ++v
+
+" }}}
 " Clam {{{
 
 nnoremap ! :Clam<space>
@@ -3322,6 +3338,23 @@
     let g:terminal_scrollback_buffer_size = 10000
     let $NVIM_TUI_ENABLE_CURSOR_SHAPE=1
     set inccommand=nosplit
+
+    let g:terminal_color_0 = '#070807'
+    let g:terminal_color_1 = '#e93f40'
+    let g:terminal_color_2 = '#88dc02'
+    let g:terminal_color_3 = '#fb7d01'
+    let g:terminal_color_4 = '#0abcfe'
+    let g:terminal_color_5 = '#fe5691'
+    let g:terminal_color_6 = '#76dff3'
+    let g:terminal_color_7 = '#f4f4f4'
+    let g:terminal_color_8 = '#5d5d5d'
+    let g:terminal_color_9 = '#e93f40'
+    let g:terminal_color_10 = '#9df903'
+    let g:terminal_color_11 = '#fadf31'
+    let g:terminal_color_12 = '#40cdfe'
+    let g:terminal_color_13 = '#fe2b74'
+    let g:terminal_color_14 = '#09cef2'
+    let g:terminal_color_15 = '#fefffe'
 else
     set encoding=utf-8
 endif