pinosaur
/
dotfiles.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lots of snippets
[dotfiles.git]
/
.vimrc
diff --git
a/.vimrc
b/.vimrc
index
0cb4acd
..
56cc40c
100644
(file)
--- a/
.vimrc
+++ b/
.vimrc
@@
-10,11
+10,12
@@
syntax on
set number
set relativenumber
set incsearch
set number
set relativenumber
set incsearch
-set smartcase
set encoding=utf-8
set tabstop=4
set shiftwidth=4
set expandtab
set encoding=utf-8
set tabstop=4
set shiftwidth=4
set expandtab
+set ignorecase
+set smartcase
set nrformats+=alpha "inc/dec alpha
set hidden
set nrformats+=alpha "inc/dec alpha
set hidden
@@
-53,13
+54,12
@@
set foldnestmax=10
set nofoldenable
set foldlevel=2
set nofoldenable
set foldlevel=2
-
" View whitespace
map <leader>s :set list!<cr>
set listchars=tab:▸\ ,space:·,eol:¬
" reload vimrc
" View whitespace
map <leader>s :set list!<cr>
set listchars=tab:▸\ ,space:·,eol:¬
" reload vimrc
-map <leader>r :source ~/.vimrc<cr>
+map <leader>r :source ~/.vimrc<cr>
:echo "vimrc reloaded"<cr>
" statusline
function! StatusModeColor()
" statusline
function! StatusModeColor()
@@
-111,6
+111,11
@@
set statusline+=\ %r\[%{v:register}\]
set statusline+=\ %l/%L:%c\ |
set statusline+=%1*\ |
set statusline+=\ %l/%L:%c\ |
set statusline+=%1*\ |
+" Tab line
+hi TabLineSel cterm=Bold ctermfg=Yellow
+hi TabLine cterm=None ctermfg=Grey ctermbg=Black
+hi TabLineFill cterm=None ctermbg=Black
+
" Templates
augroup templates
autocmd BufNewFile *.tex 0r ~/.vim/templates/skeleton.tex
" Templates
augroup templates
autocmd BufNewFile *.tex 0r ~/.vim/templates/skeleton.tex
@@
-133,12
+138,10
@@
call plug#begin('~/.vim/plugged')
Plug 'sirver/ultisnips'
Plug 'lervag/vimtex'
Plug 'PietroPate/vim-tex-conceal'
Plug 'sirver/ultisnips'
Plug 'lervag/vimtex'
Plug 'PietroPate/vim-tex-conceal'
-Plug 'jiangmiao/auto-pairs'
+
"
Plug 'jiangmiao/auto-pairs'
Plug 'tpope/vim-commentary'
Plug 'rlue/vim-barbaric'
Plug 'tpope/vim-commentary'
Plug 'rlue/vim-barbaric'
-Plug 'jeffkreeftmeijer/vim-dim'
-" Plug 'ptzz/lf.vim'
-" Plug 'voldikss/vim-floaterm'
+Plug 'ap/vim-buftabline'
call plug#end()
call plug#end()
@@
-151,7
+154,7
@@
let g:UltiSnipsJumpForwardTrigger = '<tab>'
let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
let g:UltiSnipsSnippetDirectories=["UltiSnips", "mysnippets"]
let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
let g:UltiSnipsSnippetDirectories=["UltiSnips", "mysnippets"]
-map <localleader>sr :call UltiSnips#RefreshSnippets()<cr>
+map <localleader>sr :call UltiSnips#RefreshSnippets()<cr>
:echo "Refreshed Snippets"<cr>
" Vimtex
let g:tex_flavor='latex'
" Vimtex
let g:tex_flavor='latex'
@@
-166,16
+169,13
@@
let g:vimtex_compiler_latexmk = {
" \ '-shell-escape',
" \],
" \ '-shell-escape',
" \],
-" Ctrlp
-" let g:ctrlp_cmd='CtrlPTag'
-
-" Lf
-" let g:lf_replace_netrw = 1 " weird behavior rn
-
" vim-barbaric
let g:barbaric_ime = 'ibus'
set ttimeoutlen=0
" vim-barbaric
let g:barbaric_ime = 'ibus'
set ttimeoutlen=0
+" buftabline
+let g:buftabline_show = 1
+
" Run after plugins
autocmd FileType * set formatoptions-=o
" Run after plugins
autocmd FileType * set formatoptions-=o
@@
-193,18
+193,15
@@
hi Question ctermfg=2
hi Title ctermfg=5
hi WarningMsg ctermfg=1
hi WildMenu ctermfg=0 ctermbg=11
hi Title ctermfg=5
hi WarningMsg ctermfg=1
hi WildMenu ctermfg=0 ctermbg=11
-hi Conceal cterm
f
g=0
-hi SpellBad cterm
b
g=9 ctermbg=0 cterm=underline
-hi SpellRare ctermbg=13
-hi SpellLocal cterm
bg=14
+hi Conceal cterm
b
g=0
+hi SpellBad cterm
f
g=9 ctermbg=0 cterm=underline
+hi SpellRare ctermbg=13
ctermbg=0 cterm=underline
+hi SpellLocal cterm
fg=14 ctermbg=0 cterm=underline
hi PmenuSbar ctermbg=8
hi PmenuThumb ctermbg=0
hi PmenuSbar ctermbg=8
hi PmenuThumb ctermbg=0
-hi TabLine cterm=underline ctermfg=0 ctermbg=7
-hi TabLineSel cterm=bold
-hi TabLineFill cterm=reverse
hi CursorColumn ctermbg=7
hi CursorLine cterm=underline
hi CursorColumn ctermbg=7
hi CursorLine cterm=underline
-hi MatchParen ctermbg=14
+hi MatchParen cterm
=NONE ctermfg=0 cterm
bg=14
hi Constant ctermfg=1
hi Special ctermfg=5
hi Identifier cterm=NONE ctermfg=6
hi Constant ctermfg=1
hi Special ctermfg=5
hi Identifier cterm=NONE ctermfg=6
@@
-215,7
+212,7
@@
hi Underlined cterm=underline ctermfg=5
hi Ignore ctermfg=15
hi Error ctermfg=15 ctermbg=9
hi Todo ctermfg=0 ctermbg=11
hi Ignore ctermfg=15
hi Error ctermfg=15 ctermbg=9
hi Todo ctermfg=0 ctermbg=11
-hi Comment ctermfg=
7
+hi Comment ctermfg=
DarkGrey
hi lineNr ctermfg=DarkGrey
hi Folded ctermfg=0
hi lineNr ctermfg=DarkGrey
hi Folded ctermfg=0