summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.vim67
1 files changed, 8 insertions, 59 deletions
diff --git a/init.vim b/init.vim
index 4df8708..9e04af9 100644
--- a/init.vim
+++ b/init.vim
@@ -15,22 +15,11 @@ set shiftwidth=4
set noexpandtab
set mouse+=a
syntax on
-"if &term =~ '^screen'
-" " tmux knows the extended mouse mode
-" set ttymouse=xterm2
-"endif
-
" I know how to setup my editor, I don't need your changes to my vim
" configuration.
set nomodeline
-" Use \-n in normal mode to toggle line numbers
-nmap <leader>n :set invnu<CR>
-nmap <leader>r :set invrnu<CR>
-" Use \-l in normal mode to toggle listchars
-nmap <leader>l :set list!<CR>
-
" Use \-s to pop open a spelling menu. use ]s to search forwards and [s to go
" backwards.
" Apparently this also doesn't work if spell checking isn't enabled
@@ -39,12 +28,6 @@ set spell
nnoremap \s ea<C-X><C-S>
set nospell
-" set hidden " This will allow you to change buffers w/o saving
-
-" Omni completion, c-x c-o in insert/append mode
-filetype plugin on
-set omnifunc=syntaxcomplete#Complete
-
" Stolen from the help page:
"
" One typical way to use the netrw tree display is to: >
@@ -60,7 +43,6 @@ set omnifunc=syntaxcomplete#Complete
let g:netrw_liststyle=3
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" call plug#begin('~/.vim/plugged')
call plug#begin(stdpath('data') . '/plugged')
Plug 'scrooloose/nerdtree'
@@ -72,11 +54,8 @@ Plug 'rking/ag.vim'
Plug 'sjl/gundo.vim'
Plug 'ctrlpvim/ctrlp.vim'
Plug 'godlygeek/tabular'
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes/'
Plug 'mattn/emmet-vim'
Plug 'tpope/vim-commentary'
-Plug 'takac/vim-hardtime'
" Misc
Plug 'https://git.riedstra.dev/vim/vim-l9'
@@ -91,16 +70,14 @@ Plug 'hashivim/vim-terraform'
Plug 'MaxMEllon/vim-jsx-pretty'
" Plug 'xavierd/clang_complete'
-" Neovim specific
-
" Color schemes
-Plug 't184256/vim-boring'
-Plug 'plan9-for-vimspace/acme-colors'
-Plug 'huyvohcmc/atlas.vim'
-Plug 'w0ng/vim-hybrid'
-Plug 'altercation/vim-colors-solarized'
-Plug 'kristijanhusak/vim-hybrid-material'
-Plug 'Lokaltog/vim-monotone'
+" Plug 't184256/vim-boring'
+" Plug 'plan9-for-vimspace/acme-colors'
+" Plug 'huyvohcmc/atlas.vim'
+" Plug 'w0ng/vim-hybrid'
+" Plug 'altercation/vim-colors-solarized'
+" Plug 'kristijanhusak/vim-hybrid-material'
+" Plug 'Lokaltog/vim-monotone'
Plug 'arcticicestudio/nord-vim'
call plug#end()
@@ -111,17 +88,7 @@ let g:ctrlp_follow_symlinks = 1
let g:ctrlp_working_path_mode = 0
" Always show status line
-" set laststatus=2
-
-" Enable the list of buffers
-let g:airline#extensions#tabline#enabled = 1
-" Show just the filename
-let g:airline#extensions#tabline#fnamemod = ':t'
-if !exists('g:airline_symbols')
- let g:airline_symbols = {}
-endif
-let g:airline_symbols.space = "\ua0"
-let g:airline_section_z = airline#section#create(['windowswap', '%3p%% ', 'linenr', ':%3v'])
+set laststatus=2
" Persistent undo
@@ -134,32 +101,14 @@ set undoreload=10000
" to be really useful
set history=10000
-
-" Useful on some terminals, not always supported in old tmux versions
-" set termguicolors
-" let g:airline_theme="monochrome"
-" let g:airline_theme="distinguished"
-" let g:airline_theme="hybrid"
-
-" colorscheme 256_noir
-" colorscheme distinguished
-" colorscheme sane
-" set background=dark
-" let g:hybrid_transparent_background = 1
-" colorscheme hybrid_material
-
-" autocmd ColorScheme nord highlight vimCommentTitle ctermfg=10 guifg=#8FBCBB
-
autocmd ColorScheme nord highlight Comment ctermfg=14 guifg=#8FBCBB
let g:nord_uniform_diff_background = 1
colorscheme nord
-
" For syntastic it's worth running
" SyntasticInfo : to see what's available for the given open file
" SyntasticCheck yamllint : if you want to say manually run the `yamllint`
" checker
-
let g:syntastic_yaml_checkers = ['yamllint']
let g:syntastic_go_checkers = [ 'go', 'gofmt', 'golangci_lint' ]
let g:syntastic_lua_checkers = [ 'luac', 'luacheck' ]