diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json new file mode 100644 index 0000000..879c98e --- /dev/null +++ b/.config/coc/extensions/package.json @@ -0,0 +1,8 @@ +{ + "dependencies": { + "coc-json": ">=1.2.5", + "coc-python": ">=1.2.9", + "coc-snippets": ">=2.1.19", + "coc-ultisnips": "^1.2.3" + } +} \ No newline at end of file diff --git a/.gitconfig b/.gitconfig index b8ca019..b1629ff 100644 --- a/.gitconfig +++ b/.gitconfig @@ -39,4 +39,7 @@ enabled = true [url "git@github.com:"] - insteadOf = https://github.com/ + insteadOf = https://github.com + +[url "git@git.barakmich.com:"] + insteadOf = https://git.barakmich.com diff --git a/.tmux.conf b/.tmux.conf index 6cef0d0..a04b44b 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -42,20 +42,16 @@ set -g status-fg white set -g status-bg default # default window title colors -set-window-option -g window-status-fg white -set-window-option -g window-status-bg default -set-window-option -g window-status-attr dim +set-window-option -g window-status-style fg=white,bg=default,dim # active window title colors -set-window-option -g window-status-current-fg cyan -set-window-option -g window-status-current-bg default -set-window-option -g window-status-current-attr bright +set-window-option -g window-status-current-style fg=cyan,bg=default,bright set -g status-left '#[fg=green][ #H ][ ' -set -g status-right '#[fg=green]][ #[fg=blue]%Y-%m-%d #[fg=white]%I:%M #[fg=green]]' +set -g status-right '#[fg=green]][ #[bright]#[fg=blue]%Y-%m-%d #[fg=white]%I:%M #[dim]#[fg=green]]' # Notifying if other windows has activities setw -g monitor-activity on set -g visual-activity on # Highlighting the active window in status bar -setw -g window-status-current-bg red +setw -g window-status-current-style bg=red,bright diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json new file mode 100644 index 0000000..6b89f4f --- /dev/null +++ b/.vim/coc-settings.json @@ -0,0 +1,35 @@ +{ + "suggest.timeout": 5000, + "suggest.enablePreview": true, + "suggest.maxPreviewWidth": 70, + "diagnostic.displayByAle": false, + "python.linting.pylintEnabled": false, + "python.linting.flake8Enabled": true, + "python.linting.mypyEnabled": true, + "python.linting.mypyArgs": ["--ignore-missing-imports"], + "python.jediEnabled": true, + "python.autoComplete.addBrackets": false, + "suggest.detailField": "abbr", + "suggest.snippetIndicator": "", + "languageserver": { + "ccls": { + "command": "ccls", + "filetypes": ["c", "cc", "cpp", "cuda", "objc", "objcpp"], + "rootPatterns": [".ccls", "compile_commands.json", ".vim/", ".git/", ".hg/"], + "initializationOptions": { + "cache": { + "directory": ".ccls-cache" + } + } + }, + "golang": { + "command": "gopls", + "rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"], + "filetypes": ["go"] + } +}, +"python.autoComplete.extraPaths": [ + "${env:SPARK_HOME}/python", + "${env:SPARK_HOME}/python/pyspark" +] +} diff --git a/.vim/colors/baraknew.vim b/.vim/colors/baraknew.vim index 03df230..49d17c4 100644 --- a/.vim/colors/baraknew.vim +++ b/.vim/colors/baraknew.vim @@ -287,13 +287,13 @@ hi WildMenu ctermfg=16 ctermbg=186 cterm=bold " ---- " added line hi DiffAdd guifg=#80a090 guibg=#313c36 gui=none -hi DiffAdd ctermfg=18 ctermbg=22 cterm=none +hi DiffAdd ctermfg=fg ctermbg=22 cterm=none " changed line hi DiffChange guifg=NONE guibg=#4a343a gui=none -hi DiffChange ctermfg=fg ctermbg=52 cterm=none +hi DiffChange ctermfg=fg ctermbg=58 cterm=none " deleted line hi DiffDelete guifg=#6c6661 guibg=#3c3631 gui=none -hi DiffDelete ctermfg=59 ctermbg=58 cterm=none +hi DiffDelete ctermfg=fg ctermbg=52 cterm=none " changed text within line hi DiffText guifg=#f05060 guibg=#4a343a gui=bold hi DiffText ctermfg=203 ctermbg=52 cterm=bold @@ -322,11 +322,13 @@ hi Search ctermbg=214 cterm=none " Popup Menu " ---------- " normal item in popup +"hi Pmenu guifg=#e0e0e0 guibg=#303840 gui=none +"hi Pmenu ctermfg=253 ctermbg=233 cterm=none hi Pmenu guifg=#e0e0e0 guibg=#303840 gui=none -hi Pmenu ctermfg=253 ctermbg=233 cterm=none +hi Pmenu ctermfg=253 ctermbg=237 cterm=none " selected item in popup hi PmenuSel guifg=#cae682 guibg=#505860 gui=none -hi PmenuSel ctermfg=186 ctermbg=237 cterm=none +hi PmenuSel ctermfg=186 ctermbg=239 cterm=none " scrollbar in popup hi PMenuSbar guibg=#505860 gui=none hi PMenuSbar ctermbg=59 cterm=none @@ -419,3 +421,14 @@ hi DONE guifg=green guibg=NONE ctermfg=green ctermbg=NONE " hi deniteMatchedChar guifg=#FFFFFF guibg=#5F87FF ctermfg=15 ctermbg=27 +hi link NormalFloat Pmenu + + +" Vim-Signify +" ---- +hi SignifySignAdd guifg=#80a090 guibg=#181818 gui=none +hi SignifySignAdd ctermfg=29 ctermbg=233 cterm=none +hi SignifySignChange guifg=#4a343a guibg=#181818 gui=none +hi SignifySignChange ctermfg=100 ctermbg=233 cterm=none +hi SignifySignDelete guifg=#6c6661 guibg=#181818 gui=none +hi SignifySignDelete ctermfg=124 ctermbg=233 cterm=none diff --git a/.vimrc b/.vimrc index 7a6fbe6..2bb4295 100644 --- a/.vimrc +++ b/.vimrc @@ -117,8 +117,9 @@ Plug 'bps/vim-textobj-python' " Plugins I NEED Plug 'scrooloose/nerdcommenter' Plug 'sjbach/lusty' -Plug 'w0rp/ale' -Plug 'airblade/vim-gitgutter' +"Plug 'w0rp/ale' +"Plug 'airblade/vim-gitgutter' +Plug 'mhinz/vim-signify' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'junegunn/fzf' @@ -161,19 +162,20 @@ Plug 'derekwyatt/vim-scala', {'for': 'scala'} Plug 'hwayne/tla.vim' " Plugins that autocomplete -Plug 'Shougo/deoplete.nvim' -Plug 'zchee/deoplete-clang' -Plug 'zchee/deoplete-go', {'build': {'unix': 'make'}} -Plug 'zchee/deoplete-jedi' -Plug 'davidhalter/jedi-vim' -Plug 'eagletmt/neco-ghc', {'for': 'haskell'} -Plug 'eagletmt/ghcmod-vim', {'for': 'haskell'} -Plug 'racer-rust/vim-racer', {'for': 'rust'} -Plug 'autozimu/LanguageClient-neovim', { - \ 'branch': 'next', - \ 'do': 'bash install.sh', - \ } +"Plug 'Shougo/deoplete.nvim' +"Plug 'zchee/deoplete-clang' +"Plug 'zchee/deoplete-go', {'build': {'unix': 'make'}} +"Plug 'zchee/deoplete-jedi' +"Plug 'davidhalter/jedi-vim' +"Plug 'eagletmt/neco-ghc', {'for': 'haskell'} +"Plug 'eagletmt/ghcmod-vim', {'for': 'haskell'} +"Plug 'racer-rust/vim-racer', {'for': 'rust'} +"Plug 'autozimu/LanguageClient-neovim', { + "\ 'branch': 'next', + "\ 'do': 'bash install.sh', + "\ } "Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' } +Plug 'neoclide/coc.nvim', {'tag': '*', 'do': './install.sh'} " Plugins that do specific things Plug 'Shougo/vimproc.vim' @@ -191,6 +193,21 @@ Plug 'ncm2/float-preview.nvim' call plug#end() +nmap gd (coc-definition) +nmap gy (coc-type-definition) +nmap gi (coc-implementation) +nmap gr (coc-references) + +" Use K to show documentation in preview window +nnoremap K :call show_documentation() + +function! s:show_documentation() + if (index(['vim','help'], &filetype) >= 0) + execute 'h '.expand('') + else + call CocAction('doHover') + endif +endfunction "NeoBundle 'eclim' "https://git.wincent.com/command-t.git @@ -247,17 +264,17 @@ setlocal cursorline " ** PLUGIN CONFIGURATION ** " " Change the source rank -call deoplete#custom#option('sources', { - \ 'python': ['LanguageClient', 'jedi'], - \}) -call deoplete#custom#source('buffer', 'rank', 1) -let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-6.0/lib/libclang.so' -let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-6.0/lib/clang' -let g:deoplete#enable_at_startup = 1 -let g:deoplete#sources = {} -let g:deoplete#sources.scala = ['buffer', 'tags', 'omni'] -let g:deoplete#omni#input_patterns = {} -let g:deoplete#omni#input_patterns.scala = ['[^. *\t0-9]\.\w*',': [A-Z]\w', '[\[\t\( ][A-Za-z]\w*'] +"call deoplete#custom#option('sources', { + "\ 'python': ['LanguageClient', 'jedi'], + "\}) +"call deoplete#custom#source('buffer', 'rank', 1) +"let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-6.0/lib/libclang.so' +"let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-6.0/lib/clang' +"let g:deoplete#enable_at_startup = 1 +"let g:deoplete#sources = {} +"let g:deoplete#sources.scala = ['buffer', 'tags', 'omni'] +"let g:deoplete#omni#input_patterns = {} +"let g:deoplete#omni#input_patterns.scala = ['[^. *\t0-9]\.\w*',': [A-Z]\w', '[\[\t\( ][A-Za-z]\w*'] " * Vim general/Unknown let python_highlight_all = 1 let g:Tb_MaxSize=0 @@ -327,6 +344,13 @@ let g:NERDTreeDirArrows=0 let g:NERDTreeMarkBookmarks = 0 let g:NERDTreeMinimalUI = 1 +" * Signify +let g:signify_realtime = 0 +let g:signify_vcs_list = ['git'] +let g:signify_sign_change = '~' +let g:signify_sign_changedelete = g:signify_sign_change +let g:signify_sign_show_count = 0 + " * VimFiler let g:vimfiler_tree_indentation = 2 @@ -436,11 +460,11 @@ let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:15' let g:go_fmt_command = "goimports" "let g:go_auto_type_info = 1 let g:go_updatetime = 300 -"let g:go_bin_path = "$HOME/.go/bin" - +let g:go_bin_path = $HOME . "/.go/bin" +"let g:go_def_mode = 'gopls' +"let g:go_info_mode = 'gopls' " ** STATUSLINE ** -" set laststatus=2 set statusline=%t "tail of the filename "set statusline+=[%{&ff}] "file format diff --git a/.zshrc b/.zshrc index f941bb1..0feda2a 100644 --- a/.zshrc +++ b/.zshrc @@ -86,14 +86,8 @@ fi if [ -f /usr/local/bin/virtualenvwrapper_lazy.sh ]; then source /usr/local/bin/virtualenvwrapper_lazy.sh -else - if [ -f /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh ]; then - source /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh - fi fi - - fasd_cache="$HOME/.fasd-init-zsh" if [ "$(command -v fasd)" -nt "$fasd_cache" -o ! -s "$fasd_cache" ]; then fasd --init posix-alias zsh-hook zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcompinstall >| "$fasd_cache" @@ -142,3 +136,5 @@ if [ -f '/home/barak/local/google-cloud-sdk/completion.zsh.inc' ]; then source ' if [ $commands[kubectl] ]; then source <(kubectl completion zsh) fi + +export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"