Use my own java-syntax plugin

config/.config/nvim/lua/telescope_config.lua

@@ -39,41 +39,11 @@ require('telescope').setup {
 }
 
 -- These custom mappings let you open telescope-codesearch quickly:
--- Fuzzy find files in codesearch.
-vim.api.nvim_set_keymap('n', '<leader>ss',
-  [[<cmd>lua require('telescope').extensions.codesearch.find_files{}<CR>]],
-  { noremap = true, silent=true }
-)
-
 vim.api.nvim_set_keymap('n', '<C-P>',
   [[<cmd>lua require('telescope').extensions.codesearch.find_files{}<CR>]],
   { noremap = true, silent=true }
 )
 
--- Search using codesearch queries.
-vim.api.nvim_set_keymap('n', '<leader>sd',
-  [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]],
-  { noremap = true, silent=true }
-)
-
--- Search for the word under cursor.
-vim.api.nvim_set_keymap('n', '<leader>sD',
-[[<cmd>lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]],
-{ noremap = true, silent=true }
-)
-
--- Search for a file having word under cursor in its name.
-vim.api.nvim_set_keymap('n', '<leader>sS',
-[[<cmd>lua require('telescope').extensions.codesearch.find_files{default_text_expand='<cword>'}<CR>]],
-{ noremap = true, silent=true }
-)
-
--- Search for text selected in Visual mode.
-vim.api.nvim_set_keymap('v', '<leader>sd',
-[[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]],
-{ noremap = true, silent=true }
-)
-
 -- Search using codesearch queries.
 vim.api.nvim_set_keymap(
   "n",
@@ -81,6 +51,14 @@ vim.api.nvim_set_keymap(
   [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]],
   { noremap = true, silent = true }
 )
+--
+-- Search for files using codesearch queries.
+vim.api.nvim_set_keymap(
+  "n",
+  "<leader>cf",
+  [[<cmd>lua require('telescope').extensions.codesearch.find_files{}<CR>]],
+  { noremap = true, silent = true }
+)
 
 -- Search for the word under cursor.
 vim.api.nvim_set_keymap(
@@ -93,7 +71,7 @@ vim.api.nvim_set_keymap(
 -- Search for a file having word under cursor in its name.
 vim.api.nvim_set_keymap(
   "n",
-  "<leader>csS",
+  "<leader>CF",
   [[<cmd>lua require('telescope').extensions.codesearch.find_files{default_text_expand='<cword>'}<CR>]],
   { noremap = true, silent = true }
 )
@@ -105,3 +83,11 @@ vim.api.nvim_set_keymap(
   [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]],
   { noremap = true, silent = true }
 )
+
+-- Search for file having text selected in Visual mode.
+vim.api.nvim_set_keymap(
+  "v",
+  "<leader>cf",
+  [[<cmd>lua require('telescope').extensions.codesearch.find_files{}<CR>]],
+  { noremap = true, silent = true }
+)

fig/.hgrc

@@ -1,26 +1,49 @@
-# example user config (see 'hg help config' for more info)
+%include ~/hgshort/hgshort.hgrc
+
 [ui]
-# name and email, e.g.
-# username = Jane Doe <jdoe@example.com>
-username = Christian Nieves <cnieves@google.com>
-
-# We recommend enabling tweakdefaults to get slight improvements to
-# the UI over time. Make sure to set HGPLAIN in the environment when
-# writing scripts!
-tweakdefaults = True
-
-# uncomment to disable color in command output
-# (see 'hg help color' for details)
-# color = never
-
-# uncomment to disable command output pagination
-# (see 'hg help pager' for details)
+editor = vim
 paginate = never
+merge = vimdiff
+username = Christian Nieves <cnieves@google.com>
+# graphnodetemplate = {label("graphnode.{graphnode}", graphnode)}
+
+[extdiff]
+cmd.meld = /usr/bin/meld
+cmd.pmeld = /usr/bin/meld
 
 [extensions]
-# uncomment the lines below to enable some popular extensions
-# (see 'hg help extensions' for more info)
-#
-# histedit =
-# rebase =
-# uncommit =
+unsupported.tree =
+unsupported.alices =
+extdiff =
+color =
+beautifygraph =
+
+[alices]
+findings.extra_args = --proxy
+summarize.extra_args = --proxy
+
+[merge-tools]
+# meld.args = --auto-merge --label='incoming' $local --label='merged' $base --label='existing' $other -o $output
+# https://www.mercurial-scm.org/wiki/MergingWithVim#More_Useful_3-Way_Diff
+vimdiff.executable = vimdiff
+vimdiff.args = -f -d $output -M $local $base $other -c "wincmd J" -c "set modifiable" -c "set write"
+vimdiff.premerge = keep
+
+[committemplate]
+changeset = {desc}\n\n
+    HG: {extramsg}
+    HG: user: {author}\n{ifeq(p2rev, "-1", "",
+   "HG: branch merge\n")
+   }HG: branch '{branch}'\n{if(currentbookmark,
+   "HG: bookmark '{currentbookmark}'\n")  }{subrepos %
+   "HG: subrepo {subrepo}\n"              }
+   {splitlines(diff()) % 'HG: {line}\n'}
+
+[alias]
+whatsout = status -n --change .
+whatsoutall = status --rev p4base --no-status
+# unbranch = cp --forget --at-rev . $1
+unbranch = !$HG uncommit --keep $1 && $HG forget $1 && $HG add $1 && $HG amend $1
+
+[trainingwheels]
+warn-head-paths=False

scripts/scripts/work

@@ -13,7 +13,7 @@ gcertstatus || gcert
 
 # Just keep reconnecting upon failure
 while [ 1 ]; do
-  ssh -t $host $SSH_OPTS "$tmux_cmd"
+  ssh $host -t $SSH_OPTS "$tmux_cmd"
 
   # Don't reconnect if disconnection not due to error (i.e., user detached)
   if [ $? -eq 0 ]; then break; fi

tmux/.tmux.conf

@@ -15,7 +15,7 @@ set-window-option -g pane-base-index 1
 
 set -g default-terminal "screen-256color"
 set -ga terminal-overrides ",xterm-256color*:Tc" # tell Tmux that outside terminal supports true color
-set -g default-shell zsh
+# set -g default-shell zsh
 
 # force a reload of the config file
 unbind r

vim/.vim/autoload/plug.vim

@@ -242,6 +242,8 @@ function! plug#begin(...)
     let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p'))
   elseif exists('g:plug_home')
     let home = s:path(g:plug_home)
+  elseif has('nvim')
+    let home = stdpath('data') . '/plugged'
   elseif !empty(&rtp)
     let home = s:path(split(&rtp, ',')[0]) . '/plugged'
   else
@@ -350,7 +352,7 @@ function! plug#end()
   endif
   let lod = { 'ft': {}, 'map': {}, 'cmd': {} }
 
-  if exists('g:did_load_filetypes')
+  if get(g:, 'did_load_filetypes', 0)
     filetype off
   endif
   for name in g:plugs_order
@@ -405,7 +407,7 @@ function! plug#end()
 
   for [map, names] in items(lod.map)
     for [mode, map_prefix, key_prefix] in
-          \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
+          \ [['i', '<C-\><C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
       execute printf(
       \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
       \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)
@@ -2619,26 +2621,34 @@ function! s:preview_commit()
 
   let sha = matchstr(getline('.'), '^  \X*\zs[0-9a-f]\{7,9}')
   if empty(sha)
-    return
+    let name = matchstr(getline('.'), '^- \zs[^:]*\ze:$')
+    if empty(name)
+      return
+    endif
+    let title = 'HEAD@{1}..'
+    let command = 'git diff --no-color HEAD@{1}'
+  else
+    let title = sha
+    let command = 'git show --no-color --pretty=medium '.sha
+    let name = s:find_name(line('.'))
   endif
 
-  let name = s:find_name(line('.'))
   if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir)
     return
   endif
 
   if exists('g:plug_pwindow') && !s:is_preview_window_open()
     execute g:plug_pwindow
-    execute 'e' sha
+    execute 'e' title
   else
-    execute 'pedit' sha
+    execute 'pedit' title
     wincmd P
   endif
-  setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
+  setlocal previewwindow filetype=git buftype=nofile bufhidden=wipe nobuflisted modifiable
   let batchfile = ''
   try
     let [sh, shellcmdflag, shrd] = s:chsh(1)
-    let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
+    let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && '.command
     if s:is_win
       let [batchfile, cmd] = s:batchfile(cmd)
     endif
@@ -2764,9 +2774,9 @@ function! s:snapshot(force, ...) abort
   1
   let anchor = line('$') - 3
   let names = sort(keys(filter(copy(g:plugs),
-        \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)')))
+        \'has_key(v:val, "uri") && isdirectory(v:val.dir)')))
   for name in reverse(names)
-    let sha = s:git_revision(g:plugs[name].dir)
+    let sha = has_key(g:plugs[name], 'commit') ? g:plugs[name].commit : s:git_revision(g:plugs[name].dir)
     if !empty(sha)
       call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha))
       redraw

vim/.vim/prefs/.gitignore

@@ -0,0 +1 @@
+use_google.vim