diff --git a/.vimrc b/.vimrc index 8f655ab..75b402e 100644 --- a/.vimrc +++ b/.vimrc @@ -4,17 +4,43 @@ set path+=** set wildmenu set relativenumber +exec "set listchars=tab:\\ \\ ,trail:·,extends:→,precedes:←" + +" example: ├┈┈┈├┈┈┈sometext······· +"exec "set listchars=tab:\u251c\u2508,trail:·,extends:→,precedes:←" + +" example:| | sometext······· +"exec "set listchars=tab:\\|\\ ,trail:·,extends:→,precedes:←" + +" example:|»»»|»»»sometext······· +"exec "set listchars=tab:\\|\uBB,trail:·,extends:→,precedes:←" + +" This turns it on: +set list + + " Read an empty HTML template and move cursor to title!! " nnoremap ,html :-1read $HOME/.vim/.skeleton.html3jwf>a nnoremap ,html :-1read $HOME/.vim/.skeleton.html7GA +" Signature file: +nnoremap ,sig :-1read $HOME/.signaturek + + if &term =~ "xterm" + "let &t_SI = "\]12;purple\x7" + let &t_SI = "\]12;green\x7" "insert mode + let &t_SR = "\]12;red\x7" "replace mode + let &t_EI = "\]12;white\x7" "normal mode + endif + colorscheme monokai -"colorscheme vividchalk "colorscheme codedark -"colorscheme jellybeans "colorscheme molokai +"colorscheme jellybeans +"colorscheme gruvbox +"colorscheme vividchalk filetype plugin indent on @@ -51,6 +77,9 @@ Plugin 'myhere/vim-nodejs-complete' Plugin 'othree/javascript-libraries-syntax.vim' Plugin 'jelera/vim-javascript-syntax' Plugin 'terryma/vim-smooth-scroll' +Plugin 'fatih/vim-go' +Plugin 'morhetz/gruvbox' +Plugin 'tpope/vim-fugitive' " All of your Plugins must be added before the following line @@ -67,7 +96,17 @@ filetype plugin indent on " required " " see :h vundle for more details or wiki for FAQ " Put your non-Plugin stuff after this line - +set updatetime=100 "This causes statusline to update in 100ms instead of the default 800ms +let g:go_def_mode='gopls' +let g:go_info_mode='gopls' +let g:go_auto_type_info=1 + +let g:go_highlight_types = 1 +let g:go_highlight_fields = 1 +let g:go_highlight_functions = 1 +let g:go_highlight_function_calls = 1 +let g:go_highlight_extra_types = 1 +let g:go_highlight_operators = 1 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" noremap :call smooth_scroll#up(&scroll, 0, 2) @@ -76,10 +115,22 @@ noremap :call smooth_scroll#up(&scroll*2, 0, 4) noremap :call smooth_scroll#down(&scroll*2, 0, 4) set history=1000 - + map :setlocal spell! spelllang=en_us map "=system(genpassword) + + + +nnoremap :set listchars=tab:\ \ ,trail:·,extends:→,precedes:← +inoremap :set listchars=tab:\ \ ,trail:·,extends:→,precedes:← a +nnoremap :set listchars=tab:├┈,trail:·,extends:→,precedes:← +inoremap :set listchars=tab:├┈,trail:·,extends:→,precedes:← a +nnoremap :set list +inoremap :set lista + +set pastetoggle= + "set laststatus=2 "set background=dark @@ -96,7 +147,7 @@ hi User9 ctermfg=LightGray ctermbg=DarkGray "hi statusline ctermfg=DarkGray " ctermbg=Black - + "set statusline= "set statusline +=%2*\ [%1*%n%2*]\ %* "buffer number "set statusline +=%6*%{&ff}%* "file format @@ -113,5 +164,5 @@ hi User9 ctermfg=LightGray ctermbg=DarkGray "set statusline +=%2*/%L)%* "total lines "set statusline +=%3p%% "percentage of file - + diff --git a/bundle/Vundle.vim b/bundle/Vundle.vim index 9a38216..b255382 160000 --- a/bundle/Vundle.vim +++ b/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d +Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95 diff --git a/syntax/go.vim b/syntax/go.vim index 45ef8df..57672ac 100644 --- a/syntax/go.vim +++ b/syntax/go.vim @@ -35,7 +35,7 @@ syn keyword goType int8 int16 int32 int64 syn keyword goType float32 float64 syn keyword goType float32 float64 syn keyword goType byte -syn keyword goType uint int float uintptr string +syn keyword goType uint int float uintptr string bool syn keyword goConcurrent chan go