Compare commits

..

No commits in common. "97506e23b779bca2ad3236930b138a8a1b1f954a" and "de43f2bcd8124ddd583ad51522c436a22c99d665" have entirely different histories.

11 changed files with 43 additions and 61 deletions

12
.gitmodules vendored
View File

@ -19,15 +19,3 @@
[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 +0,0 @@
Subproject commit 3078cd10b28904e57d878c0d0dab42aa0a9fdc89

@ -1 +0,0 @@
Subproject commit b06d921023cf6536bcbee5754071d122296e8942

@ -1 +0,0 @@
Subproject commit c9d46851d57cb3cc15d30ddb0e236804cb51213b

@ -0,0 +1 @@
Subproject commit 855c30915547c7e9c19b7e6efb528730c071d2e8

@ -1 +0,0 @@
Subproject commit 2d9f34c09f548ed4df213389caa2882bfe56db58

View File

@ -1,3 +1,4 @@
set colorcolumn=81
set cino=N-s set cino=N-s
let g:cpp_attributes_highlight = 1 let g:cpp_attributes_highlight = 1

View File

@ -1,3 +1,4 @@
set colorcolumn=81
set cino=N-s set cino=N-s
let g:cpp_attributes_highlight = 1 let g:cpp_attributes_highlight = 1

View File

@ -1,3 +1,4 @@
set colorcolumn=81
"replace tabs with spaces "replace tabs with spaces
set expandtab set expandtab

View File

@ -12,18 +12,5 @@ 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 = { let g:vimtex_compiler_latexmk['options'] = '-shell-escape'
\ 'build_dir' : 'bin',
\ 'callback' : 1,
\ 'continuous' : 1,
\ 'executable' : 'latexmk',
\ 'hooks' : [],
\ 'options' : [
\ '-verbose',
\ '-file-line-error',
\ '-synctex=1',
\ '-interaction=nonstopmode',
\ '-shell-escape',
\ ],
\}

69
vimrc
View File

@ -2,53 +2,60 @@
runtime bundle/vim-pathogen/autoload/pathogen.vim runtime bundle/vim-pathogen/autoload/pathogen.vim
execute pathogen#infect() execute pathogen#infect()
" colorscheme "file type detection
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:airline_theme='distinguished' "let g:minimap_highlight='Visual'
let g:lightline = {
\ 'colorscheme': 'Tomorrow_Night',
\}
" custom settings "miscellaneous
set number set backspace=indent,eol,start
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=','
" window nav "matching parenthesis
nnoremap <leader>w <C-w> set showmatch
nnoremap <Esc>h <C-w>h
nnoremap <Esc>j <C-w>j
nnoremap <Esc>k <C-w>k
nnoremap <Esc>l <C-w>l
" resize window "escape sequence
nnoremap <C-h> <C-w>< set ttimeout
nnoremap <C-j> <C-w>+ set timeout timeoutlen=300
nnoremap <C-k> <C-w>- let mapleader=','
nnoremap <C-l> <C-w>>
" tab nav "mapping
nnoremap <Esc>n :tabn<cr> nmap <silent> <S-A-Up> :wincmd k<CR>
nnoremap <Esc>p :tabp<cr> nmap <silent> <^[[1;4D> : wincmd h<CR>
nmap <silent> <S-A-Down> :wincmd j<CR>
" buffer nav nmap <silent> <S-A-Left> :wincmd h<CR>
nmap <C-n> :bn<cr> nmap <silent> <S-A-Right> :wincmd l<CR>
nmap <C-p> :bp<cr>
nmap <silent> <^[[1;4D> :wincmd h<CR>
nmap <silent> <C-l> :noh<CR> 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