Skip to content

Commit

Permalink
Update dotflies
Browse files Browse the repository at this point in the history
  • Loading branch information
slme9364 committed Dec 2, 2020
1 parent 917de5a commit dc0e46e
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 31 deletions.
24 changes: 9 additions & 15 deletions tmux/.tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 21 additions & 1 deletion vim/nvim/dein.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
'''
7 changes: 6 additions & 1 deletion vim/nvim/init.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"set clipboard=autoselect
set clipboard+=unnamed
set clipboard=unnamedplus
set splitright

"mouse can use
set mouse=a
Expand Down Expand Up @@ -85,7 +86,10 @@ nnoremap sk <C-w>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
Expand Down Expand Up @@ -125,3 +129,4 @@ syntax on

filetype plugin indent on


13 changes: 13 additions & 0 deletions vim/nvim/plugins/coc-nvim.rc.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
" Use `[g` and `]g` to navigate diagnostics
" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
nmap <silent> [g <Plug>(coc-diagnostic-prev)
nmap <silent> ]g <Plug>(coc-diagnostic-next)
" GoTo code navigation.
nmap <silent> gd <Plug>(coc-definition)
nmap <silent> gy <Plug>(coc-type-definition)
nmap <silent> gi <Plug>(coc-implementation)
nmap <silent> gr <Plug>(coc-references)
" Use K to show documentation in preview window.
nnoremap <silent> K :call <SID>show_documentation()<CR>
2 changes: 1 addition & 1 deletion vim/nvim/plugins/defx.rc.vim
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ function! s:defx_my_settings() abort
nnoremap <silent><buffer><expr> 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'
2 changes: 1 addition & 1 deletion vim/nvim/plugins/deoplete.rc.vim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let g:deoplete#enable_at_startup = 1
"let g:deoplete#enable_at_startup = 1
"inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
"call deoplete#custom#option('complete_method', 'omnifunc')
inoremap <expr><tab> pumvisible() ? "\<C-n>" :"\<tab>"
2 changes: 1 addition & 1 deletion vim/nvim/plugins/neosnippet.rc.vim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let g:neosnippet#snippets_directory='~/.vim/bundle/neosnippet-snippets/snippets/'
let g:neosnippet#snippets_directory='~/.vim/neosnippet-snippets/snippets/'
imap <C-k> <Plug>(neosnippet_expand_or_jump)
smap <C-k> <Plug>(neosnippet_expand_or_jump)
xmap <C-k> <Plug>(neosnippet_expand_target)
Expand Down
1 change: 0 additions & 1 deletion vim/nvim/plugins/previm.rc.vim
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
let g:previm_open_cmd = 'startwinpath.sh'
let g:previm_enabled_realtime=1
41 changes: 31 additions & 10 deletions zsh/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..
Expand Down Expand Up @@ -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*)
Expand All @@ -106,7 +104,6 @@ zshaddhistory() {
&& ${cmd} != (tmux-sb|tmux-lb)
]]
}

##zplug

#When you don't have zplug, you install'
Expand All @@ -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.
Expand All @@ -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

0 comments on commit dc0e46e

Please sign in to comment.