stuff

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)
+    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
+
   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

zsh/.bash_profile

@@ -1,6 +1,7 @@
 export PATH=$PATH:$HOME/bin
 export PATH=$PATH:$HOME/scripts
 export MOCWORD_DATA=$HOME/mocword/mocword.sqlite
+export BASH_PROFILE_SOURCED=true
 
 export PATH=$PATH:.
 export GOPATH=$HOME/go
@@ -21,10 +22,6 @@ export EDITOR='nvim'
 
 HISTCONTROL=ignoreboth
 
-source ~/.aliases.sh
-# source ~/.funcs.sh
-
-source ~/.bash-powerline.sh
 
 export DEVKITPRO=/opt/devkitpro
 export DEVKITARM=${DEVKITPRO}/devkitARM
@@ -39,3 +36,4 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 source ~/.bash_profile.local
+source ~/.aliases.sh

zsh/.bash_profile.local

@@ -2,15 +2,13 @@
 # Google Specific
 # ---------------
 # For running crow against a remote X server
-xhost +
+# xhost +
 export PATH=$PATH:/google/src/head/depot/google3/experimental/users/cnieves/util
 export XAUTHORITY=~/.Xauthority
 export GOROOT=/usr/lib/google-golang
 export PATH=$GOROOT/bin:$PATH
 export JAVA_HOME=$(readlink -ne /usr/local/buildtools/java/jdk)
 
-source /etc/bash_completion.d/hgd
-
 function gcert() {
   if [[ -n $TMUX ]]; then
     eval $(tmux show-environment -s)
@@ -30,8 +28,11 @@ if [[ ! -z "$TMUX" ]]; then
   precmd_functions+=(tmux_title)
 fi
 
-prodcertstatus &> /dev/null &&
-  /google/data/ro/users/di/diamondm/engfortunes/fortune.sh
+
+FORTUNES=/google/data/ro/users/di/diamondm/engfortunes/fortune.sh
+if [ -f "$FORTUNES" ]; then
+    prodcertstatus &> /dev/null && $FORTUNES
+fi
 
 # Install fzf-query
 export PATH="${PATH}:/google/bin/releases/editor-devtools"

zsh/.oh-my-zsh/.editorconfig

@@ -1,8 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-indent_size = 2
-indent_style = space

zsh/.oh-my-zsh/.github/CODEOWNERS

@@ -1,10 +0,0 @@
-# Plugin owners
-plugins/archlinux/                  @ratijas
-plugins/aws/                        @maksyms
-plugins/genpass/                    @atoponce
-plugins/git-lfs/                    @hellovietduc
-plugins/gitfast/                    @felipec
-plugins/sdk/                        @rgoldberg
-plugins/universalarchive/           @Konfekt
-plugins/wp-cli/                     @joshmedeski
-plugins/zoxide/                     @ajeetdsouza

zsh/.oh-my-zsh/.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: [robbyrussell, mcornella, larson-carter]
-open_collective: ohmyzsh