aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vim/.vim/vimrc32
1 files changed, 29 insertions, 3 deletions
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index 2ac4837..9ceeb3c 100644
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -3,9 +3,8 @@ set undodir=~/.cache/vim/undo
set directory=~/.cache/vim/swap
set backupdir=~/.cache/vim/backup
set viminfo+=n~/.cache/vim/viminfo
-set clipboard=unnamedplus autochdir
+set title clipboard=unnamedplus autochdir
set showcmd noshowmode ruler wildmenu confirm number relativenumber
-set nostartofline
if has("patch-7.4.710")
set list listchars+=space:ยท,tab:\ \
endif
@@ -25,7 +24,9 @@ augroup vimrc
autocmd BufNewFile,BufRead *.m setlocal filetype=octave
autocmd BufNewFile,BufRead *.h setlocal filetype=c
autocmd BufNewFile,BufRead CHANGES setlocal filetype=mail
- autocmd FileType asm,c,cpp,h,diff,gitconfig,gitsendemail,go,glsl,mail,make,sshconfig,php,tsv
+ autocmd FileType asm,automake,c,cpp,h,go,glsl,make,php
+ \ setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8 tabstop=8
+ autocmd FileType diff,gitconfig,gitsendemail,mail,sshconfig,tsv
\ setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8 tabstop=8
autocmd FileType vim,sh,scheme,lua,tex,cmake,cpp,plantuml,html,octave,pascal
\ setlocal shiftwidth=2
@@ -42,11 +43,36 @@ augroup END
let g:netrw_banner = 0
let g:netrw_liststyle = 3
+let g:srcery_black = '#fff5f3'
+let g:srcery_red = '#b93f1a'
+let g:srcery_green = '#437520'
+let g:srcery_yellow = '#985900'
+let g:srcery_blue = '#485adf'
+let g:srcery_magenta = '#a234c0'
+let g:srcery_cyan = '#00756a'
+let g:srcery_white = '#796271'
+let g:srcery_bright_black = '#889988'
+let g:srcery_bright_red = '#c61a14'
+let g:srcery_bright_green = '#357200'
+let g:srcery_bright_yellow = '#825e00'
+let g:srcery_bright_blue = '#1666b0'
+let g:srcery_bright_magenta = '#a83884'
+let g:srcery_bright_cyan = '#007072'
+let g:srcery_bright_white = '#4d595f'
+let g:srcery_orange = '#FF5F00'
+let g:srcery_bright_orange = '#FF8700'
+let g:srcery_xgray1 = '#d9d9d9'
+let g:srcery_xgray2 = '#cfcfcf'
+let g:srcery_xgray3 = '#c5c5c5'
+let g:srcery_xgray4 = '#bbbbbb'
+let g:srcery_xgray5 = '#b1b1b1'
+let g:srcery_xgray6 = '#a7a7a7'
let g:srcery_italic = 1
let g:jedi#popup_on_dot = 0
let g:jedi#popup_select_first = 0
let g:jedi#show_call_signatures = 2
let g:jedi#smart_auto_mappings = 0
+let g:zig_fmt_autosave = 0
let g:polyglot_disabled = ['latex']
call plug#begin('~/.vim/plugged')