I haz colors again
This commit is contained in:
parent
62120e4592
commit
7925b5eeb9
84
config/vim/pluginconfig
Normal file
84
config/vim/pluginconfig
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
""" ALE """
|
||||
|
||||
nmap <F3> :ALEFix<CR>
|
||||
|
||||
let g:ale_sign_error = '×'
|
||||
let g:ale_sign_warning = '!'
|
||||
let g:ale_completion_enabled = 1
|
||||
let g:ale_fixers = ['shfmt', 'uncrustify', 'remove_trailing_lines', 'trim_whitespace', 'phpcbf']
|
||||
let g:ale_php_phpcs_standard = '/srv/http/machines/ruleset.xml'
|
||||
|
||||
" For PHP, install https://pear.php.net/package/PHP_CodeSniffer
|
||||
|
||||
|
||||
""" UNDOTREE """
|
||||
|
||||
nmap <F7> :UndotreeToggle<CR>
|
||||
|
||||
""" TAGBAR """
|
||||
|
||||
nmap <F8> :TagbarToggle<CR>
|
||||
|
||||
""" VIM-AIRLINE """
|
||||
|
||||
set noshowmode
|
||||
set laststatus=2
|
||||
let g:airline_powerline_fonts = 1
|
||||
" let g:airline#extensions#syntastic#enabled = 1
|
||||
let g:airline#extensions#tabline#enabled = 1
|
||||
|
||||
let g:airline_section_a = airline#section#create(['mode'])
|
||||
let g:airline_section_b = airline#section#create(['branch', 'hunks'])
|
||||
" let g:airline_section_z = airline#section#create(['%B', '@', '%l', ':', '%c'])
|
||||
let g:airline_theme = 'base16_monokai'
|
||||
let g:airline#extensions#ale#enabled = 1
|
||||
|
||||
""" FZF """
|
||||
|
||||
let g:fzf_layout = { 'down': '~40%' }
|
||||
let g:fzf_colors =
|
||||
\ { 'fg': ['fg', 'Normal'],
|
||||
\ 'bg': ['bg', 'Normal'],
|
||||
\ 'hl': ['fg', 'Comment'],
|
||||
\ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
|
||||
\ 'bg+': ['bg', 'CursorLine', 'CursorColumn'],
|
||||
\ 'hl+': ['fg', 'Statement'],
|
||||
\ 'info': ['fg', 'PreProc'],
|
||||
\ 'border': ['fg', 'Ignore'],
|
||||
\ 'prompt': ['fg', 'Conditional'],
|
||||
\ 'pointer': ['fg', 'Exception'],
|
||||
\ 'marker': ['fg', 'Keyword'],
|
||||
\ 'spinner': ['fg', 'Label'],
|
||||
\ 'header': ['fg', 'Comment'] }
|
||||
|
||||
nmap gF :Files<CR>
|
||||
nmap gf :GFiles<CR>
|
||||
nmap gb :Buffers<CR>
|
||||
nmap gL :Lines<CR>
|
||||
nmap gl :BLines<CR>
|
||||
nmap gT :Tags<CR>
|
||||
nmap gt :BTags<CR>
|
||||
nmap gm :Marks<CR>
|
||||
nmap gw :Windows<CR>
|
||||
nmap gh :History<CR>
|
||||
nmap gH :History:<CR>
|
||||
nmap gS :History/<CR>
|
||||
nmap gs :Snippets<CR>
|
||||
|
||||
" TODO `gd` → go to tag matching selected word, or show a list with that
|
||||
" of tags pre-filtered with that word
|
||||
|
||||
""" SUPERTAB """
|
||||
|
||||
let g:SuperTabDefaultCompletionType = "<c-n>" " Go down when completing
|
||||
let g:SuperTabContextDefaultCompletionType = "<c-n>"
|
||||
|
||||
""" LanguageTool """
|
||||
|
||||
let g:languagetool_jar = "/usr/share/java/languagetool/languagetool-commandline.jar"
|
||||
|
||||
""" vim-pandoc """
|
||||
let g:pandoc#modules#disabled = ["folding"]
|
||||
let g:pandoc#spell#enabled = 0
|
||||
let g:pandoc#syntax#conceal#use = 0
|
||||
|
||||
60
config/vim/plugins
Normal file
60
config/vim/plugins
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
""" PLUGINS MANAGEMENT """
|
||||
|
||||
" NOTE 18-06-24 Got rid of Vundle in favor of vim-plug (why: more recent, supports
|
||||
" Neovim, simpler). Commented out plugins that seemed useless, feel free to
|
||||
" uncomment them again if you need to
|
||||
|
||||
" Auto-install vim-plug
|
||||
if empty(glob('~/.cache/vim/autoload/plug.vim'))
|
||||
silent !curl -fLo ~/.cache/vim/autoload/plug.vim --create-dirs
|
||||
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
|
||||
endif
|
||||
|
||||
" Plugin definition
|
||||
call plug#begin('~/.cache/vim/plugged')
|
||||
|
||||
" Plug 'L9'
|
||||
" Plug 'rstacruz/sparkup', {'rtp': 'vim/'}
|
||||
Plug 'chriskempson/base16-vim'
|
||||
Plug 'tpope/vim-surround'
|
||||
" Plug 'tpope/vim-fugitive'
|
||||
" Plug 'tpope/vim-repeat'
|
||||
Plug 'tpope/tpope-vim-abolish'
|
||||
Plug 'vim-airline/vim-airline'
|
||||
Plug 'vim-airline/vim-airline-themes'
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
Plug 'mbbill/undotree'
|
||||
Plug 'ludovicchabant/vim-gutentags'
|
||||
Plug 'majutsushi/tagbar'
|
||||
Plug 'wellle/targets.vim'
|
||||
" Plug 'Chiel92/vim-autoformat'
|
||||
Plug 'tomtom/tcomment_vim'
|
||||
" Plug 'Shougo/denite.nvim'
|
||||
" Plug 'tomlion/vim-solidity'
|
||||
" Plug 'godlygeek/tabular'
|
||||
" Plug 'jrozner/vim-antlr'
|
||||
"
|
||||
" Plug 'maralla/completor.vim'
|
||||
" if has('nvim')
|
||||
" Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
|
||||
" else
|
||||
" Plug 'Shougo/deoplete.nvim'
|
||||
" Plug 'roxma/nvim-yarp'
|
||||
" Plug 'roxma/vim-hug-neovim-rpc'
|
||||
" endif
|
||||
" Plug 'zchee/deoplete-jedi'
|
||||
|
||||
" Plug 'python-mode/python-mode', { 'branch': 'develop' }
|
||||
Plug 'junegunn/fzf', {'do': './install --bin'}
|
||||
Plug 'junegunn/fzf.vim'
|
||||
Plug 'ervandew/supertab'
|
||||
Plug 'dpelle/vim-LanguageTool'
|
||||
Plug 'terryma/vim-smooth-scroll'
|
||||
Plug 'vim-pandoc/vim-pandoc'
|
||||
Plug 'vim-pandoc/vim-pandoc-syntax'
|
||||
Plug 'idanarye/vim-vebugger'
|
||||
Plug 'w0rp/ale'
|
||||
|
||||
call plug#end()
|
||||
|
||||
87
config/vim/vimconfig
Normal file
87
config/vim/vimconfig
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
""" VIM SETTINGS """
|
||||
|
||||
set encoding=utf-8
|
||||
set title
|
||||
|
||||
set number
|
||||
set ruler
|
||||
set wrap
|
||||
|
||||
set scrolloff=10
|
||||
|
||||
set ignorecase
|
||||
set smartcase
|
||||
|
||||
set incsearch
|
||||
|
||||
set hlsearch
|
||||
|
||||
set tabstop=4
|
||||
set shiftwidth=4
|
||||
set expandtab
|
||||
|
||||
set visualbell
|
||||
set noerrorbells
|
||||
|
||||
set backspace=indent,eol,start
|
||||
|
||||
set hidden
|
||||
set updatetime=250
|
||||
|
||||
set cursorcolumn
|
||||
|
||||
set splitbelow
|
||||
|
||||
set number relativenumber
|
||||
|
||||
syntax enable
|
||||
|
||||
" From http://stackoverflow.com/a/5004785/2766106
|
||||
set list
|
||||
set listchars=tab:╾╌,trail:·,extends:↦,precedes:↤,nbsp:_
|
||||
set showbreak=↪
|
||||
|
||||
filetype on
|
||||
filetype plugin on
|
||||
filetype indent on
|
||||
|
||||
set wildmode=longest,list
|
||||
set showcmd
|
||||
|
||||
" Put plugins and dictionaries in this dir (also on Windows)
|
||||
let vimDir = '$HOME/.cache/vim'
|
||||
let &runtimepath.=','.vimDir
|
||||
|
||||
" theme
|
||||
source $HOME/.cache/vim/colorscheme.vim
|
||||
|
||||
" Keep undo history across sessions by storing it in a file
|
||||
if has('persistent_undo')
|
||||
let myUndoDir = expand(vimDir . '/undodir')
|
||||
" Create dirs
|
||||
call system('mkdir ' . vimDir)
|
||||
call system('mkdir ' . myUndoDir)
|
||||
let &undodir = myUndoDir
|
||||
set undofile
|
||||
endif
|
||||
|
||||
" Allow saving of files as sudo when I forgot to start vim using sudo.
|
||||
" From https://stackoverflow.com/a/7078429
|
||||
cmap w!! w !sudo tee > /dev/null %
|
||||
|
||||
imap jk <Esc>
|
||||
vmap <Enter> <Esc>
|
||||
|
||||
nmap <Enter> o<Esc>
|
||||
nmap <C-H> :bp<CR>
|
||||
nmap <C-L> :bn<CR>
|
||||
if has('nvim')
|
||||
" nmap <C-K> 20k
|
||||
" nmap <C-J> 20j
|
||||
noremap <silent> <C-K> :call smooth_scroll#up(20, 5, 1)<CR>
|
||||
noremap <silent> <C-J> :call smooth_scroll#down(20, 5, 1)<CR>
|
||||
else
|
||||
nmap <C-K> kkkkkkkkkkkkkkkkkkkkk
|
||||
nmap <C-J> jjjjjjjjjjjjjjjjjjjjj
|
||||
endif
|
||||
|
||||
239
config/vim/vimrc
239
config/vim/vimrc
|
|
@ -2,241 +2,12 @@
|
|||
"
|
||||
|
||||
set nocompatible
|
||||
filetype off
|
||||
filetype on
|
||||
|
||||
set runtimepath=~/.config/vim,~/.cache/vim
|
||||
set runtimepath+=~/.config/vim,~/.cache/vim
|
||||
set viminfo+=n~/.cache/vim/viminfo
|
||||
|
||||
""" PLUGINS MANAGEMENT """
|
||||
|
||||
" NOTE 18-06-24 Got rid of Vundle in favor of vim-plug (why: more recent, supports
|
||||
" Neovim, simpler). Commented out plugins that seemed useless, feel free to
|
||||
" uncomment them again if you need to
|
||||
|
||||
" Auto-install vim-plug
|
||||
if empty(glob('~/.cache/vim/autoload/plug.vim'))
|
||||
silent !curl -fLo ~/.cache/vim/autoload/plug.vim --create-dirs
|
||||
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
|
||||
endif
|
||||
|
||||
" Plugin definition
|
||||
call plug#begin('~/.cache/vim/plugged')
|
||||
|
||||
" Plug 'L9'
|
||||
" Plug 'rstacruz/sparkup', {'rtp': 'vim/'}
|
||||
Plug 'chriskempson/base16-vim'
|
||||
Plug 'tpope/vim-surround'
|
||||
" Plug 'tpope/vim-fugitive'
|
||||
" Plug 'tpope/vim-repeat'
|
||||
Plug 'tpope/tpope-vim-abolish'
|
||||
Plug 'vim-airline/vim-airline'
|
||||
Plug 'vim-airline/vim-airline-themes'
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
Plug 'mbbill/undotree'
|
||||
Plug 'ludovicchabant/vim-gutentags'
|
||||
Plug 'majutsushi/tagbar'
|
||||
Plug 'wellle/targets.vim'
|
||||
" Plug 'Chiel92/vim-autoformat'
|
||||
Plug 'tomtom/tcomment_vim'
|
||||
" Plug 'Shougo/denite.nvim'
|
||||
" Plug 'tomlion/vim-solidity'
|
||||
" Plug 'godlygeek/tabular'
|
||||
" Plug 'jrozner/vim-antlr'
|
||||
"
|
||||
" Plug 'maralla/completor.vim'
|
||||
" if has('nvim')
|
||||
" Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
|
||||
" else
|
||||
" Plug 'Shougo/deoplete.nvim'
|
||||
" Plug 'roxma/nvim-yarp'
|
||||
" Plug 'roxma/vim-hug-neovim-rpc'
|
||||
" endif
|
||||
" Plug 'zchee/deoplete-jedi'
|
||||
|
||||
" Plug 'python-mode/python-mode', { 'branch': 'develop' }
|
||||
Plug 'junegunn/fzf', {'do': './install --bin'}
|
||||
Plug 'junegunn/fzf.vim'
|
||||
Plug 'ervandew/supertab'
|
||||
Plug 'dpelle/vim-LanguageTool'
|
||||
Plug 'terryma/vim-smooth-scroll'
|
||||
Plug 'vim-pandoc/vim-pandoc'
|
||||
Plug 'vim-pandoc/vim-pandoc-syntax'
|
||||
Plug 'idanarye/vim-vebugger'
|
||||
Plug 'w0rp/ale'
|
||||
|
||||
call plug#end()
|
||||
|
||||
""" ALE """
|
||||
|
||||
nmap <F3> :ALEFix<CR>
|
||||
|
||||
let g:ale_sign_error = '×'
|
||||
let g:ale_sign_warning = '!'
|
||||
let g:ale_completion_enabled = 1
|
||||
let g:ale_fixers = ['shfmt', 'uncrustify', 'remove_trailing_lines', 'trim_whitespace', 'phpcbf']
|
||||
let g:ale_php_phpcs_standard = '/srv/http/machines/ruleset.xml'
|
||||
|
||||
" For PHP, install https://pear.php.net/package/PHP_CodeSniffer
|
||||
|
||||
|
||||
""" UNDOTREE """
|
||||
|
||||
nmap <F7> :UndotreeToggle<CR>
|
||||
|
||||
""" TAGBAR """
|
||||
|
||||
nmap <F8> :TagbarToggle<CR>
|
||||
|
||||
""" VIM-AIRLINE """
|
||||
|
||||
set noshowmode
|
||||
set laststatus=2
|
||||
let g:airline_powerline_fonts = 1
|
||||
" let g:airline#extensions#syntastic#enabled = 1
|
||||
let g:airline#extensions#tabline#enabled = 1
|
||||
|
||||
let g:airline_section_a = airline#section#create(['mode'])
|
||||
let g:airline_section_b = airline#section#create(['branch', 'hunks'])
|
||||
" let g:airline_section_z = airline#section#create(['%B', '@', '%l', ':', '%c'])
|
||||
let g:airline_theme = 'base16_monokai'
|
||||
let g:airline#extensions#ale#enabled = 1
|
||||
|
||||
""" FZF """
|
||||
|
||||
let g:fzf_layout = { 'down': '~40%' }
|
||||
let g:fzf_colors =
|
||||
\ { 'fg': ['fg', 'Normal'],
|
||||
\ 'bg': ['bg', 'Normal'],
|
||||
\ 'hl': ['fg', 'Comment'],
|
||||
\ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
|
||||
\ 'bg+': ['bg', 'CursorLine', 'CursorColumn'],
|
||||
\ 'hl+': ['fg', 'Statement'],
|
||||
\ 'info': ['fg', 'PreProc'],
|
||||
\ 'border': ['fg', 'Ignore'],
|
||||
\ 'prompt': ['fg', 'Conditional'],
|
||||
\ 'pointer': ['fg', 'Exception'],
|
||||
\ 'marker': ['fg', 'Keyword'],
|
||||
\ 'spinner': ['fg', 'Label'],
|
||||
\ 'header': ['fg', 'Comment'] }
|
||||
|
||||
nmap gF :Files<CR>
|
||||
nmap gf :GFiles<CR>
|
||||
nmap gb :Buffers<CR>
|
||||
nmap gL :Lines<CR>
|
||||
nmap gl :BLines<CR>
|
||||
nmap gT :Tags<CR>
|
||||
nmap gt :BTags<CR>
|
||||
nmap gm :Marks<CR>
|
||||
nmap gw :Windows<CR>
|
||||
nmap gh :History<CR>
|
||||
nmap gH :History:<CR>
|
||||
nmap gS :History/<CR>
|
||||
nmap gs :Snippets<CR>
|
||||
|
||||
" TODO `gd` → go to tag matching selected word, or show a list with that
|
||||
" of tags pre-filtered with that word
|
||||
|
||||
""" SUPERTAB """
|
||||
|
||||
let g:SuperTabDefaultCompletionType = "<c-n>" " Go down when completing
|
||||
let g:SuperTabContextDefaultCompletionType = "<c-n>"
|
||||
|
||||
""" LanguageTool """
|
||||
|
||||
let g:languagetool_jar = "/usr/share/java/languagetool/languagetool-commandline.jar"
|
||||
|
||||
""" vim-pandoc """
|
||||
let g:pandoc#modules#disabled = ["folding"]
|
||||
let g:pandoc#spell#enabled = 0
|
||||
let g:pandoc#syntax#conceal#use = 0
|
||||
|
||||
|
||||
""" VIM SETTINGS """
|
||||
|
||||
set encoding=utf-8
|
||||
set title
|
||||
|
||||
set number
|
||||
set ruler
|
||||
set wrap
|
||||
|
||||
set scrolloff=10
|
||||
|
||||
set ignorecase
|
||||
set smartcase
|
||||
|
||||
set incsearch
|
||||
|
||||
set hlsearch
|
||||
|
||||
set tabstop=4
|
||||
set shiftwidth=4
|
||||
set expandtab
|
||||
|
||||
set visualbell
|
||||
set noerrorbells
|
||||
|
||||
set backspace=indent,eol,start
|
||||
|
||||
set hidden
|
||||
set updatetime=250
|
||||
|
||||
set cursorcolumn
|
||||
|
||||
set splitbelow
|
||||
|
||||
set number relativenumber
|
||||
|
||||
syntax enable
|
||||
|
||||
" From http://stackoverflow.com/a/5004785/2766106
|
||||
set list
|
||||
set listchars=tab:╾╌,trail:·,extends:↦,precedes:↤,nbsp:_
|
||||
set showbreak=↪
|
||||
|
||||
filetype on
|
||||
filetype plugin on
|
||||
filetype indent on
|
||||
|
||||
set wildmode=longest,list
|
||||
set showcmd
|
||||
|
||||
" Put plugins and dictionaries in this dir (also on Windows)
|
||||
let vimDir = '$HOME/.cache/vim'
|
||||
let &runtimepath.=','.vimDir
|
||||
|
||||
" theme
|
||||
source $HOME/.cache/vim/colorscheme.vim
|
||||
|
||||
" Keep undo history across sessions by storing it in a file
|
||||
if has('persistent_undo')
|
||||
let myUndoDir = expand(vimDir . '/undodir')
|
||||
" Create dirs
|
||||
call system('mkdir ' . vimDir)
|
||||
call system('mkdir ' . myUndoDir)
|
||||
let &undodir = myUndoDir
|
||||
set undofile
|
||||
endif
|
||||
|
||||
" Allow saving of files as sudo when I forgot to start vim using sudo.
|
||||
" From https://stackoverflow.com/a/7078429
|
||||
cmap w!! w !sudo tee > /dev/null %
|
||||
|
||||
imap jk <Esc>
|
||||
vmap <Enter> <Esc>
|
||||
|
||||
nmap <Enter> o<Esc>
|
||||
nmap <C-H> :bp<CR>
|
||||
nmap <C-L> :bn<CR>
|
||||
if has('nvim')
|
||||
" nmap <C-K> 20k
|
||||
" nmap <C-J> 20j
|
||||
noremap <silent> <C-K> :call smooth_scroll#up(20, 5, 1)<CR>
|
||||
noremap <silent> <C-J> :call smooth_scroll#down(20, 5, 1)<CR>
|
||||
else
|
||||
nmap <C-K> kkkkkkkkkkkkkkkkkkkkk
|
||||
nmap <C-J> jjjjjjjjjjjjjjjjjjjjj
|
||||
endif
|
||||
|
||||
source ~/.config/vim/plugins
|
||||
source ~/.config/vim/pluginconfig
|
||||
source ~/.config/vim/vimconfig
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue