dotfiles.git

@@ -48,20 +48,14 @@ nnoremap <cr> :noh<cr><cr>

 nnoremap <Tab> :bp<cr>

 nnoremap <S-Tab> :bn<cr>

-syntax on

-

 set t_Co=256

-if v:version >= 703

 set colorcolumn=80

-endif

 if has('gui_running') " Didn't work: if &term != 'builtin_gui'

   " Light backgrounds for GUI experiences

   set background=light

   " colorscheme peaksea

   colorscheme tolerable

-  if v:version >= 703

   highlight ColorColumn ctermbg=255 guibg=#F6F6F6

-  endif

   highlight statusline   ctermfg=17 ctermbg=Gray " override scheme

   highlight statuslineNC ctermfg=20 ctermbg=LightGray" override scheme

   if has('win32')

@@ -72,9 +66,7 @@ else

   " Dark backgrounds for tty experiences

   set background=dark

   colorscheme nvim_desert

-  if v:version >= 703

   highlight ColorColumn ctermbg=233 guibg=Black " dark gray (or 17, dark blue)

-  endif

   highlight statusline   ctermfg=24 ctermbg=250  " override scheme

   highlight statuslineNC ctermfg=236 ctermbg=Gray  " override scheme

   highlight MatchParen   term=reverse ctermbg=23  " 23 is more subtle than default

@@ -83,12 +75,13 @@ endif

 au InsertEnter * hi statusline guibg=Cyan ctermfg=20 guifg=Black ctermbg=248

 au InsertLeave * hi statusline term=bold,reverse cterm=bold,reverse ctermfg=24 ctermbg=250 guifg=black guibg=#c2bfa5

-" set mouse=v     " visual mode, not working great for PuTTY

+" May want to "set mouse=" See https://neovim.io/doc/user/vim_diff.html#_default-mouse

+" set mouse=v  " visual mode, not great in PuTTY, neovim defaults to nvi

+" Consider neovim default "./tags;,tags"

 set tags=tags;/

-set history=50

-set laststatus=2

+set history=500

 function! StatuslineGit()

   let l:branchname = system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'")

@@ -135,8 +128,6 @@ set statusline+=\[%{&fileformat}\]

 set statusline+=\ │\ %p%%\ =

 set statusline+=\ %l/%L\ :\ %c\ 

-set encoding=utf-8

-

 " Fast saving

 nmap <leader>w :w!<cr>

 " I use relative number for cursor movement.

@@ -214,9 +205,6 @@ set nobackup       " ~ files

 set nowritebackup  " Don't write buff to temp, delete orig, rename temp to orig

 set noswapfile     " .swp files

-" Allow tags to open another buffer even if this one is modified

-set hidden

-

 " Switch between source and header files

 function! SwitchSourceHeader()

   let s:ext  = expand("%:e")

@@ -288,12 +276,10 @@ if has("autocmd")

   autocmd FileType c,cpp nmap <buffer> <leader>s :call SwitchSourceHeader()<cr>

   autocmd FileType c,cpp set foldmethod=syntax

-  if v:version >= 703

   " I toggle out of relative number when Vim's focus is lost, because

   " if I'm not editing, then I may be referring to errors with line numbers.

   autocmd FocusLost * if &relativenumber | set number | endif

   autocmd FocusGained * if &number | set relativenumber | endif

-  endif

   autocmd BufRead *.txt set wrap linebreak   " "soft" wrap of existing lines

   autocmd BufRead README set wrap linebreak  " "soft" wrap of existing lines

@@ -0,0 +1,46 @@

+" Avoid installing twice or when in unsupported Vim version.

+if exists('g:loaded_file_line') || (v:version < 700)

+	finish

+endif

+let g:loaded_file_line = 1

+

+function! s:gotoline()

+	let file = bufname("%")

+

+	" :e command calls BufRead even though the file is a new one.

+	" As a workarround Jonas Pfenniger<jonas@pfenniger.name> added an

+	" AutoCmd BufRead, this will test if this file actually exists before

+	" searching for a file and line to goto.

+	if (filereadable(file))

+		return

+	endif

+

+	" Accept file:line:column: or file:line:column and file:line also

+	let names =  matchlist( file, '\(.\{-1,}\):\%(\(\d\+\)\%(:\(\d*\):\?\)\?\)\?$')

+

+	if empty(names)

+		return

+	endif

+

+	let file_name = names[1]

+	let line_num  = names[2] == ''? '0' : names[2]

+	let  col_num  = names[3] == ''? '0' : names[3]

+

+	if filereadable(file_name)

+		let l:bufn = bufnr("%")

+

+		exec "keepalt edit " . fnameescape(file_name)

+		exec ":" . line_num

+		exec "normal! " . col_num . '|'

+		if foldlevel(line_num) > 0

+			exec "normal! zv"

+		endif

+

+		exec "normal! zz"

+		exec ":bwipeout " l:bufn

+	endif

+

+endfunction

+

+autocmd! BufNewFile *:* nested call s:gotoline()

+autocmd! BufRead *:* nested call s:gotoline()

@@ -0,0 +1,17 @@

+" From http://got-ravings.blogspot.com/2008/07/vim-pr0n-visual-search-mappings.html

+

+" makes * and # work on visual mode too.

+function! s:VSetSearch(cmdtype)

+  let temp = @s

+  norm! gv"sy

+  let @/ = '\V' . substitute(escape(@s, a:cmdtype.'\'), '\n', '\\n', 'g')

+  let @s = temp

+endfunction

+

+xnoremap * :<C-u>call <SID>VSetSearch('/')<CR>/<C-R>=@/<CR><CR>

+xnoremap # :<C-u>call <SID>VSetSearch('?')<CR>?<C-R>=@/<CR><CR>

+

+" recursively vimgrep for word under cursor or selection if you hit leader-star

+nmap <leader>* :execute 'noautocmd vimgrep /\V' . substitute(escape(expand("<cword>"), '\'), '\n', '\\n', 'g') . '/ **'<CR>

+vmap <leader>* :<C-u>call <SID>VSetSearch()<CR>:execute 'noautocmd vimgrep /' . @/ . '/ **'<CR>

+

@@ -49,9 +49,8 @@ See [config.dlma.com](http://config.dlma.com) for more.

         6. Assorted favorite colors like [desert](https://github.com/dblume/desert.vim).

 3. Neovim resources

     1. .config/nvim/init.vim

-    2. An empty .nvim\_undo directory

-    3. .config/nvim/colors/nvim\_desert.vim

-    4. .local/share/nvim/site/plugin/ plugins

+    2. .config/nvim/colors/nvim\_desert.vim

+    3. .local/share/nvim/site/plugin/ plugins

 4. .gitconfig and .gitignore

 5. .tmux.conf

 6. .inputrc, for vi mode and a [partially matched command history traversal](http://askubuntu.com/questions/59846/bash-history-search-partial-up-arrow/59855#59855).

@@ -106,13 +106,10 @@ else

     echo No change to the .local/share/nvim/site/plugin/ directories.

 fi

-# Make a directory for vim and neovim undo

+# Make a directory for vim undo

 if [ ! -d "$HOME"/.vim_undo ]; then

     ((dry_run==0)) && mkdir -p "$HOME"/.vim_undo

 fi

-if [ ! -d "$HOME"/.nvim_undo ]; then

-    ((dry_run==0)) && mkdir -p "$HOME"/.nvim_undo

-fi

 # I have device local secrets in .localrc and a github secret in .gitconfig.local

 for i in ".gitconfig.local" ".localrc"