From 808a523a46a808056fb15d2afaad25568f2f39f6 Mon Sep 17 00:00:00 2001 From: Josh Fabean Date: Fri, 24 Feb 2017 16:04:34 -0600 Subject: [PATCH] lots of updates --- .nvimrc | 80 ++++++++++++++++++++++++-------------------- .profile | 5 ++- .tmux.conf | 3 ++ .tmux.powerline.conf | 50 +++++++++++++-------------- .zshrc | 7 ++-- 5 files changed, 80 insertions(+), 65 deletions(-) diff --git a/.nvimrc b/.nvimrc index 28d4e57..9525516 100644 --- a/.nvimrc +++ b/.nvimrc @@ -7,7 +7,7 @@ endif call plug#begin() " Plugins -Plug 'scrooloose/syntastic' +" Plug 'vim-lumiliet/vim-twigsyntastic/syntastic' Plug 'blueshirts/darcula' Plug 'ctrlpvim/ctrlp.vim' Plug 'FelikZ/ctrlp-py-matcher' @@ -20,13 +20,14 @@ Plug 'editorconfig/editorconfig-vim' "Plug 'Valloric/YouCompleteMe', { 'do': './install.py' } Plug 'mhinz/vim-grepper' Plug 'tomtom/tcomment_vim' +Plug 'lumiliet/vim-twig' +Plug 'roxma/nvim-completion-manager' " Colorschemes Plug 'whatyouhide/vim-gotham' Plug 'flazz/vim-colorschemes' " Syntax Checking -Plug 'scrooloose/syntastic' Plug 'neomake/neomake', { 'on': 'Neomake' } "HTML & CSS @@ -49,19 +50,15 @@ Plug 'posva/vim-vue' Plug 'SirVer/ultisnips' Plug 'honza/vim-snippets' Plug 'ternjs/tern_for_vim', { 'for': ['javascript', 'javascript.jsx'] } -Plug 'carlitux/deoplete-ternjs', { 'for': ['javascript', 'javascript.jsx'] } +" Plug 'carlitux/deoplete-ternjs', { 'for': ['javascript', 'javascript.jsx'] } Plug 'othree/jspc.vim', { 'for': ['javascript', 'javascript.jsx'] } "PHP Plug 'tanarurkerem/drupal-snippets' Plug 'jaredly/vim-debug' -Plug 'padawan-php/deoplete-padawan' -Plug 'shawncplus/phpcomplete.vim' - +Plug 'roxma/nvim-cm-php-language-server', {'do': 'composer install && composer run-script parse-stubs'} " Python Plugins -Plug 'zchee/deoplete-jedi' -"Stupid Coffee Script Because dummies -Plug 'kchmck/vim-coffee-script' +" Plug 'zchee/deoplete-jedi' "Git plugin Plug 'tpope/vim-fugitive' @@ -79,7 +76,7 @@ let g:vim_markdown_folding_disabled = 1 function! DoRemote(arg) UpdateRemotePlugins endfunction -Plug 'Shougo/deoplete.nvim', { 'do': function('DoRemote') } +" Plug 'Shougo/deoplete.nvim', { 'do': function('DoRemote') } call plug#end() let g:airline#extensions#tabline#enabled = 1 @@ -117,39 +114,38 @@ set relativenumber set list listchars=tab:»·,trail:·,nbsp:· set termguicolors -let g:airline_theme="gotham" +let g:airline_theme="gotham" "add .p8 as lua for pico-8 au BufNewFile,BufRead *.p8 set filetype=lua "deoplete stuff -let g:deoplete#enable_at_startup = 1 -let g:deoplete#enable_ignore_case = 1 -let g:deoplete#enable_smart_case = 1 -let g:deoplete#enable_camel_case = 1 -let g:deoplete#enable_refresh_always = 1 -let g:deoplete#max_abbr_width = 0 -let g:deoplete#max_menu_width = 0 -let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{}) -let g:deoplete#omni#input_patterns.java = [ - \'[^. \t0-9]\.\w*', - \'[^. \t0-9]\->\w*', - \'[^. \t0-9]\::\w*', - \] -let g:deoplete#omni#input_patterns.jsp = ['[^. \t0-9]\.\w*'] +" let g:deoplete#enable_at_startup = 1 +" let g:deoplete#enable_ignore_case = 1 +" let g:deoplete#enable_smart_case = 1 +" let g:deoplete#enable_camel_case = 1 +" let g:deoplete#enable_refresh_always = 1 +" let g:deoplete#max_abbr_width = 0 +" let g:deoplete#max_menu_width = 0 +" let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{}) +" let g:deoplete#omni#input_patterns.java = [ + " \'[^. \t0-9]\.\w*', + " \'[^. \t0-9]\->\w*', + " \'[^. \t0-9]\::\w*', + " \] +" let g:deoplete#omni#input_patterns.jsp = ['[^. \t0-9]\.\w*'] " let g:deoplete#omni#input_patterns.php = '\h\w*\|[^. \t]->\%(\h\w*\)\?\|\h\w*::\%(\h\w*\)\?' -let g:deoplete#ignore_sources = {} -let g:deoplete#ignore_sources.java = ['omni'] -let g:deoplete#omni#functions = {} -let g:deoplete#omni#functions.javascript = [ - \ 'tern#Complete', - \] -let g:deoplete#omni#input_patterns.javascript = '[^. \t]\.\w*' -call deoplete#custom#set('javacomplete2', 'mark', '') -call deoplete#custom#set('_', 'matchers', ['matcher_full_fuzzy']) +" let g:deoplete#ignore_sources = {} +" let g:deoplete#ignore_sources.java = ['omni'] +" let g:deoplete#omni#functions = {} +" let g:deoplete#omni#functions.javascript = [ + " \ 'tern#Complete', + " \] +" let g:deoplete#omni#input_patterns.javascript = '[^. \t]\.\w*' +" call deoplete#custom#set('javacomplete2', 'mark', '') +" call deoplete#custom#set('_', 'matchers', ['matcher_full_fuzzy']) "call deoplete#custom#set('omni', 'min_pattern_length', 0) -inoremap deoplete#mappings#smart_close_popup()."\" -inoremap deoplete#mappings#smart_close_popup()."\" -call deoplete#sources#padawan#RestartServer() +" inoremap deoplete#mappings#smart_close_popup()."\" +" inoremap deoplete#mappings#smart_close_popup()."\" "Nertree Toggle map :NERDTreeToggle let NERDTreeShowHidden=1 @@ -171,3 +167,13 @@ nnoremap :g#\({\n\)\@<=#.,/\.*[{}]\@=/-1 sort "Make TComment work as I expect noremap / :TComment vmap / :TCommentBlock + +"Syntastic default settings +set statusline+=%#warningmsg# +set statusline+=%{SyntasticStatuslineFlag()} +set statusline+=%* + +" let g:syntastic_always_populate_loc_list = 1 +" let g:syntastic_auto_loc_list = 1 +" let g:syntastic_check_on_open = 1 +" let g:syntastic_check_on_wq = 0 diff --git a/.profile b/.profile index fc09e68..7a5f4e6 100644 --- a/.profile +++ b/.profile @@ -108,6 +108,9 @@ ddrush() { dlogin() { docker exec -ti $1 /bin/bash } +# I keep typing the R so why not +alias docker-composer='docker-compose' + #todo.sh alias todo='todo.sh' @@ -130,7 +133,7 @@ alias themedebug='drush vset theme_debug 1' alias pico8='/Applications/PICO-8.app/Contents/MacOS/pico8' # my path -export PATH="/usr/local/bin:/usr/local/sbin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:/Users/joshfabean/Development/android/sdk/tools:/Users/joshfabean/Development/android/sdk/platform-tools:/Users/joshfabean/.composer/vendor/bin:$PATH" +export PATH="/usr/local/bin/php:/usr/local/bin:/usr/local/sbin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:/Users/joshfabean/Development/android/sdk/tools:/Users/joshfabean/Development/android/sdk/platform-tools:/Users/joshfabean/.composer/vendor/bin:$PATH" export NVM_DIR="/Users/joshfabean/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm diff --git a/.tmux.conf b/.tmux.conf index d905fbf..35f15f6 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -80,8 +80,11 @@ set -g @plugin 'tmux-plugins/tmux-battery' set -g @plugin 'tmux-plugins/tmux-yank' set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-copycat' +set -g @plugin 'jimeh/tmux-themepack set -g @shell_mode 'vi' +# theme +set -g @themepack 'block/blue' source ~/.tmux.powerline.conf run '~/.tmux/plugins/tpm/tpm' diff --git a/.tmux.powerline.conf b/.tmux.powerline.conf index d199eb6..fc111ad 100644 --- a/.tmux.powerline.conf +++ b/.tmux.powerline.conf @@ -1,28 +1,28 @@ # This tmux statusbar config was created by tmuxline.vim # on Tue, 02 Feb 2016 -set -g status-bg "colour8" -set -g message-command-fg "colour14" -set -g status-justify "left" -set -g status-left-length "100" -set -g status "on" -set -g pane-active-border-fg "colour11" -set -g message-bg "colour10" -set -g status-right-length "100" -set -g status-right-attr "none" -set -g message-fg "colour14" -set -g message-command-bg "colour10" -set -g status-attr "none" -set -g pane-border-fg "colour10" -set -g status-left-attr "none" -setw -g window-status-fg "colour11" -setw -g window-status-attr "none" -setw -g window-status-activity-bg "colour8" -setw -g window-status-activity-attr "none" -setw -g window-status-activity-fg "colour11" -setw -g window-status-separator "" -setw -g window-status-bg "colour8" -set -g status-left "#[fg=colour15,bg=colour11] #S #[fg=colour11,bg=colour8,nobold,nounderscore,noitalics]" -set -g status-right "#[fg=colour10,bg=colour8,nobold,nounderscore,noitalics]#[fg=colour14,bg=colour10]#{battery_icon} #{battery_percentage} #{battery_remain}  #[fg=colour14,bg=colour10] %m-%d-%Y  %l:%M #[fg=colour11,bg=colour10,nobold,nounderscore,noitalics]#[fg=colour15,bg=colour11] #h " -setw -g window-status-format "#[fg=colour11,bg=colour8] #I #[fg=colour11,bg=colour8] #W " -setw -g window-status-current-format "#[fg=colour8,bg=colour10,nobold,nounderscore,noitalics]#[fg=colour14,bg=colour10] #I #[fg=colour14,bg=colour10] #W #[fg=colour10,bg=colour8,nobold,nounderscore,noitalics]" +# set -g status-bg "colour8" +# set -g message-command-fg "colour14" +# set -g status-justify "left" +# set -g status-left-length "100" +# set -g status "on" +# set -g pane-active-border-fg "colour11" +# set -g message-bg "colour10" +# set -g status-right-length "100" +# set -g status-right-attr "none" +# set -g message-fg "colour14" +# set -g message-command-bg "colour10" +# set -g status-attr "none" +# set -g pane-border-fg "colour10" +# set -g status-left-attr "none" +# setw -g window-status-fg "colour11" +# setw -g window-status-attr "none" +# setw -g window-status-activity-bg "colour8" +# setw -g window-status-activity-attr "none" +# setw -g window-status-activity-fg "colour11" +# setw -g window-status-separator "" +# setw -g window-status-bg "colour8" +# set -g status-left "#[fg=colour15,bg=colour11] #S #[fg=colour11,bg=colour8,nobold,nounderscore,noitalics]" +# set -g status-right "#[fg=colour10,bg=colour8,nobold,nounderscore,noitalics]#[fg=colour14,bg=colour10]#{battery_icon} #{battery_percentage} #{battery_remain}  #[fg=colour14,bg=colour10] %m-%d-%Y  %l:%M #[fg=colour11,bg=colour10,nobold,nounderscore,noitalics]#[fg=colour15,bg=colour11] #h " +# setw -g window-status-format "#[fg=colour11,bg=colour8] #I #[fg=colour11,bg=colour8] #W " +# setw -g window-status-current-format "#[fg=colour8,bg=colour10,nobold,nounderscore,noitalics]#[fg=colour14,bg=colour10] #I #[fg=colour14,bg=colour10] #W #[fg=colour10,bg=colour8,nobold,nounderscore,noitalics]" diff --git a/.zshrc b/.zshrc index fffef05..09e2db9 100644 --- a/.zshrc +++ b/.zshrc @@ -2,7 +2,7 @@ source ~/.profile # Path to your oh-my-zsh installation. export ZSH=/Users/joshfabean/.oh-my-zsh - +export EDITOR=vim # Set name of the theme to load. # Look in ~/.oh-my-zsh/themes/ # Path to your oh-my-zsh installation. @@ -12,7 +12,8 @@ export ZSH=/Users/joshfabean/.oh-my-zsh # Look in ~/.oh-my-zsh/themes/ # Optionally, if you set this to "random", it'll load a random theme each # time that oh-my-zsh is loaded. -ZSH_THEME="agnoster" +#ZSH_THEME="agnoster" +ZSH_THEME="avit" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -65,6 +66,8 @@ export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" source $ZSH/oh-my-zsh.sh +source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh + # You may need to manually set your language environment # export LANG=en_US.UTF-8