# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1540836127 14400
# Node ID 0bc82682a613424a3e22129ac5baa27fad61c88f
# Parent  5c7c7f2d790474c7ea9147514415cb030f36b92e# Parent  12589666f6a3333176085483e732739a2b886ce8
Merge.

diff -r 12589666f6a3 -r 0bc82682a613 bin/gcontrol
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/gcontrol	Mon Oct 29 14:02:07 2018 -0400
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+env XDG_CURRENT_DESKTOP=GNOME gnome-control-center
diff -r 12589666f6a3 -r 0bc82682a613 bin/switch-yubikeys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/switch-yubikeys	Mon Oct 29 14:02:07 2018 -0400
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+grep -rl shadowed-private-key ~/.gnupg/private-keys-v1.d/ | xargs rm
+gpg --card-status
diff -r 12589666f6a3 -r 0bc82682a613 fish/functions/ep.fish
--- a/fish/functions/ep.fish	Mon Oct 22 17:50:09 2018 -0400
+++ b/fish/functions/ep.fish	Mon Oct 29 14:02:07 2018 -0400
@@ -5,7 +5,6 @@
         nvim README.markdown
         git cm 'Update' -a
         git push origin master
-        git push gist master
         cd -
     case '*'
         hg -R ~/.plan pull -u
diff -r 12589666f6a3 -r 0bc82682a613 gitconfig
--- a/gitconfig	Mon Oct 22 17:50:09 2018 -0400
+++ b/gitconfig	Mon Oct 29 14:02:07 2018 -0400
@@ -37,7 +37,8 @@
 
     d = "!sh -c 'git diff $* | nvim -R -' -"
     di = !git diff --cached | nvim -R -
-    dl = !git diff | nvim -R -c 'set ft=diff' -
+    ; dl = !git diff $* | nvim -R -c 'set ft=diff' -
+    dl = "!f() { git diff \"$@\" | nvim -R -c 'set ft=diff' -; }; f"
 
     co = checkout
     id = rev-parse
diff -r 12589666f6a3 -r 0bc82682a613 stumpwmrc
--- a/stumpwmrc	Mon Oct 22 17:50:09 2018 -0400
+++ b/stumpwmrc	Mon Oct 29 14:02:07 2018 -0400
@@ -13,7 +13,7 @@
       *message-window-gravity* :center
       *input-window-gravity* :center
       *debug-level* 0
-      *resize-increment* 50
+      *resize-increment* 75
       *window-format* "(%n%m%20t)"
       *window-name-source* :title
       *shell-program* "/bin/bash")
@@ -118,7 +118,7 @@
 
 
 ;;;; Brightness ---------------------------------------------------------------
-(defparameter *brightness-values* #(0 1 10 25 50 75 100))
+(defparameter *brightness-values* #(0 1 5 10 25 50 75 100))
 (defvar *brightness-index* 5)
 
 (defun brightness ()
@@ -192,7 +192,7 @@
                                    (,extern ("--auto"))
                                    (,extern ("--primary"))
                                    ;; (,extern ("--mode" "2560x1440"))
-                                   (,extern ("--right-of" ,laptop)))
+                                   (,extern ("--left-of" ,laptop)))
         do (pr (uiop:run-program `("xrandr" "--output" ,output ,@commands)))))
 
 (defcommand vlime () ()
@@ -356,7 +356,7 @@
   '(("st-256color"
      ("s-c" . "C-C")
      ("s-v" . "C-V"))
-    ("(Firefox|Google-chrome)"
+    ("(Firefox|Google-chrome|Chromium-browser)"
      ("s-1" . "C-S-Tab")
      ("s-2" . "C-Tab")
      ("C-a" . "Home")
diff -r 12589666f6a3 -r 0bc82682a613 vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Mon Oct 22 17:50:09 2018 -0400
+++ b/vim/custom-dictionary.utf-8.add	Mon Oct 29 14:02:07 2018 -0400
@@ -255,3 +255,12 @@
 rebase
 submodules
 artisanal
+Yubikey
+PR'ed
+borked
+greping
+deserializing
+structs
+deserialization
+unmarshal
+lol
diff -r 12589666f6a3 -r 0bc82682a613 vim/vimrc
--- a/vim/vimrc	Mon Oct 22 17:50:09 2018 -0400
+++ b/vim/vimrc	Mon Oct 29 14:02:07 2018 -0400
@@ -45,6 +45,7 @@
 set title
 set linebreak
 set colorcolumn=+1
+set diffopt+=vertical
 
 " Spelling
 "
@@ -581,7 +582,7 @@
         let s .= "%#GWStatusLineModeY#"
         let s .= ""
         let s .= "%#GWStatusLineMode#"
-        let s .= " %c/"
+        let s .= " %c:"
         let s .= "%l"        " Current line
         let s .= "/"
         let s .= "%L"        " Total lines
@@ -1402,7 +1403,7 @@
     au FileType go nnoremap <buffer> <silent> M :GoDoc<cr>
 
     " this language is incredible
-    au FileType go imap <buffer> ,ern<space> if err != nil {<cr>return nil, err<esc>jo
+    au FileType go iabbrev <buffer> ernil if err != nil {<cr>return nil, err<esc>jA
 augroup END
 
 " }}}
@@ -1531,6 +1532,9 @@
 
     au Filetype markdown setlocal spell
 
+    " Linkify selected text inline to contents of pasteboard.
+    au Filetype markdown vnoremap <buffer> <localleader>l <esc>`>a]<esc>`<i[<esc>`>lla()<esc>"+P
+
     " Use <localleader>1/2/3 to add headings.
     au Filetype markdown nnoremap <buffer> <localleader>1 yypVr=:redraw<cr>
     au Filetype markdown nnoremap <buffer> <localleader>2 yypVr-:redraw<cr>
@@ -1611,7 +1615,7 @@
 augroup ft_plan
     au!
 
-    au BufNewFile,BufRead ~/.plan/README.markdown nnoremap <buffer> <localleader>l :call PlanLinkPaste()<cr>
+    " 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
 augroup END