# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1555613332 14400
# Node ID 994750f7b6dda183f437b901ffca631b49827c67
# Parent  9336c053ff7a3822211141d78aad822feed7a44c# Parent  855cbad5f857f6f18d24ca2378bc14ee5c8042ae
Merge.

diff -r 855cbad5f857 -r 994750f7b6dd ffignore
--- a/ffignore	Tue Apr 16 21:46:51 2019 -0400
+++ b/ffignore	Thu Apr 18 14:48:52 2019 -0400
@@ -5,6 +5,7 @@
 UnityTempFile
 .m2
 node_modules
+fake-gopath
 
 syntax:regex
 \btags$
diff -r 855cbad5f857 -r 994750f7b6dd fish/config.fish
--- a/fish/config.fish	Tue Apr 16 21:46:51 2019 -0400
+++ b/fish/config.fish	Thu Apr 18 14:48:52 2019 -0400
@@ -21,7 +21,7 @@
 alias p pass
 alias pw pass-work
 
-complete -c pass-work -w pass
+complete -c s -w ssh
 
 # I give up
 alias :q exit
@@ -31,6 +31,7 @@
 # Abbreviations {{{
 
 abbr ai="sudo apt install"
+abbr sc="sudo systemctl"
 
 # }}}
 # Completions {{{
diff -r 855cbad5f857 -r 994750f7b6dd stumpwmrc
--- a/stumpwmrc	Tue Apr 16 21:46:51 2019 -0400
+++ b/stumpwmrc	Thu Apr 18 14:48:52 2019 -0400
@@ -175,27 +175,23 @@
   (loop with laptop = "eDP1"
         with extern = "DP1"
         for (output commands) in `((,extern ("--off"))
-                                   ;; (,rhs-name ("--auto"))
-                                   ;; (,rhs-name ("--primary"))
                                    (,laptop ("--off"))
-                                   (,laptop ("--auto"))
-                                   ;; (,laptop ("--left-of" ,rhs-name))
-                                   ;; (,laptop ("--rotate" "left"))
-                                   )
+
+                                   (,extern ("--auto"))
+                                   (,extern ("--primary")))
         do (uiop:run-program `("xrandr" "--output" ,output ,@commands))))
 
 (defcommand screen-multi () ()
   (loop with laptop = "eDP1"
         with extern = "DP1"
-        for (output commands) in `((,laptop ("--off"))
-                                   (,extern ("--off"))
-                                   ;; (,laptop ("--auto"))
+        for (output commands) in `((,extern ("--off"))
+                                   (,laptop ("--off"))
+
                                    (,extern ("--auto"))
                                    (,extern ("--primary"))
-                                   ;; (,extern ("--mode" "2560x1440"))
-                                   ;; (,extern ("--left-of" ,laptop))
-                                   ;; (,extern ("--right-of" ,laptop))
-                                   )
+
+                                   (,laptop ("--auto"))
+                                   (,laptop ("--left-of" ,extern)))
         do (pr (uiop:run-program `("xrandr" "--output" ,output ,@commands)))))
 
 (defcommand vlime () ()
diff -r 855cbad5f857 -r 994750f7b6dd vim/vimrc
--- a/vim/vimrc	Tue Apr 16 21:46:51 2019 -0400
+++ b/vim/vimrc	Thu Apr 18 14:48:52 2019 -0400
@@ -2251,6 +2251,7 @@
 let g:ctrlp_map = '<leader>,'
 nnoremap <leader>. :CtrlPTag<cr>
 nnoremap <leader>b :CtrlPBuffer<cr>
+nnoremap <leader><lt> :CtrlP<space>
 
 let g:ctrlp_prompt_mappings = {
 \ 'PrtSelectMove("j")':   ['<c-j>', '<down>', '<s-tab>'],
@@ -2273,7 +2274,7 @@
 " Fugitive {{{
 
 nnoremap <leader>gd :Gdiff<cr>
-nnoremap <leader>gs :Gstatus<cr>:15wincmd_<cr>
+nnoremap <leader>gs :Gstatus<cr>:15wincmd_<cr>:setlocal winfixheight<cr>
 nnoremap <leader>gw :Gwrite<cr>
 nnoremap <leader>ga :Gadd<cr>
 nnoremap <leader>gb :Gblame<cr>