Update

1 files changed, 12 insertions, 24 deletions

diff --git a/vimrc b/vimrc
index 90e8150..c444e45 100644
--- a/vimrc
+++ b/vimrc
@@ -1,12 +1,18 @@
 " https://vimhelp.org/options.txt.html
 
-" General sane defaults.
 set nocompatible
 syntax enable
-colorscheme sorbet
-nnoremap q: <nop>
+
+" Theme.
+if has('vim')
+  colorscheme wildcharm
+endif
+set background=dark
+hi Normal ctermbg=233
+
+" Sane defaults.
+set path+=**
 set relativenumber
-set nohlsearch
 set smartcase
 set ignorecase
 set incsearch
@@ -20,29 +26,11 @@ set encoding=utf8
 set backspace=2
 set scrolloff=4
 set spelllang=en_us
+set laststatus=2
 
 " Buffer navigation remaps.
 nnoremap <C-]> :bnext<cr>
 nnoremap <C-[> :bprevious<cr>
-nnoremap <C-b> :buffers<cr>:buffer 
-
-" Commenting blocks of code.
-augroup commenting_blocks_of_code
-  autocmd!
-  autocmd FileType c,cpp,go,scala   let b:comment_leader = '// '
-  autocmd FileType sh,ruby,python   let b:comment_leader = '# '
-  autocmd FileType conf,fstab       let b:comment_leader = '# '
-  autocmd FileType lua              let b:comment_leader = '-- '
-  autocmd FileType vim              let b:comment_leader = '" '
-augroup END
-noremap <silent> gcc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR>
-noremap <silent> gcu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR>
-
-" Status Line enhancements.
-set laststatus=2
-set statusline=%f%m%=%y\ %{strlen(&fenc)?&fenc:'none'}\ %l:%c\ %L\ %P
-hi StatusLine cterm=NONE ctermbg=black ctermfg=brown
-hi StatusLineNC cterm=NONE ctermbg=black ctermfg=darkgray
 
 " Language specific indentation.
 filetype plugin indent on
@@ -50,5 +38,5 @@ autocmd Filetype make,go,sh setlocal noexpandtab tabstop=4 shiftwidth=4
 autocmd Filetype c,cpp,html,javascript,css,python setlocal expandtab tabstop=2 shiftwidth=2
 
 " Throwaway config.
-au BufReadPost *.twig set syntax=html
+"au BufReadPost *.twig set syntax=html