diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 76d3d84..ab2516f 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -46,31 +46,25 @@ setw -g mouse on set -g default-terminal "screen-256color" # status line color settings -set -g status-fg white -set -g status-bg black +set -g status-style fg=white,bg=black # window list color settings -setw -g window-status-fg cyan -setw -g window-status-bg default -setw -g window-status-attr dim +setw -g window-status-style fg=cyan,bg=default,dim # stand out active window -setw -g window-status-current-fg white -setw -g window-status-current-bg red -setw -g window-status-current-attr bright +setw -g window-status-current-style fg=white,bg=red,bright # stand out pain board -set -g pane-border-fg green -set -g pane-border-bg black +set -g pane-border-style fg=green,bg=black # stand out active pain -set -g pane-active-border-fg white -set -g pane-active-border-bg yellow +set -g pane-active-border-style fg=white,bg=yellow # command line color settings -set -g message-fg white -set -g message-bg black -set -g message-attr bright +set -g message-style fg=white,bg=black,bright + +# default command +set -g default-command "${SHELL}" # status line settings ## left panel settings diff --git a/vim/nvim/dein.toml b/vim/nvim/dein.toml index 6236aa4..aea04f7 100644 --- a/vim/nvim/dein.toml +++ b/vim/nvim/dein.toml @@ -3,7 +3,18 @@ repo = 'Shougo/dein.vim' [[plugins]] repo = 'Shougo/vimproc' -build = 'make' +hook_post_update = ''' + if has('win32') + let cmd = 'tools\\update-dll-mingw' + elseif has('win32unix') " for Cygwin + let cmd = 'make -f make_cygwin.mak' + elseif executable('gmake') + let cmd = 'gmake' + else + let cmd = 'make' + endif + let g:dein#plugin.build = cmd +''' [[plugins]] repo = 'Shougo/deoplete.nvim' @@ -89,3 +100,12 @@ rev = 'release' on_i = 1 merged = '0' hook_source = 'call coil398#init#coc#hook_source()' +hook_add = ''' +source ~/.config/nvim/plugins/coc-nvim.rc.vim +''' + +[[plugins]] +repo = 'fatih/vim-go' +hook_add = ''' +source ~/.config/nvim/plugins/vim-go.rc.vim +''' diff --git a/vim/nvim/init.vim b/vim/nvim/init.vim index b6bceef..616a6df 100644 --- a/vim/nvim/init.vim +++ b/vim/nvim/init.vim @@ -2,6 +2,7 @@ "set clipboard=autoselect set clipboard+=unnamed set clipboard=unnamedplus +set splitright "mouse can use set mouse=a @@ -85,7 +86,10 @@ nnoremap sk k "can use 256 color set t_Co=256 -let g:python3_host_prog = expand('/usr/bin/python3') +let g:python_host_prog = expand('/usr/bin/python') +let g:python3_host_prog = expand('/usr/local/bin/python3') +let g:ruby_host_prog = '/usr/local/bin/neovim-ruby-host' +let g:node_host_prog = '/usr/local/bin/neovim-node-host' "dein Scripts----------------------------- if &compatible @@ -125,3 +129,4 @@ syntax on filetype plugin indent on + diff --git a/vim/nvim/plugins/coc-nvim.rc.vim b/vim/nvim/plugins/coc-nvim.rc.vim new file mode 100644 index 0000000..944c9c3 --- /dev/null +++ b/vim/nvim/plugins/coc-nvim.rc.vim @@ -0,0 +1,13 @@ +" Use `[g` and `]g` to navigate diagnostics +" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. +nmap [g (coc-diagnostic-prev) +nmap ]g (coc-diagnostic-next) + +" GoTo code navigation. +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() diff --git a/vim/nvim/plugins/defx.rc.vim b/vim/nvim/plugins/defx.rc.vim index 9d21d3b..050cf97 100644 --- a/vim/nvim/plugins/defx.rc.vim +++ b/vim/nvim/plugins/defx.rc.vim @@ -51,4 +51,4 @@ function! s:defx_my_settings() abort nnoremap cd \ defx#do_action('change_vim_cwd') endfunction -autocmd VimEnter * execute 'Defx -show-ignored-files -split=vertical -winwidth=50 -direction=topleft' +autocmd VimEnter * execute 'Defx -show-ignored-files -split=vertical -winwidth=40 -direction=topleft' diff --git a/vim/nvim/plugins/deoplete.rc.vim b/vim/nvim/plugins/deoplete.rc.vim index e156a72..aea4ee6 100644 --- a/vim/nvim/plugins/deoplete.rc.vim +++ b/vim/nvim/plugins/deoplete.rc.vim @@ -1,4 +1,4 @@ -let g:deoplete#enable_at_startup = 1 +"let g:deoplete#enable_at_startup = 1 "inoremap pumvisible() ? "\" : "\" "call deoplete#custom#option('complete_method', 'omnifunc') inoremap pumvisible() ? "\" :"\" diff --git a/vim/nvim/plugins/neosnippet.rc.vim b/vim/nvim/plugins/neosnippet.rc.vim index 19b3f39..dd01427 100644 --- a/vim/nvim/plugins/neosnippet.rc.vim +++ b/vim/nvim/plugins/neosnippet.rc.vim @@ -1,4 +1,4 @@ -let g:neosnippet#snippets_directory='~/.vim/bundle/neosnippet-snippets/snippets/' +let g:neosnippet#snippets_directory='~/.vim/neosnippet-snippets/snippets/' imap (neosnippet_expand_or_jump) smap (neosnippet_expand_or_jump) xmap (neosnippet_expand_target) diff --git a/vim/nvim/plugins/previm.rc.vim b/vim/nvim/plugins/previm.rc.vim index 525b0d9..4abc4d8 100644 --- a/vim/nvim/plugins/previm.rc.vim +++ b/vim/nvim/plugins/previm.rc.vim @@ -1,2 +1 @@ -let g:previm_open_cmd = 'startwinpath.sh' let g:previm_enabled_realtime=1 diff --git a/zsh/.zshrc b/zsh/.zshrc index 78fbdbe..3393caf 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -42,7 +42,6 @@ zstyle ':zle:*' word-style unspecified #zsh_completion autoload -Uz compinit -compinit zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z} r:|[-_.]=**' zstyle ':completion:*' ignore-parents parent pwd .. @@ -76,13 +75,12 @@ alias mkdir='mkdir -p' alias sudo='sudo ' alias -g L='| less' alias -g G='| grep' -alias pbcopy='xsel --input --clipboard' -alias pbpaste='xsel --output --clipboard' -alias g++='g++ -std=c++14 -pthread' -alias fuzzy-killer="ps axh -F | fzf | awk '{print \$2}' | xargs kill" +alias t='type' +alias fuzzy-killer="ps axh | fzf | awk '{print \$2}' | xargs kill" alias tmux-sb='tmux save-buffer - | pbcopy' alias tmux-lb='pbpaste | tmux load-buffer -' -alias noc="cat ~/.zsh_history | awk '{print \$1}' | sort | uniq -c | sort -rn | head -3" +alias vim='/usr/local/bin/nvim' +alias vi='/usr/bin/vim' case ${OSTYPE} in darwin*) @@ -106,7 +104,6 @@ zshaddhistory() { && ${cmd} != (tmux-sb|tmux-lb) ]] } - ##zplug #When you don't have zplug, you install' @@ -118,12 +115,11 @@ source ~/.zplug/init.zsh #Define plugins zplug 'zsh-users/zsh-autosuggestions' -zplug 'zsh-users/zsh-completions' -zplug 'felixr/docker-zsh-completion' +zplug 'zsh-users/zsh-completions', lazy:true +zplug 'felixr/docker-zsh-completion', lazy:true zplug 'junegunn/fzf-bin', as:command, from:gh-r, rename-to:fzf zplug 'junegunn/fzf', as:command, use:bin/fzf-tmux zplug 'b4b4r07/enhancd', use:init.sh -zplug 'k4rthik/git-cal', as:command zplug 'zsh-users/zsh-syntax-highlighting', defer:3 #If Not installed plugins exist, you installed there. @@ -138,4 +134,29 @@ zplug load if [ ~/.zshrc -nt ~/.zshrc.zwc ]; then zcompile ~/.zshrc + fi + export NVM_DIR="$HOME/.nvm" + +nvm() { + unset -f nvm + + source "$NVM_DIR/nvm.sh" + + nvm "$@" +} + +rbenv() { + unfunction "$0" + eval "$(rbenv init -)" + $0 "$@" +} + +goenv() { + unfunction "$0" + eval "$(goenv init -)" + $0 $@ +} + +if (type zprof > /dev/null 2>&1) ;then + zprof > ~/.zprof.log fi