Merge branch 'dev' into 'master'
Improved capabilities and config See merge request Steins7/vim!3
This commit is contained in:
commit
58736d22bb
13
.gitmodules
vendored
13
.gitmodules
vendored
@ -19,4 +19,15 @@
|
|||||||
[submodule "bundle/vim-cpp-modern"]
|
[submodule "bundle/vim-cpp-modern"]
|
||||||
path = bundle/vim-cpp-modern
|
path = bundle/vim-cpp-modern
|
||||||
url = https://github.com/bfrg/vim-cpp-modern.git
|
url = https://github.com/bfrg/vim-cpp-modern.git
|
||||||
|
[submodule "bundle/vim-sensible"]
|
||||||
|
path = bundle/vim-sensible
|
||||||
|
url = https://github.com/tpope/vim-sensible
|
||||||
|
[submodule "bundle/lightline.vim"]
|
||||||
|
path = bundle/lightline.vim
|
||||||
|
url = https://github.com/itchyny/lightline.vim.git
|
||||||
|
[submodule "bundle/editorconfig-vim"]
|
||||||
|
path = bundle/editorconfig-vim
|
||||||
|
url = https://github.com/editorconfig/editorconfig-vim.git
|
||||||
|
[submodule "bundle/openscad.vim"]
|
||||||
|
path = bundle/openscad.vim
|
||||||
|
url = https://github.com/vim-scripts/openscad.vim
|
||||||
|
|||||||
1
bundle/editorconfig-vim
Submodule
1
bundle/editorconfig-vim
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 3078cd10b28904e57d878c0d0dab42aa0a9fdc89
|
||||||
1
bundle/lightline.vim
Submodule
1
bundle/lightline.vim
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit b06d921023cf6536bcbee5754071d122296e8942
|
||||||
1
bundle/openscad.vim
Submodule
1
bundle/openscad.vim
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit c9d46851d57cb3cc15d30ddb0e236804cb51213b
|
||||||
@ -1 +0,0 @@
|
|||||||
Subproject commit 855c30915547c7e9c19b7e6efb528730c071d2e8
|
|
||||||
1
bundle/vim-sensible
Submodule
1
bundle/vim-sensible
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 2d9f34c09f548ed4df213389caa2882bfe56db58
|
||||||
@ -1,4 +1,5 @@
|
|||||||
set colorcolumn=81
|
set colorcolumn=81
|
||||||
|
set textwidth=80
|
||||||
set cino=N-s
|
set cino=N-s
|
||||||
|
|
||||||
let g:cpp_attributes_highlight = 1
|
let g:cpp_attributes_highlight = 1
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
set colorcolumn=81
|
set colorcolumn=81
|
||||||
|
set textwidth=80
|
||||||
set cino=N-s
|
set cino=N-s
|
||||||
|
|
||||||
let g:cpp_attributes_highlight = 1
|
let g:cpp_attributes_highlight = 1
|
||||||
|
|||||||
@ -12,5 +12,18 @@ let g:vimtex_fold_enable = 1
|
|||||||
let g:tex_flavor = 'latex'
|
let g:tex_flavor = 'latex'
|
||||||
let g:vimtex_view_general_viewer = 'evince'
|
let g:vimtex_view_general_viewer = 'evince'
|
||||||
let g:vimtex_compiler_method = 'latexmk'
|
let g:vimtex_compiler_method = 'latexmk'
|
||||||
let g:vimtex_compiler_latexmk['options'] = '-shell-escape'
|
let g:vimtex_compiler_latexmk = {
|
||||||
|
\ 'build_dir' : 'bin',
|
||||||
|
\ 'callback' : 1,
|
||||||
|
\ 'continuous' : 1,
|
||||||
|
\ 'executable' : 'latexmk',
|
||||||
|
\ 'hooks' : [],
|
||||||
|
\ 'options' : [
|
||||||
|
\ '-verbose',
|
||||||
|
\ '-file-line-error',
|
||||||
|
\ '-synctex=1',
|
||||||
|
\ '-interaction=nonstopmode',
|
||||||
|
\ '-shell-escape',
|
||||||
|
\ ],
|
||||||
|
\}
|
||||||
|
|
||||||
|
|||||||
46
vimrc
46
vimrc
@ -2,45 +2,20 @@
|
|||||||
runtime bundle/vim-pathogen/autoload/pathogen.vim
|
runtime bundle/vim-pathogen/autoload/pathogen.vim
|
||||||
execute pathogen#infect()
|
execute pathogen#infect()
|
||||||
|
|
||||||
"file type detection
|
" colorscheme
|
||||||
filetype on
|
|
||||||
|
|
||||||
"ligne number
|
|
||||||
set number
|
|
||||||
|
|
||||||
"coloration
|
|
||||||
syntax on
|
|
||||||
set cursorline
|
|
||||||
"highlight ColorColumn ctermbg=DarkYellow
|
|
||||||
let g:spacegray_use_italics=1
|
let g:spacegray_use_italics=1
|
||||||
colorscheme spacegray
|
colorscheme spacegray
|
||||||
"let g:minimap_highlight='Visual'
|
let g:airline_theme='distinguished'
|
||||||
|
let g:lightline = {
|
||||||
|
\ 'colorscheme': 'Tomorrow_Night',
|
||||||
|
\}
|
||||||
|
|
||||||
"miscellaneous
|
" custom settings
|
||||||
set backspace=indent,eol,start
|
set number
|
||||||
set tabstop=4
|
set tabstop=4
|
||||||
set shiftwidth=4
|
set shiftwidth=4
|
||||||
set shiftround
|
|
||||||
set ruler
|
|
||||||
set nocompatible
|
|
||||||
|
|
||||||
"inclomplete commands
|
|
||||||
set showcmd
|
|
||||||
|
|
||||||
"indent
|
|
||||||
filetype plugin indent on
|
|
||||||
set autoindent
|
|
||||||
set smartindent
|
|
||||||
set cindent
|
|
||||||
set pastetoggle=<F5>
|
set pastetoggle=<F5>
|
||||||
|
"let mapleader=','
|
||||||
"matching parenthesis
|
|
||||||
set showmatch
|
|
||||||
|
|
||||||
"escape sequence
|
|
||||||
set ttimeout
|
|
||||||
set timeout timeoutlen=300
|
|
||||||
let mapleader=','
|
|
||||||
|
|
||||||
" window nav
|
" window nav
|
||||||
nnoremap <leader>w <C-w>
|
nnoremap <leader>w <C-w>
|
||||||
@ -68,10 +43,13 @@ nmap <silent> <C-l> :noh<CR>
|
|||||||
nmap <silent> <F6> gg=G<C-o><C-o><CR>
|
nmap <silent> <F6> gg=G<C-o><C-o><CR>
|
||||||
nmap <silent> <C-t> :NERDTreeToggle<CR>
|
nmap <silent> <C-t> :NERDTreeToggle<CR>
|
||||||
|
|
||||||
"headers
|
" headers
|
||||||
let g:header_auto_add_header=0
|
let g:header_auto_add_header=0
|
||||||
let g:header_field_author='Steins7'
|
let g:header_field_author='Steins7'
|
||||||
let g:header_field_author_email='steinsset@gmail.com'
|
let g:header_field_author_email='steinsset@gmail.com'
|
||||||
let g:header_field_license_id='GNU'
|
let g:header_field_license_id='GNU'
|
||||||
nmap <silent> <F4> :AddHeader<CR>
|
nmap <silent> <F4> :AddHeader<CR>
|
||||||
|
|
||||||
|
set autochdir
|
||||||
|
let g:EditorConfig_verbose=1
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user