tidying up

This commit is contained in:
ManjaroOne666 2017-12-26 22:54:44 +00:00
parent 2fa08abb40
commit c5c592ffee
1 changed files with 16 additions and 15 deletions

31
vimrc
View File

@ -3,7 +3,7 @@ filetype off " required
set ttyfast set ttyfast
" set the runtime path to include Vundle and initialize " set the runtime path to include Vundle and initialize
set rtp+=~/.vim/bundle/Vundle.vim set runtimepath+=~/.vim/bundle/Vundle.vim
call vundle#begin() call vundle#begin()
" alternatively, pass a path where Vundle should install plugins " alternatively, pass a path where Vundle should install plugins
"call vundle#begin('~/some/path/here') "call vundle#begin('~/some/path/here')
@ -114,7 +114,7 @@ set wildmode=longest:full,full
" allow hidden buffers " allow hidden buffers
set hidden set hidden
set bg=dark set background=dark
" set number " set number
set number relativenumber set number relativenumber
set hlsearch " highlight searches set hlsearch " highlight searches
@ -126,7 +126,7 @@ set foldcolumn=2
" key mappings " key mappings
let g:mapleader = "\<space>" let g:mapleader = "\<space>"
" jk acts as escape in insert,visual/select modes " jk acts as escape in insert
inoremap jk <esc> inoremap jk <esc>
nnoremap <leader>co :!clear; nnoremap <leader>co :!clear;
@ -279,7 +279,7 @@ set undofile
" get name of syntax item " get name of syntax item
function! SyntaxItem() function! SyntaxItem()
return synIDattr(synID(line("."),col("."),1),"name") . " -> " . synIDattr(synIDtrans(synID(line("."),col("."),1)), "name" ) return synIDattr(synID(line('.'),col('.'),1),'name') . ' -> ' . synIDattr(synIDtrans(synID(line('.'),col('.'),1)), 'name' )
endfunction endfunction
nnoremap <leader>p :echom SyntaxItem()<CR> nnoremap <leader>p :echom SyntaxItem()<CR>
@ -292,9 +292,9 @@ let g:user_emmet_leader_key='<c-j>'
" taboo.vim " taboo.vim
set sessionoptions+=tabpages,globals set sessionoptions+=tabpages,globals
let g:taboo_tab_format = " %f%m " let g:taboo_tab_format = ' %f%m '
let g:taboo_renamed_tab_format = " %l%m " let g:taboo_renamed_tab_format = ' %l%m '
let g:taboo_modified_tab_flag = "+" let g:taboo_modified_tab_flag = '+'
" vue-vim " vue-vim
" disable preprocessor checking for vue files - increases speed " disable preprocessor checking for vue files - increases speed
@ -320,6 +320,9 @@ set belloff+=ctrlg " If Vim beeps during completion
" call add(g:mucomplete#chains['default'], 'ulti') " call add(g:mucomplete#chains['default'], 'ulti')
" ALE " ALE
nnoremap <leader>ne :lnext<cr>
nnoremap <leader>pe :lprev<cr>
let g:ale_sign_error = '>>' let g:ale_sign_error = '>>'
let g:ale_sign_warning = '--' let g:ale_sign_warning = '--'
let g:ale_sign_column_always = 1 let g:ale_sign_column_always = 1
@ -341,16 +344,16 @@ function! LinterStatus() abort
let l:all_errors = l:counts.error + l:counts.style_error let l:all_errors = l:counts.error + l:counts.style_error
let l:all_non_errors = l:counts.total - l:all_errors let l:all_non_errors = l:counts.total - l:all_errors
return l:counts.total == 0 ? 'OK' : printf('%dW %dE', all_non_errors, all_errors) return l:counts.total == 0 ? 'OK' : printf('%dW %dE', l:all_non_errors, l:all_errors)
endfunction endfunction
"nmap <silent> <C-k> <Plug>(ale_previous_wrap) "nmap <silent> <C-k> <Plug>(ale_previous_wrap)
"nmap <silent> <C-j> <Plug>(ale_next_wrap) "nmap <silent> <C-j> <Plug>(ale_next_wrap)
" ultisnips " ultisnips
" Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe. " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
let g:UltiSnipsExpandTrigger="<Esc><space>" let g:UltiSnipsExpandTrigger='<Esc><space>'
let g:UltiSnipsJumpForwardTrigger="<c-b>" let g:UltiSnipsJumpForwardTrigger='<c-b>'
let g:UltiSnipsJumpBackwardTrigger="<c-z>" let g:UltiSnipsJumpBackwardTrigger='<c-z>'
" NERDtree " NERDtree
nnoremap <F3> :NERDTreeFocus<CR> nnoremap <F3> :NERDTreeFocus<CR>
@ -394,8 +397,6 @@ call project_tags#add_language('.phptags', 'php')
call project_tags#add_language('.csstags','css') call project_tags#add_language('.csstags','css')
call project_tags#add_language('.scsstags','scss') call project_tags#add_language('.scsstags','scss')
" jsut some example text one two three four five Six "Seven"
let g:tagbar_type_css = { let g:tagbar_type_css = {
\ 'ctagstype' : 'css', \ 'ctagstype' : 'css',
\ 'kinds' : [ \ 'kinds' : [
@ -419,9 +420,9 @@ let g:tagbar_type_scss = {
\ ] \ ]
\} \}
if !exists("*RangerExplorer") if !exists('*RangerExplorer')
function RangerExplorer() function RangerExplorer()
exec "silent !ranger --choosefile=/tmp/vim_ranger_current_file " . expand("%:p:h") exec 'silent !ranger --choosefile=/tmp/vim_ranger_current_file ' . expand('%:p:h')
if filereadable('/tmp/vim_ranger_current_file') if filereadable('/tmp/vim_ranger_current_file')
exec 'edit ' . system('cat /tmp/vim_ranger_current_file') exec 'edit ' . system('cat /tmp/vim_ranger_current_file')
call system('rm /tmp/vim_ranger_current_file') call system('rm /tmp/vim_ranger_current_file')