merge

bashrc

@@ -11,8 +11,7 @@ export HISTSIZE=30000
 export HISTTIMEFORMAT='%F %T '
 
 PROMPT_COMMAND="history -a;$PROMPT_COMMAND"
-#export TERM=xterm-256color
-export TERM=screen-256color
+export TERM=xterm-256color
 
 
 ## for when ssh agent gets screwy
@@ -108,15 +107,15 @@ fd() {
                                 cd "$dir"
     }
 
-if [ -x "$(command -v gpg-agent)" ]; then
-    if pgrep -x "gpg-agent" > /dev/null
-    then
-        export SSH_AUTH_SOCK=${HOME}/.gnupg/S.gpg-agent.ssh
-    else
-        eval $(gpg-agent --daemon --enable-ssh-support --sh)
-    fi
-fi
-
+#if [ -x "$(command -v gpg-agent)" ]; then
+#    if pgrep -x "gpg-agent" > /dev/null
+#    then
+#        export SSH_AUTH_SOCK=${HOME}/.gnupg/S.gpg-agent.ssh
+#    else
+#        eval $(gpg-agent --daemon --enable-ssh-support --sh)
+#    fi
+#fi
+#
 
 
 function toggle-agent {
@@ -155,3 +154,7 @@ rmqq() {
     fi
     qq
 }
+function vpnotp() {
+    ~/tmp/squashfs-root/usr/bin/keepassxc-cli show ~/dropbox/keepass/keepass2.kdbx $1 -q -t -a Password | tr -d '\n' | xclip -selection c
+}
+

bin/rclone.pl

@@ -6,14 +6,13 @@
 my $json    = JSON::XS->new;
 my @remotes = qw/remote gdrive/;
 
-
 sub get_modified {
     my $file     = shift;
     my $output   = capture( "rclone", "lsjson", $file );
     my $decoded  = $json->decode($output);
     my $modified = $decoded->[0]->{ModTime};
     my $dt       = DateTime::Format::ISO8601->parse_datetime($modified);
-    return $dt->epoch;
+    return $dt;
 }
 
 sub copy_file {
@@ -30,9 +29,9 @@ sub copy_file {
     my $remote_dir  = sprintf( "%s:keepass",       $remote );
     my $remote_path = sprintf( "%s/keepass2.kdbx", $remote_dir );
     my $remote_mod  = get_modified($remote_path);
-    my $diff        = $remote_mod - $local_mod;
+    my $diff        = $remote_mod->epoch - $local_mod->epoch;
 
-    next unless ($diff);
+    next unless (abs($diff) > 5);
     if ( $diff >= 0 ) {
         my $datestamp = capturex( "date", "+%F-%H%M%S" );
         chomp($datestamp);
@@ -41,6 +40,7 @@ sub copy_file {
         make_path($conflict_path);
         warn
 "[$remote] WARNING: Remote file is newer than local file by $diff seconds, copying from remote to $conflict_path";
+warn "See if there were any local modifications after $remote_mod";
         my $out = copy_file( $remote_dir, $conflict_path );
         print $out . "\n";
         next;

etc/gpg-agent.conf

@@ -1,4 +1,4 @@
 enable-ssh-support
-pinentry-program /usr/local/MacGPG2/libexec/pinentry-mac.app/Contents/MacOS/pinentry-mac
+pinentry-program /usr/bin/pinentry-qt
 default-cache-ttl 86400
 max-cache-ttl 86400

ssh-config

@@ -2,7 +2,7 @@ Host *.priv.sf
   User appuser
   ConnectTimeout 30
   #ProxyCommand ssh -p2222 -o VisualHostKey=no root@localhost nc -q0 %h %p 2>/dev/null
-  ProxyCommand docker exec -i prodvpn nc -q0 %h %p 2>/dev/null
+  #ProxyCommand docker exec -i prodvpn nc -q0 %h %p 2>/dev/null
   StrictHostKeyChecking false
   KbdInteractiveAuthentication false
 
@@ -70,8 +70,8 @@ Host joe2.home.saturn.sfsrv.net
   ConnectTimeout 30
   StrictHostKeyChecking false
   KbdInteractiveAuthentication false
-  LocalForward *:5432 pg-site.dev.saturn.sfsrv.net:5432
-  LocalForward *:7006 redis-2.dev.saturn.sfsrv.net:7006
+  #LocalForward *:5432 pg-site.dev.saturn.sfsrv.net:5432
+  #LocalForward *:7006 redis-2.dev.saturn.sfsrv.net:7006
 
 
 #Host *.saturn.sflow.us

vim-autoload/plug.vim

@@ -96,7 +96,7 @@ let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
 let s:plug_tab = get(s:, 'plug_tab', -1)
 let s:plug_buf = get(s:, 'plug_buf', -1)
 let s:mac_gui = has('gui_macvim') && has('gui_running')
-let s:is_win = has('win32') || has('win64')
+let s:is_win = has('win32')
 let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
 let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
 let s:me = resolve(expand('<sfile>:p'))
@@ -193,6 +193,14 @@ function! s:ask_no_interrupt(...)
   endtry
 endfunction
 
+function! s:lazy(plug, opt)
+  return has_key(a:plug, a:opt) &&
+        \ (empty(s:to_a(a:plug[a:opt]))         ||
+        \  !isdirectory(a:plug.dir)             ||
+        \  len(s:glob(s:rtp(a:plug), 'plugin')) ||
+        \  len(s:glob(s:rtp(a:plug), 'after/plugin')))
+endfunction
+
 function! plug#end()
   if !exists('g:plugs')
     return s:err('Call plug#begin() first')
@@ -214,7 +222,7 @@ function! plug#end()
       continue
     endif
     let plug = g:plugs[name]
-    if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for')
+    if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for')
       let s:loaded[name] = 1
       continue
     endif
@@ -763,6 +771,9 @@ function! s:prepare(...)
     execute 'silent! unmap <buffer>' k
   endfor
   setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
+  if exists('+colorcolumn')
+    setlocal colorcolumn=
+  endif
   setf vim-plug
   if exists('g:syntax_on')
     call s:syntax()
@@ -1008,6 +1019,8 @@ function! s:update_impl(pull, force, args) abort
     let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
   endif
 
+  let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
+
   " Python version requirement (>= 2.7)
   if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
     redir => pyv
@@ -1099,7 +1112,7 @@ function! s:update_finish()
       if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
             \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
         call s:log4(name, 'Updating submodules. This may take a while.')
-        let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir)
+        let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir)
       endif
       let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
       if v:shell_error
@@ -1318,7 +1331,7 @@ while 1 " Without TCO, Vim stack is bound to explode
 
   let name = keys(s:update.todo)[0]
   let spec = remove(s:update.todo, name)
-  let new  = !isdirectory(spec.dir)
+  let new  = empty(globpath(spec.dir, '.git', 1))
 
   call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
   redraw
@@ -2211,7 +2224,7 @@ function! s:upgrade()
   let new = tmp . '/plug.vim'
 
   try
-    let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp))
+    let out = s:system(printf('git clone --depth 1 %s %s', s:shellesc(s:plug_src), s:shellesc(tmp)))
     if v:shell_error
       return s:err('Error upgrading vim-plug: '. out)
     endif
@@ -2407,7 +2420,11 @@ function! s:diff()
     call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
     for [k, v] in plugs
       let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
-      let diff = s:system_chomp('git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')), v.dir)
+      let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
+      if has_key(v, 'rtp')
+        let cmd .= ' -- '.s:shellesc(v.rtp)
+      endif
+      let diff = s:system_chomp(cmd, v.dir)
       if !empty(diff)
         let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
         call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
@@ -2426,8 +2443,13 @@ function! s:diff()
         \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
 
   if cnts[0] || cnts[1]
-    nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
-    nnoremap <silent> <buffer> o    :silent! call <SID>preview_commit()<cr>
+    nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
+    if empty(maparg("\<cr>", 'n'))
+      nmap <buffer> <cr> <plug>(plug-preview)
+    endif
+    if empty(maparg('o', 'n'))
+      nmap <buffer> o <plug>(plug-preview)
+    endif
   endif
   if cnts[0]
     nnoremap <silent> <buffer> X :call <SID>revert()<cr>

vimrc

@@ -7,6 +7,7 @@ call plug#begin('~/.vim/plugged')
     Plug 'junegunn/fzf.vim'
     Plug 'jamessan/vim-gnupg'
     Plug 'vim-scripts/openssl.vim'
+    Plug 'https://github.com/Alok/notational-fzf-vim'
 call plug#end()
 " }}}
 
@@ -143,6 +144,9 @@ let mapleader = ","
 nmap <silent> <leader>ev :e $MYVIMRC<CR>
 nmap <silent> <leader>sv :so $MYVIMRC<CR>
 
+nmap <leader>e V:s/,/,\r/g<CR>:noh<CR>
+vmap <leader>e :s/,/,\r/g<CR>:noh<CR>
+
 " Ctrl-I increments since Ctrl-A is my tmux key
 noremap <C-I> <C-A>
 
@@ -313,4 +317,12 @@ let g:GPGDefaultRecipients=['0x059BE1E2A99DA7EB']
 augroup GPGFile
     nmap <silent> <C-W>Q <C-W>qi
 augroup END
+
+" For working with creds file
+augroup CredFile
+      au! BufRead,BufNewFile,BufEnter creds.yml.asc nmap <Leader>o f:w"+y$0yt::vs ../sf-deploy-application/<C-r>".aes<CR>
+augroup END
+
+let g:nv_search_paths = ['~/wiki']
+
 " vim: set fdm=marker: