diff --git a/.bashrc b/.bashrc index 155783a..df2b2ea 100644 --- a/.bashrc +++ b/.bashrc @@ -146,7 +146,9 @@ export FZF_DEFAULT_COMMAND='rg --files --hidden' export PATH=$PATH:/usr/local/go/bin -# Look in my ascii-art folder, and use shuf to get a randome file name. +# Needed to get some go modules to complile +export CGO_LDFLAGS_ALLOW="-Wl,-Bsymbolic-functions" +#Loo kin my ascii-art folder, and use shuf to get a randome file name. BANNERFILE=$(ls ~/mydocs/ascii-art/ | shuf -n 1) # Then use lolcat to display the colorful ascii art file lolcat ~/mydocs/ascii-art/$BANNERFILE diff --git a/.gitignore b/.gitignore index ddd076d..57c7fbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .git/ .bash_history __pycache__/ +starship*.* \ No newline at end of file diff --git a/init-slow.vim b/init-slow.vim new file mode 100644 index 0000000..9fcfa44 --- /dev/null +++ b/init-slow.vim @@ -0,0 +1,627 @@ +" vim-bootstrap 2020-10-22 18:06:35 + +"***************************************************************************** +"" Vim-Plug core +"***************************************************************************** +let vimplug_exists=expand('~/.config/nvim/autoload/plug.vim') +if has('win32')&&!has('win64') + let curl_exists=expand('C:\Windows\Sysnative\curl.exe') +else + let curl_exists=expand('curl') +endif + +let g:vim_bootstrap_langs = "c,go,html,javascript,python,typescript" +let g:vim_bootstrap_editor = "nvim" " nvim or vim +let g:vim_bootstrap_theme = "codedark" +let g:vim_bootstrap_frams = "" + +if !filereadable(vimplug_exists) + if !executable(curl_exists) + echoerr "You have to install curl or first install vim-plug yourself!" + execute "q!" + endif + echo "Installing Vim-Plug..." + echo "" + silent exec "!"curl_exists" -fLo " . shellescape(vimplug_exists) . " --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" + let g:not_finish_vimplug = "yes" + + autocmd VimEnter * PlugInstall +endif + +" Required: +call plug#begin(expand('~/.config/nvim/plugged')) + +"***************************************************************************** +"" Plug install packages +"***************************************************************************** +Plug 'scrooloose/nerdtree' +Plug 'jistr/vim-nerdtree-tabs' +Plug 'tpope/vim-commentary' +Plug 'tpope/vim-fugitive' +Plug 'vim-airline/vim-airline' +Plug 'vim-airline/vim-airline-themes' +Plug 'airblade/vim-gitgutter' +Plug 'vim-scripts/grep.vim' +Plug 'vim-scripts/CSApprox' +Plug 'Raimondi/delimitMate' +Plug 'majutsushi/tagbar' +Plug 'dense-analysis/ale' +Plug 'Yggdroot/indentLine' +Plug 'editor-bootstrap/vim-bootstrap-updater' +Plug 'tpope/vim-rhubarb' " required by fugitive to :Gbrowse +Plug 'tomasiser/vim-code-dark' + +Plug 'vimwiki/vimwiki' " vimwiki + +if isdirectory('/usr/local/opt/fzf') + Plug '/usr/local/opt/fzf' | Plug 'junegunn/fzf.vim' +else + Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } + Plug 'junegunn/fzf.vim' +endif +let g:make = 'gmake' +if exists('make') + let g:make = 'make' +endif +Plug 'Shougo/vimproc.vim', {'do': g:make} + +"" Vim-Session +Plug 'xolox/vim-misc' +Plug 'xolox/vim-session' + +"" Snippets +Plug 'SirVer/ultisnips' +Plug 'honza/vim-snippets' + +"***************************************************************************** +"" Custom bundles +"***************************************************************************** + +" c +Plug 'vim-scripts/c.vim', {'for': ['c', 'cpp']} +Plug 'ludwig/split-manpage.vim' + + +" go +"" Go Lang Bundle +Plug 'fatih/vim-go', {'do': ':GoInstallBinaries'} + + +" html +"" HTML Bundle +Plug 'hail2u/vim-css3-syntax' +Plug 'gko/vim-coloresque' +Plug 'tpope/vim-haml' +Plug 'mattn/emmet-vim' + + +" javascript +"" Javascript Bundle +Plug 'jelera/vim-javascript-syntax' + + +" python +"" Python Bundle +Plug 'davidhalter/jedi-vim' +Plug 'raimon49/requirements.txt.vim', {'for': 'requirements'} + + +" typescript +Plug 'leafgarland/typescript-vim' +Plug 'HerringtonDarkholme/yats.vim' + + +"***************************************************************************** +"***************************************************************************** + +"" Include user's extra bundle +if filereadable(expand("~/.config/nvim/local_bundles.vim")) + source ~/.config/nvim/local_bundles.vim +endif + +call plug#end() + +" Required: +filetype plugin indent on + + +"***************************************************************************** +"" Basic Setup +"*****************************************************************************" +"" Encoding +set encoding=utf-8 +set fileencoding=utf-8 +set fileencodings=utf-8 + + +"" Fix backspace indent +set backspace=indent,eol,start + +"" Tabs. May be overridden by autocmd rules +set tabstop=4 +set softtabstop=0 +set shiftwidth=4 +set expandtab + +"" Map leader to , +let mapleader=',' + +"" Enable hidden buffers +set hidden + +"" Searching +set hlsearch +set incsearch +set ignorecase +set smartcase + +set fileformats=unix,dos,mac + +if exists('$SHELL') + set shell=$SHELL +else + set shell=/bin/sh +endif + +" session management +let g:session_directory = "~/.config/nvim/session" +let g:session_autoload = "no" +let g:session_autosave = "no" +let g:session_command_aliases = 1 + +"***************************************************************************** +"" Visual Settings +"***************************************************************************** +syntax on +set ruler +set number + +let no_buffers_menu=1 +colorscheme codedark + + +set mousemodel=popup +set t_Co=256 +set guioptions=egmrti +set gfn=Monospace\ 10 + +if has("gui_running") + if has("gui_mac") || has("gui_macvim") + set guifont=Menlo:h12 + set transparency=7 + endif +else + let g:CSApprox_loaded = 1 + + " IndentLine + let g:indentLine_enabled = 1 + let g:indentLine_concealcursor = 0 + let g:indentLine_char = '┆' + let g:indentLine_faster = 1 + + +endif + + + +"" Disable the blinking cursor. +set gcr=a:blinkon0 + +au TermEnter * setlocal scrolloff=0 +au TermLeave * setlocal scrolloff=3 + + +"" Status bar +set laststatus=2 + +"" Use modeline overrides +set modeline +set modelines=10 + +set title +set titleold="Terminal" +set titlestring=%F + +set statusline=%F%m%r%h%w%=(%{&ff}/%Y)\ (line\ %l\/%L,\ col\ %c)\ + +" Search mappings: These will make it so that going to the next one in a +" search will center on the line it's found in. +nnoremap n nzzzv +nnoremap N Nzzzv + +if exists("*fugitive#statusline") + set statusline+=%{fugitive#statusline()} +endif + +" vim-airline +let g:airline_theme = 'powerlineish' +let g:airline#extensions#branch#enabled = 1 +let g:airline#extensions#ale#enabled = 1 +let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#tagbar#enabled = 1 +let g:airline_skip_empty_sections = 1 + +"***************************************************************************** +"" Abbreviations +"***************************************************************************** +"" no one is really happy until you have this shortcuts +cnoreabbrev W! w! +cnoreabbrev Q! q! +cnoreabbrev Qall! qall! +cnoreabbrev Wq wq +cnoreabbrev Wa wa +cnoreabbrev wQ wq +cnoreabbrev WQ wq +cnoreabbrev W w +cnoreabbrev Q q +cnoreabbrev Qall qall + +"" NERDTree configuration +let g:NERDTreeChDirMode=2 +let g:NERDTreeIgnore=['\.rbc$', '\~$', '\.pyc$', '\.db$', '\.sqlite$', '__pycache__'] +let g:NERDTreeSortOrder=['^__\.py$', '\/$', '*', '\.swp$', '\.bak$', '\~$'] +let g:NERDTreeShowBookmarks=1 +let g:nerdtree_tabs_focus_on_files=1 +let g:NERDTreeMapOpenInTabSilent = '' +let g:NERDTreeWinSize = 50 +set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.pyc,*.db,*.sqlite +nnoremap :NERDTreeFind +nnoremap :NERDTreeToggle + +" grep.vim +nnoremap f :Rgrep +let Grep_Default_Options = '-IR' +let Grep_Skip_Files = '*.log *.db' +let Grep_Skip_Dirs = '.git node_modules' + +" terminal emulation +nnoremap sh :terminal + + +"***************************************************************************** +"" Commands +"***************************************************************************** +" remove trailing whitespaces +command! FixWhitespace :%s/\s\+$//e + +"***************************************************************************** +"" Functions +"***************************************************************************** +if !exists('*s:setupWrapping') + function s:setupWrapping() + set wrap + set wm=2 + set textwidth=79 + endfunction +endif + +"***************************************************************************** +"" Autocmd Rules +"***************************************************************************** +"" The PC is fast enough, do syntax highlight syncing from start unless 200 lines +augroup vimrc-sync-fromstart + autocmd! + autocmd BufEnter * :syntax sync maxlines=200 +augroup END + +"" Remember cursor position +augroup vimrc-remember-cursor-position + autocmd! + autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif +augroup END + +"" txt +augroup vimrc-wrapping + autocmd! + autocmd BufRead,BufNewFile *.txt call s:setupWrapping() +augroup END + +"" make/cmake +augroup vimrc-make-cmake + autocmd! + autocmd FileType make setlocal noexpandtab + autocmd BufNewFile,BufRead CMakeLists.txt setlocal filetype=cmake +augroup END + +set autoread + +"***************************************************************************** +"" Mappings +"***************************************************************************** + +"" Split +noremap h :split +noremap v :vsplit + +"" Git +noremap ga :Gwrite +noremap gc :Gcommit +noremap gsh :Gpush +noremap gll :Gpull +noremap gs :Gstatus +noremap gb :Gblame +noremap gd :Gvdiff +noremap gr :Gremove + +" session management +nnoremap so :OpenSession +nnoremap ss :SaveSession +nnoremap sd :DeleteSession +nnoremap sc :CloseSession + +"" Tabs +nnoremap gt +nnoremap gT +nnoremap :tabnew + +"" Set working directory +nnoremap . :lcd %:p:h + +"" Opens an edit command with the path of the currently edited file filled in +noremap e :e =expand("%:p:h") . "/" + +"" Opens a tab edit command with the path of the currently edited file filled +noremap te :tabe =expand("%:p:h") . "/" + +"" fzf.vim +set wildmode=list:longest,list:full +set wildignore+=*.o,*.obj,.git,*.rbc,*.pyc,__pycache__ +let $FZF_DEFAULT_COMMAND = "find * -path '*/\.*' -prune -o -path 'node_modules/**' -prune -o -path 'target/**' -prune -o -path 'dist/**' -prune -o -type f -print -o -type l -print 2> /dev/null" + +" The Silver Searcher +if executable('ag') + let $FZF_DEFAULT_COMMAND = 'ag --hidden --ignore .git -g ""' + set grepprg=ag\ --nogroup\ --nocolor +endif + +" ripgrep +if executable('rg') + let $FZF_DEFAULT_COMMAND = 'rg --files --hidden --follow --glob "!.git/*"' + set grepprg=rg\ --vimgrep + command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --hidden --follow --glob "!.git/*" --color "always" '.shellescape().'| tr -d "\017"', 1, 0) +endif + +cnoremap =expand("%:p:h") . "/" +nnoremap b :Buffers +nnoremap e :FZF -m +"Recovery commands from history through FZF +nmap y :History: + +" snippets +let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +let g:UltiSnipsJumpBackwardTrigger="" +let g:UltiSnipsEditSplit="vertical" + +" ale +let g:ale_linters = {} + +" Tagbar +nmap :TagbarToggle +let g:tagbar_autofocus = 1 + +" Disable visualbell +set noerrorbells visualbell t_vb= +if has('autocmd') + autocmd GUIEnter * set visualbell t_vb= +endif + +"" Copy/Paste/Cut +if has('unnamedplus') + set clipboard=unnamed,unnamedplus +endif + +noremap YY "+y +noremap p "+gP +noremap XX "+x + +if has('macunix') + " pbcopy for OSX copy/paste + vmap :!pbcopy + vmap :w !pbcopy +endif + +"" Buffer nav +noremap z :bp +noremap q :bp +noremap x :bn +noremap w :bn + +"" Close buffer +noremap c :bd + +"" Clean search (highlight) +nnoremap :noh + +"" Switching windows +noremap j +noremap k +noremap l +noremap h + +"" Vmap for maintain Visual Mode after shifting > and < +vmap < >gv + +"" Move visual block +vnoremap J :m '>+1gv=gv +vnoremap K :m '<-2gv=gv + +"" Open current line on GitHub +nnoremap o :.Gbrowse + +"***************************************************************************** +"" Custom configs +"***************************************************************************** + +" c +autocmd FileType c setlocal tabstop=4 shiftwidth=4 expandtab +autocmd FileType cpp setlocal tabstop=4 shiftwidth=4 expandtab + + +" go +" vim-go +" run :GoBuild or :GoTestCompile based on the go file +function! s:build_go_files() + let l:file = expand('%') + if l:file =~# '^\f\+_test\.go$' + call go#test#Test(0, 1) + elseif l:file =~# '^\f\+\.go$' + call go#cmd#Build(0) + endif +endfunction + +let g:go_list_type = "quickfix" +let g:go_fmt_command = "goimports" +let g:go_fmt_fail_silently = 1 + +let g:go_highlight_types = 1 +let g:go_highlight_fields = 1 +let g:go_highlight_functions = 1 +let g:go_highlight_methods = 1 +let g:go_highlight_operators = 1 +let g:go_highlight_build_constraints = 1 +let g:go_highlight_structs = 1 +let g:go_highlight_generate_tags = 1 +let g:go_highlight_space_tab_error = 0 +let g:go_highlight_array_whitespace_error = 0 +let g:go_highlight_trailing_whitespace_error = 0 +let g:go_highlight_extra_types = 1 + +autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 + +augroup completion_preview_close + autocmd! + if v:version > 703 || v:version == 703 && has('patch598') + autocmd CompleteDone * if !&previewwindow && &completeopt =~ 'preview' | silent! pclose | endif + endif +augroup END + +augroup go + + au! + au Filetype go command! -bang A call go#alternate#Switch(0, 'edit') + au Filetype go command! -bang AV call go#alternate#Switch(0, 'vsplit') + au Filetype go command! -bang AS call go#alternate#Switch(0, 'split') + au Filetype go command! -bang AT call go#alternate#Switch(0, 'tabe') + + au FileType go nmap dd (go-def-vertical) + au FileType go nmap dv (go-doc-vertical) + au FileType go nmap db (go-doc-browser) + + au FileType go nmap r (go-run) + au FileType go nmap t (go-test) + au FileType go nmap gt (go-coverage-toggle) + au FileType go nmap i (go-info) + au FileType go nmap l (go-metalinter) + au FileType go nmap :GoDecls + au FileType go nmap dr :GoDeclsDir + au FileType go imap :GoDecls + au FileType go imap dr :GoDeclsDir + au FileType go nmap rb :call build_go_files() + +augroup END + +" ale +:call extend(g:ale_linters, { + \"go": ['golint', 'go vet'], }) + + +" html +" for html files, 2 spaces +autocmd Filetype html setlocal ts=2 sw=2 expandtab + + +" javascript +let g:javascript_enable_domhtmlcss = 1 + +" vim-javascript +augroup vimrc-javascript + autocmd! + autocmd FileType javascript setl tabstop=4|setl shiftwidth=4|setl expandtab softtabstop=4 +augroup END + + +" python +" vim-python +augroup vimrc-python + autocmd! + autocmd FileType python setlocal expandtab shiftwidth=4 tabstop=8 colorcolumn=79 + \ formatoptions+=croq softtabstop=4 + \ cinwords=if,elif,else,for,while,try,except,finally,def,class,with +augroup END + +" jedi-vim +let g:jedi#popup_on_dot = 0 +let g:jedi#goto_assignments_command = "g" +let g:jedi#goto_definitions_command = "d" +let g:jedi#documentation_command = "K" +let g:jedi#usages_command = "n" +let g:jedi#rename_command = "r" +let g:jedi#show_call_signatures = "0" +let g:jedi#completions_command = "" +let g:jedi#smart_auto_mappings = 0 + +" ale +:call extend(g:ale_linters, { + \'python': ['flake8'], }) + +" vim-airline +let g:airline#extensions#virtualenv#enabled = 1 + +" Syntax highlight +let python_highlight_all = 1 + + +" typescript +let g:yats_host_keyword = 1 + + + +"***************************************************************************** +"***************************************************************************** + +"" Include user's local vim config +if filereadable(expand("~/.config/nvim/local_init.vim")) + source ~/.config/nvim/local_init.vim +endif + +"***************************************************************************** +"" Convenience variables +"***************************************************************************** + +" vim-airline +if !exists('g:airline_symbols') + let g:airline_symbols = {} +endif + +if !exists('g:airline_powerline_fonts') + let g:airline#extensions#tabline#left_sep = ' ' + let g:airline#extensions#tabline#left_alt_sep = '|' + let g:airline_left_sep = '▶' + let g:airline_left_alt_sep = '»' + let g:airline_right_sep = '◀' + let g:airline_right_alt_sep = '«' + let g:airline#extensions#branch#prefix = '⤴' "➔, ➥, ⎇ + let g:airline#extensions#readonly#symbol = '⊘' + let g:airline#extensions#linecolumn#prefix = '¶' + let g:airline#extensions#paste#symbol = 'ρ' + let g:airline_symbols.linenr = '␊' + let g:airline_symbols.branch = '⎇' + let g:airline_symbols.paste = 'ρ' + let g:airline_symbols.paste = 'Þ' + let g:airline_symbols.paste = '∥' + let g:airline_symbols.whitespace = 'Ξ' +else + let g:airline#extensions#tabline#left_sep = '' + let g:airline#extensions#tabline#left_alt_sep = '' + + " powerline symbols + let g:airline_left_sep = '' + let g:airline_left_alt_sep = '' + let g:airline_right_sep = '' + let g:airline_right_alt_sep = '' + let g:airline_symbols.branch = '' + let g:airline_symbols.readonly = '' + let g:airline_symbols.linenr = '' +endif diff --git a/init.vim b/init.vim index 9fcfa44..8619416 100644 --- a/init.vim +++ b/init.vim @@ -1,627 +1,20 @@ -" vim-bootstrap 2020-10-22 18:06:35 - -"***************************************************************************** -"" Vim-Plug core -"***************************************************************************** -let vimplug_exists=expand('~/.config/nvim/autoload/plug.vim') -if has('win32')&&!has('win64') - let curl_exists=expand('C:\Windows\Sysnative\curl.exe') -else - let curl_exists=expand('curl') -endif - -let g:vim_bootstrap_langs = "c,go,html,javascript,python,typescript" -let g:vim_bootstrap_editor = "nvim" " nvim or vim -let g:vim_bootstrap_theme = "codedark" -let g:vim_bootstrap_frams = "" - -if !filereadable(vimplug_exists) - if !executable(curl_exists) - echoerr "You have to install curl or first install vim-plug yourself!" - execute "q!" - endif - echo "Installing Vim-Plug..." - echo "" - silent exec "!"curl_exists" -fLo " . shellescape(vimplug_exists) . " --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" - let g:not_finish_vimplug = "yes" - - autocmd VimEnter * PlugInstall -endif - -" Required: -call plug#begin(expand('~/.config/nvim/plugged')) - -"***************************************************************************** -"" Plug install packages -"***************************************************************************** -Plug 'scrooloose/nerdtree' -Plug 'jistr/vim-nerdtree-tabs' -Plug 'tpope/vim-commentary' -Plug 'tpope/vim-fugitive' -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' -Plug 'airblade/vim-gitgutter' -Plug 'vim-scripts/grep.vim' -Plug 'vim-scripts/CSApprox' -Plug 'Raimondi/delimitMate' -Plug 'majutsushi/tagbar' -Plug 'dense-analysis/ale' -Plug 'Yggdroot/indentLine' -Plug 'editor-bootstrap/vim-bootstrap-updater' -Plug 'tpope/vim-rhubarb' " required by fugitive to :Gbrowse -Plug 'tomasiser/vim-code-dark' - -Plug 'vimwiki/vimwiki' " vimwiki - -if isdirectory('/usr/local/opt/fzf') - Plug '/usr/local/opt/fzf' | Plug 'junegunn/fzf.vim' -else - Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' } - Plug 'junegunn/fzf.vim' -endif -let g:make = 'gmake' -if exists('make') - let g:make = 'make' -endif -Plug 'Shougo/vimproc.vim', {'do': g:make} - -"" Vim-Session -Plug 'xolox/vim-misc' -Plug 'xolox/vim-session' - -"" Snippets -Plug 'SirVer/ultisnips' -Plug 'honza/vim-snippets' - -"***************************************************************************** -"" Custom bundles -"***************************************************************************** - -" c -Plug 'vim-scripts/c.vim', {'for': ['c', 'cpp']} -Plug 'ludwig/split-manpage.vim' - - -" go -"" Go Lang Bundle -Plug 'fatih/vim-go', {'do': ':GoInstallBinaries'} - - -" html -"" HTML Bundle -Plug 'hail2u/vim-css3-syntax' -Plug 'gko/vim-coloresque' -Plug 'tpope/vim-haml' -Plug 'mattn/emmet-vim' - - -" javascript -"" Javascript Bundle -Plug 'jelera/vim-javascript-syntax' - - -" python -"" Python Bundle -Plug 'davidhalter/jedi-vim' -Plug 'raimon49/requirements.txt.vim', {'for': 'requirements'} - - -" typescript -Plug 'leafgarland/typescript-vim' -Plug 'HerringtonDarkholme/yats.vim' - - -"***************************************************************************** -"***************************************************************************** - -"" Include user's extra bundle -if filereadable(expand("~/.config/nvim/local_bundles.vim")) - source ~/.config/nvim/local_bundles.vim -endif - -call plug#end() - -" Required: -filetype plugin indent on - - -"***************************************************************************** -"" Basic Setup -"*****************************************************************************" -"" Encoding -set encoding=utf-8 -set fileencoding=utf-8 -set fileencodings=utf-8 - - -"" Fix backspace indent -set backspace=indent,eol,start - -"" Tabs. May be overridden by autocmd rules -set tabstop=4 -set softtabstop=0 -set shiftwidth=4 -set expandtab - -"" Map leader to , -let mapleader=',' - -"" Enable hidden buffers -set hidden - -"" Searching -set hlsearch -set incsearch -set ignorecase -set smartcase - -set fileformats=unix,dos,mac - -if exists('$SHELL') - set shell=$SHELL -else - set shell=/bin/sh -endif - -" session management -let g:session_directory = "~/.config/nvim/session" -let g:session_autoload = "no" -let g:session_autosave = "no" -let g:session_command_aliases = 1 - -"***************************************************************************** -"" Visual Settings -"***************************************************************************** -syntax on -set ruler -set number - -let no_buffers_menu=1 -colorscheme codedark - - -set mousemodel=popup -set t_Co=256 -set guioptions=egmrti -set gfn=Monospace\ 10 - -if has("gui_running") - if has("gui_mac") || has("gui_macvim") - set guifont=Menlo:h12 - set transparency=7 - endif -else - let g:CSApprox_loaded = 1 - - " IndentLine - let g:indentLine_enabled = 1 - let g:indentLine_concealcursor = 0 - let g:indentLine_char = '┆' - let g:indentLine_faster = 1 - - -endif - - - -"" Disable the blinking cursor. -set gcr=a:blinkon0 - -au TermEnter * setlocal scrolloff=0 -au TermLeave * setlocal scrolloff=3 - - -"" Status bar -set laststatus=2 - -"" Use modeline overrides -set modeline -set modelines=10 - -set title -set titleold="Terminal" -set titlestring=%F - -set statusline=%F%m%r%h%w%=(%{&ff}/%Y)\ (line\ %l\/%L,\ col\ %c)\ - -" Search mappings: These will make it so that going to the next one in a -" search will center on the line it's found in. -nnoremap n nzzzv -nnoremap N Nzzzv - -if exists("*fugitive#statusline") - set statusline+=%{fugitive#statusline()} -endif - -" vim-airline -let g:airline_theme = 'powerlineish' -let g:airline#extensions#branch#enabled = 1 -let g:airline#extensions#ale#enabled = 1 -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#tagbar#enabled = 1 -let g:airline_skip_empty_sections = 1 - -"***************************************************************************** -"" Abbreviations -"***************************************************************************** -"" no one is really happy until you have this shortcuts -cnoreabbrev W! w! -cnoreabbrev Q! q! -cnoreabbrev Qall! qall! -cnoreabbrev Wq wq -cnoreabbrev Wa wa -cnoreabbrev wQ wq -cnoreabbrev WQ wq -cnoreabbrev W w -cnoreabbrev Q q -cnoreabbrev Qall qall - -"" NERDTree configuration -let g:NERDTreeChDirMode=2 -let g:NERDTreeIgnore=['\.rbc$', '\~$', '\.pyc$', '\.db$', '\.sqlite$', '__pycache__'] -let g:NERDTreeSortOrder=['^__\.py$', '\/$', '*', '\.swp$', '\.bak$', '\~$'] -let g:NERDTreeShowBookmarks=1 -let g:nerdtree_tabs_focus_on_files=1 -let g:NERDTreeMapOpenInTabSilent = '' -let g:NERDTreeWinSize = 50 -set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.pyc,*.db,*.sqlite -nnoremap :NERDTreeFind -nnoremap :NERDTreeToggle - -" grep.vim -nnoremap f :Rgrep -let Grep_Default_Options = '-IR' -let Grep_Skip_Files = '*.log *.db' -let Grep_Skip_Dirs = '.git node_modules' - -" terminal emulation -nnoremap sh :terminal - - -"***************************************************************************** -"" Commands -"***************************************************************************** -" remove trailing whitespaces -command! FixWhitespace :%s/\s\+$//e - -"***************************************************************************** -"" Functions -"***************************************************************************** -if !exists('*s:setupWrapping') - function s:setupWrapping() - set wrap - set wm=2 - set textwidth=79 - endfunction -endif - -"***************************************************************************** -"" Autocmd Rules -"***************************************************************************** -"" The PC is fast enough, do syntax highlight syncing from start unless 200 lines -augroup vimrc-sync-fromstart - autocmd! - autocmd BufEnter * :syntax sync maxlines=200 -augroup END - -"" Remember cursor position -augroup vimrc-remember-cursor-position - autocmd! - autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif -augroup END - -"" txt -augroup vimrc-wrapping - autocmd! - autocmd BufRead,BufNewFile *.txt call s:setupWrapping() -augroup END - -"" make/cmake -augroup vimrc-make-cmake - autocmd! - autocmd FileType make setlocal noexpandtab - autocmd BufNewFile,BufRead CMakeLists.txt setlocal filetype=cmake -augroup END - -set autoread - -"***************************************************************************** -"" Mappings -"***************************************************************************** - -"" Split -noremap h :split -noremap v :vsplit - -"" Git -noremap ga :Gwrite -noremap gc :Gcommit -noremap gsh :Gpush -noremap gll :Gpull -noremap gs :Gstatus -noremap gb :Gblame -noremap gd :Gvdiff -noremap gr :Gremove - -" session management -nnoremap so :OpenSession -nnoremap ss :SaveSession -nnoremap sd :DeleteSession -nnoremap sc :CloseSession - -"" Tabs -nnoremap gt -nnoremap gT -nnoremap :tabnew - -"" Set working directory -nnoremap . :lcd %:p:h - -"" Opens an edit command with the path of the currently edited file filled in -noremap e :e =expand("%:p:h") . "/" - -"" Opens a tab edit command with the path of the currently edited file filled -noremap te :tabe =expand("%:p:h") . "/" - -"" fzf.vim -set wildmode=list:longest,list:full -set wildignore+=*.o,*.obj,.git,*.rbc,*.pyc,__pycache__ -let $FZF_DEFAULT_COMMAND = "find * -path '*/\.*' -prune -o -path 'node_modules/**' -prune -o -path 'target/**' -prune -o -path 'dist/**' -prune -o -type f -print -o -type l -print 2> /dev/null" - -" The Silver Searcher -if executable('ag') - let $FZF_DEFAULT_COMMAND = 'ag --hidden --ignore .git -g ""' - set grepprg=ag\ --nogroup\ --nocolor -endif - -" ripgrep -if executable('rg') - let $FZF_DEFAULT_COMMAND = 'rg --files --hidden --follow --glob "!.git/*"' - set grepprg=rg\ --vimgrep - command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --hidden --follow --glob "!.git/*" --color "always" '.shellescape().'| tr -d "\017"', 1, 0) -endif - -cnoremap =expand("%:p:h") . "/" -nnoremap b :Buffers -nnoremap e :FZF -m -"Recovery commands from history through FZF -nmap y :History: - -" snippets -let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger="" -let g:UltiSnipsJumpBackwardTrigger="" -let g:UltiSnipsEditSplit="vertical" - -" ale -let g:ale_linters = {} - -" Tagbar -nmap :TagbarToggle -let g:tagbar_autofocus = 1 - -" Disable visualbell -set noerrorbells visualbell t_vb= -if has('autocmd') - autocmd GUIEnter * set visualbell t_vb= -endif - -"" Copy/Paste/Cut -if has('unnamedplus') - set clipboard=unnamed,unnamedplus -endif - -noremap YY "+y -noremap p "+gP -noremap XX "+x - -if has('macunix') - " pbcopy for OSX copy/paste - vmap :!pbcopy - vmap :w !pbcopy -endif - -"" Buffer nav -noremap z :bp -noremap q :bp -noremap x :bn -noremap w :bn - -"" Close buffer -noremap c :bd - -"" Clean search (highlight) -nnoremap :noh - -"" Switching windows -noremap j -noremap k -noremap l -noremap h - -"" Vmap for maintain Visual Mode after shifting > and < -vmap < >gv - -"" Move visual block -vnoremap J :m '>+1gv=gv -vnoremap K :m '<-2gv=gv - -"" Open current line on GitHub -nnoremap o :.Gbrowse - -"***************************************************************************** -"" Custom configs -"***************************************************************************** - -" c -autocmd FileType c setlocal tabstop=4 shiftwidth=4 expandtab -autocmd FileType cpp setlocal tabstop=4 shiftwidth=4 expandtab - - -" go -" vim-go -" run :GoBuild or :GoTestCompile based on the go file -function! s:build_go_files() - let l:file = expand('%') - if l:file =~# '^\f\+_test\.go$' - call go#test#Test(0, 1) - elseif l:file =~# '^\f\+\.go$' - call go#cmd#Build(0) - endif -endfunction - -let g:go_list_type = "quickfix" -let g:go_fmt_command = "goimports" -let g:go_fmt_fail_silently = 1 - -let g:go_highlight_types = 1 -let g:go_highlight_fields = 1 -let g:go_highlight_functions = 1 -let g:go_highlight_methods = 1 -let g:go_highlight_operators = 1 -let g:go_highlight_build_constraints = 1 -let g:go_highlight_structs = 1 -let g:go_highlight_generate_tags = 1 -let g:go_highlight_space_tab_error = 0 -let g:go_highlight_array_whitespace_error = 0 -let g:go_highlight_trailing_whitespace_error = 0 -let g:go_highlight_extra_types = 1 - -autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 - -augroup completion_preview_close - autocmd! - if v:version > 703 || v:version == 703 && has('patch598') - autocmd CompleteDone * if !&previewwindow && &completeopt =~ 'preview' | silent! pclose | endif - endif -augroup END - -augroup go - - au! - au Filetype go command! -bang A call go#alternate#Switch(0, 'edit') - au Filetype go command! -bang AV call go#alternate#Switch(0, 'vsplit') - au Filetype go command! -bang AS call go#alternate#Switch(0, 'split') - au Filetype go command! -bang AT call go#alternate#Switch(0, 'tabe') - - au FileType go nmap dd (go-def-vertical) - au FileType go nmap dv (go-doc-vertical) - au FileType go nmap db (go-doc-browser) - - au FileType go nmap r (go-run) - au FileType go nmap t (go-test) - au FileType go nmap gt (go-coverage-toggle) - au FileType go nmap i (go-info) - au FileType go nmap l (go-metalinter) - au FileType go nmap :GoDecls - au FileType go nmap dr :GoDeclsDir - au FileType go imap :GoDecls - au FileType go imap dr :GoDeclsDir - au FileType go nmap rb :call build_go_files() - -augroup END - -" ale -:call extend(g:ale_linters, { - \"go": ['golint', 'go vet'], }) - - -" html -" for html files, 2 spaces -autocmd Filetype html setlocal ts=2 sw=2 expandtab - - -" javascript -let g:javascript_enable_domhtmlcss = 1 - -" vim-javascript -augroup vimrc-javascript - autocmd! - autocmd FileType javascript setl tabstop=4|setl shiftwidth=4|setl expandtab softtabstop=4 -augroup END - - -" python -" vim-python -augroup vimrc-python - autocmd! - autocmd FileType python setlocal expandtab shiftwidth=4 tabstop=8 colorcolumn=79 - \ formatoptions+=croq softtabstop=4 - \ cinwords=if,elif,else,for,while,try,except,finally,def,class,with -augroup END - -" jedi-vim -let g:jedi#popup_on_dot = 0 -let g:jedi#goto_assignments_command = "g" -let g:jedi#goto_definitions_command = "d" -let g:jedi#documentation_command = "K" -let g:jedi#usages_command = "n" -let g:jedi#rename_command = "r" -let g:jedi#show_call_signatures = "0" -let g:jedi#completions_command = "" -let g:jedi#smart_auto_mappings = 0 - -" ale -:call extend(g:ale_linters, { - \'python': ['flake8'], }) - -" vim-airline -let g:airline#extensions#virtualenv#enabled = 1 - -" Syntax highlight -let python_highlight_all = 1 - - -" typescript -let g:yats_host_keyword = 1 - - - -"***************************************************************************** -"***************************************************************************** - -"" Include user's local vim config -if filereadable(expand("~/.config/nvim/local_init.vim")) - source ~/.config/nvim/local_init.vim -endif - -"***************************************************************************** -"" Convenience variables -"***************************************************************************** - -" vim-airline -if !exists('g:airline_symbols') - let g:airline_symbols = {} -endif - -if !exists('g:airline_powerline_fonts') - let g:airline#extensions#tabline#left_sep = ' ' - let g:airline#extensions#tabline#left_alt_sep = '|' - let g:airline_left_sep = '▶' - let g:airline_left_alt_sep = '»' - let g:airline_right_sep = '◀' - let g:airline_right_alt_sep = '«' - let g:airline#extensions#branch#prefix = '⤴' "➔, ➥, ⎇ - let g:airline#extensions#readonly#symbol = '⊘' - let g:airline#extensions#linecolumn#prefix = '¶' - let g:airline#extensions#paste#symbol = 'ρ' - let g:airline_symbols.linenr = '␊' - let g:airline_symbols.branch = '⎇' - let g:airline_symbols.paste = 'ρ' - let g:airline_symbols.paste = 'Þ' - let g:airline_symbols.paste = '∥' - let g:airline_symbols.whitespace = 'Ξ' -else - let g:airline#extensions#tabline#left_sep = '' - let g:airline#extensions#tabline#left_alt_sep = '' - - " powerline symbols - let g:airline_left_sep = '' - let g:airline_left_alt_sep = '' - let g:airline_right_sep = '' - let g:airline_right_alt_sep = '' - let g:airline_symbols.branch = '' - let g:airline_symbols.readonly = '' - let g:airline_symbols.linenr = '' -endif +" _ _ __ _ +" (_)___ (_) /__ __(_)___ ___ +" / / __ \/ / __/ | / / / __ `__ \ +" / / / / / / /__| |/ / / / / / / / +" /_/_/ /_/_/\__(_)___/_/_/ /_/ /_/ +" +" ************************************************************* +" my neovim init.vim config file +" Russell R. Riker (aka: Dr. WaSaBi) +" ************************************************************* + +" First load all my plugins +source ~/.config/nvim/plugins-to-load.vim + +" Second, run any custom config files that my plugins need +source ~/.config/nvim/fzf-plugin-settings.vim + +" Lastly, after plugins have been setup, then do my basic +" customizing of nvim settings that I like. +source ~/.config/nvim/nvim-basic-settings.vim diff --git a/init.vim.bak b/init.vim.bak deleted file mode 100644 index 8619416..0000000 --- a/init.vim.bak +++ /dev/null @@ -1,20 +0,0 @@ -" _ _ __ _ -" (_)___ (_) /__ __(_)___ ___ -" / / __ \/ / __/ | / / / __ `__ \ -" / / / / / / /__| |/ / / / / / / / -" /_/_/ /_/_/\__(_)___/_/_/ /_/ /_/ -" -" ************************************************************* -" my neovim init.vim config file -" Russell R. Riker (aka: Dr. WaSaBi) -" ************************************************************* - -" First load all my plugins -source ~/.config/nvim/plugins-to-load.vim - -" Second, run any custom config files that my plugins need -source ~/.config/nvim/fzf-plugin-settings.vim - -" Lastly, after plugins have been setup, then do my basic -" customizing of nvim settings that I like. -source ~/.config/nvim/nvim-basic-settings.vim