diff --git a/.vimrc b/.vimrc index ea759f2..ab9920e 100644 --- a/.vimrc +++ b/.vimrc @@ -1,169 +1,183 @@ -"" Preferred global default settings: -set number -set background=dark -set smartindent -set tabstop=4 -set shiftwidth=4 -set expandtab -syntax enable -colorscheme solarized -set t_Co=256 " use 265 colors in vim +" Vim configuration moved to Nix files +" +" https://source.mcwhirter.io/craige/mio-ops/src/branch/master/Deployments/vim.nix +" +" Preferred global default settings: +"set number +"set background=dark +"set smartindent +"set tabstop=4 +"set shiftwidth=4 +"set expandtab +"syntax enable +"colorscheme solarized +"set t_Co=256 " use 265 colors in vim " hi Normal guibg=NONE ctermbg=NONE -hi SpellBad cterm=underline -match ErrorMsg '\s\+$' +"hi SpellBad cterm=underline +"match ErrorMsg '\s\+$' -set rtp+=/run/current-system/sw/share/vim-plugins/vim-airline -set rtp+=/run/current-system/sw/share/vim-plugins/vim-airline-themes -set rtp+=/run/current-system/sw/share/vim-plugins/neocomplete-vim +"set rtp+=/run/current-system/sw/share/vim-plugins/vim-airline +"set rtp+=/run/current-system/sw/share/vim-plugins/vim-airline-themes +"set rtp+=/run/current-system/sw/share/vim-plugins/neocomplete-vim -let g:airline_powerline_fonts = 1 -let g:airline_theme='solarized' -set laststatus=2 +"let g:airline_powerline_fonts = 1 +"let g:airline_theme='solarized' +"set laststatus=2 -call togglebg#map("") +"call togglebg#map("") " Set up the status line so it's colored and always on -set laststatus=2 +"set laststatus=2 " highlight StatusLine cterm=none ctermbg=black ctermfg=244 "highlight StatusLineNC cterm=none ctermbg=black ctermfg=244 "highlight VertSplit cterm=none ctermbg=black ctermfg=244 "highlight LineNr cterm=none ctermbg=black ctermfg=244 " Removes trailing spaces: -function! TrimWhiteSpace() - %s/\s\+$//e -endfunction +"function! TrimWhiteSpace() +" %s/\s\+$//e +"endfunction -nnoremap RemoveTrailingWhiteSpace :call TrimWhiteSpace() -autocmd FileWritePre * :call TrimWhiteSpace() -autocmd FileAppendPre * :call TrimWhiteSpace() -autocmd FilterWritePre * :call TrimWhiteSpace() -autocmd BufWritePre * :call TrimWhiteSpace() +"nnoremap RemoveTrailingWhiteSpace :call TrimWhiteSpace() +"autocmd FileWritePre * :call TrimWhiteSpace() +"autocmd FileAppendPre * :call TrimWhiteSpace() +"autocmd FilterWritePre * :call TrimWhiteSpace() +"autocmd BufWritePre * :call TrimWhiteSpace() " Transparent editing of gpg encrypted files. " By Wouter Hanegraaff -augroup encrypted - au! +"augroup encrypted +" au! " First make sure nothing is written to ~/.viminfo while editing " an encrypted file. - autocmd BufReadPre,FileReadPre *.gpg set viminfo= +" autocmd BufReadPre,FileReadPre *.gpg set viminfo= " We don't want a swap file, as it writes unencrypted data to disk - autocmd BufReadPre,FileReadPre *.gpg set noswapfile +" autocmd BufReadPre,FileReadPre *.gpg set noswapfile " Switch to binary mode to read the encrypted file - autocmd BufReadPre,FileReadPre *.gpg set bin - autocmd BufReadPre,FileReadPre *.gpg let ch_save = &ch|set ch=2 - autocmd BufReadPost,FileReadPost *.gpg '[,']!gpg --decrypt 2> /dev/null +" autocmd BufReadPre,FileReadPre *.gpg set bin +" autocmd BufReadPre,FileReadPre *.gpg let ch_save = &ch|set ch=2 +" autocmd BufReadPost,FileReadPost *.gpg '[,']!gpg --decrypt 2> /dev/null " Switch to normal mode for editing - autocmd BufReadPost,FileReadPost *.gpg set nobin - autocmd BufReadPost,FileReadPost *.gpg let &ch = ch_save|unlet ch_save - autocmd BufReadPost,FileReadPost *.gpg execute ":doautocmd BufReadPost " . expand("%:r") +" autocmd BufReadPost,FileReadPost *.gpg set nobin +" autocmd BufReadPost,FileReadPost *.gpg let &ch = ch_save|unlet ch_save +" autocmd BufReadPost,FileReadPost *.gpg execute ":doautocmd BufReadPost " . expand("%:r") " Convert all text to encrypted text before writing - autocmd BufWritePre,FileWritePre *.gpg '[,']!gpg --default-key=A4122FF3971B6865 --default-recipient-self -ae 2>/dev/null +" autocmd BufWritePre,FileWritePre *.gpg '[,']!gpg --default-key=A4122FF3971B6865 --default-recipient-self -ae 2>/dev/null " Undo the encryption so we are back in the normal text, directly " after the file has been written. - autocmd BufWritePost,FileWritePost *.gpg u -augroup END +" autocmd BufWritePost,FileWritePost *.gpg u +"augroup END " Add files ending in md to the list of files recognised as markdown: -autocmd BufNewFile,BufFilePre,BufRead *.md set filetype=markdown +"autocmd BufNewFile,BufFilePre,BufRead *.md set filetype=markdown " My Markdown environment -function! MarkdownSettings() - set textwidth=79 - set spell spelllang=en_au -endfunction -autocmd BufNewFile,BufFilePre,BufRead *.mdwn :call MarkdownSettings() -autocmd BufNewFile,BufFilePre,BufRead *.md :call MarkdownSettings() +"function! MarkdownSettings() +" set textwidth=79 +" set spell spelllang=en_au +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead *.mdwn :call MarkdownSettings() +"autocmd BufNewFile,BufFilePre,BufRead *.md :call MarkdownSettings() " My ReStructured Text environment -function! ReStructuredSettings() - set textwidth=79 - set spell spelllang=en_au -endfunction -autocmd BufNewFile,BufFilePre,BufRead *.rst :call ReStructuredSettings() -autocmd BufNewFile,BufFilePre,BufRead *.txt :call ReStructuredSettings() +"function! ReStructuredSettings() +" set textwidth=79 +" set spell spelllang=en_au +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead *.rst :call ReStructuredSettings() +"autocmd BufNewFile,BufFilePre,BufRead *.txt :call ReStructuredSettings() " My LaTeX environment: -function! LaTeXSettings() - set textwidth=79 - set spell spelllang=en_au -endfunction -autocmd BufNewFile,BufFilePre,BufRead *.tex :call LaTeXSettings() +"function! LaTeXSettings() +" set textwidth=79 +" set spell spelllang=en_au +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead *.tex :call LaTeXSettings() " Settings for my Haskell environment: -function! HaskellSettings() - set tabstop=4 - set shiftwidth=4 - set expandtab - set textwidth=79 -endfunction -autocmd BufNewFile,BufFilePre,BufRead *.hs :call HaskellSettings() +"function! HaskellSettings() +" set tabstop=4 +" set shiftwidth=4 +" set expandtab +" set textwidth=79 +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead *.hs :call HaskellSettings() + +" Settings for my Nix environment: +"function! NixSettings() +" set tabstop=2 +" set shiftwidth=2 +" set expandtab +" set textwidth=79 +" set filetype=nix +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead *.nix :call NixSettings() " Settings for my Golang environment: -function! GoSettings() - set tabstop=7 - set shiftwidth=7 - set noexpandtab -endfunction -autocmd BufNewFile,BufFilePre,BufRead *.go :call GoSettings() +"function! GoSettings() +" set tabstop=7 +" set shiftwidth=7 +" set noexpandtab +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead *.go :call GoSettings() " Settings for my Python environment: -function! PythonSettings() - set tabstop=4 - set shiftwidth=4 - set expandtab - set textwidth=79 - set spell! -endfunction -autocmd BufNewFile,BufFilePre,BufRead *.py :call PythonSettings() +"function! PythonSettings() +" set tabstop=4 +" set shiftwidth=4 +" set expandtab +" set textwidth=79 +" set spell! +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead *.py :call PythonSettings() " My Mutt environment -function! MuttSettings() - set textwidth=79 - set spell spelllang=en_au +"function! MuttSettings() +" set textwidth=79 +" set spell spelllang=en_au "set tabstop=4 "set shiftwidth=4 "set expandtab -endfunction -autocmd BufNewFile,BufFilePre,BufRead /tmp/mutt-* :call MuttSettings() -autocmd BufNewFile,BufFilePre,BufRead /tmp/neomutt-* :call MuttSettings() +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead /tmp/mutt-* :call MuttSettings() +"autocmd BufNewFile,BufFilePre,BufRead /tmp/neomutt-* :call MuttSettings() " Settings for my C environment: -function! CSettings() - set tabstop=2 - set shiftwidth=2 - set expandtab - set textwidth=79 -endfunction -autocmd BufNewFile,BufFilePre,BufRead *.c :call CSettings() +"function! CSettings() +" set tabstop=2 +" set shiftwidth=2 +" set expandtab +" set textwidth=79 +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead *.c :call CSettings() " Settings for my YAML environment: -function! YAMLSettings() - set tabstop=2 - set shiftwidth=2 - set expandtab - set textwidth=79 -endfunction -autocmd BufNewFile,BufFilePre,BufRead *.yaml :call YAMLSettings() +"function! YAMLSettings() +" set tabstop=2 +" set shiftwidth=2 +" set expandtab +" set textwidth=79 +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead *.yaml :call YAMLSettings() " Settings for my Bash environment: -function! BashSettings() - set tabstop=4 - set shiftwidth=4 - set expandtab - set textwidth=79 - set spell! -endfunction -autocmd BufNewFile,BufFilePre,BufRead *.sh :call BashSettings() +"function! BashSettings() +" set tabstop=4 +" set shiftwidth=4 +" set expandtab +" set textwidth=79 +" set spell! +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead *.sh :call BashSettings() " My Bzr commit environment -function! BzrSettings() - set textwidth=79 - set spell spelllang=en_au - set tabstop=4 - set shiftwidth=4 - set expandtab -endfunction -autocmd BufNewFile,BufFilePre,BufRead bzr_* :call BzrSettings() +"function! BzrSettings() +" set textwidth=79 +" set spell spelllang=en_au +" set tabstop=4 +" set shiftwidth=4 +" set expandtab +"endfunction +"autocmd BufNewFile,BufFilePre,BufRead bzr_* :call BzrSettings()