20e6b1f3b43e

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Thu, 16 Jan 2020 12:16:08 -0500
parents 0562f12335c0 (diff) 52df46e416f5 (current diff)
children 22b96790d57c
branches/tags (none)
files

Changes

--- a/.hgsubstate	Thu Jan 16 11:27:08 2020 -0500
+++ b/.hgsubstate	Thu Jan 16 12:16:08 2020 -0500
@@ -38,5 +38,5 @@
 f6f2d6618a321f5b0065586a7bc934325fec81ab vim/bundle/targets
 c860f7c3ae0e0287f143a5b3e58873fc0a9fbda9 vim/bundle/vim-go
 5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex
-16b96feec48c207591cea80882818e5d24a03c43 vim/bundle/vlime
+b7635ca940e8a00dac0a27cc4c80f523a3a9d9a8 vim/bundle/vlime
 6876fe38b33732cb124d415ffc4156f16da5e118 vim/bundle/windowswap
--- a/README.md	Thu Jan 16 11:27:08 2020 -0500
+++ b/README.md	Thu Jan 16 12:16:08 2020 -0500
@@ -1,4 +1,4 @@
-```text
+```
      _ _     __ _       _    __ _ _
     (_) |   / /| |     | |  / _(_) |
  ___ _| |  / /_| | ___ | |_| |_ _| | ___  ___
--- a/bin/bouncehg	Thu Jan 16 11:27:08 2020 -0500
+++ b/bin/bouncehg	Thu Jan 16 12:16:08 2020 -0500
@@ -3,4 +3,4 @@
 set -euo pipefail
 
 pass show -c servers/hg/sjl
-ssh -t hsl -- sudo servicectl restart hg
+ssh -t hsl -- sudo systemctl restart hg
--- a/vim/vimrc	Thu Jan 16 11:27:08 2020 -0500
+++ b/vim/vimrc	Thu Jan 16 12:16:08 2020 -0500
@@ -1518,11 +1518,8 @@
 augroup ft_hgrc
     au!
 
-    " s/shs/ghs/
-    au BufReadPost,BufNewFile hgrc nnoremap <buffer> <localleader>g yypciwgit<esc>wwcwghs<esc>A.git<esc>
-
-    " s/shs/bbs/
-    au BufReadPost,BufNewFile hgrc nnoremap <buffer> <localleader>b yypciwbit<esc>wwcwbbs<esc>
+    " s/hsl/ghs/
+    au BufReadPost,BufNewFile hgrc nnoremap <buffer> <localleader>g yypciwgit<esc>wwcwghs<esc>f/f/asjl/<esc>A.git<esc>
 augroup END
 
 " }}}