From f42fc0b527068192f87c36abf9354b8dff99d10e Mon Sep 17 00:00:00 2001 From: Homan Date: Sun, 25 May 2014 01:49:08 +0800 Subject: [PATCH 1/9] golang --- vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/vimrc b/vimrc index 2879867..83b59a8 100644 --- a/vimrc +++ b/vimrc @@ -16,6 +16,7 @@ Plugin 'mileszs/ack.vim' Plugin 'altercation/vim-colors-solarized' Plugin 'L9' Plugin 'vim-scripts/gitignore' +Plugin 'fatih/vim-go' " All of your Plugins must be added before the following line call vundle#end() " required From bceb2f95891e470f5e07a1a344001b72264f5696 Mon Sep 17 00:00:00 2001 From: Homan Date: Fri, 27 Jun 2014 22:33:30 +0800 Subject: [PATCH 2/9] Add endwise --- vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/vimrc b/vimrc index 83b59a8..6924dd2 100644 --- a/vimrc +++ b/vimrc @@ -17,6 +17,7 @@ Plugin 'altercation/vim-colors-solarized' Plugin 'L9' Plugin 'vim-scripts/gitignore' Plugin 'fatih/vim-go' +Plugin 'tpope/vim-endwise' " All of your Plugins must be added before the following line call vundle#end() " required From bd355ffbf4473972c5e772a20b13cdf9a8dd3b44 Mon Sep 17 00:00:00 2001 From: Homan Date: Mon, 9 Feb 2015 23:48:35 +0800 Subject: [PATCH 3/9] Vimrc changes --- vimrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 6924dd2..f549396 100644 --- a/vimrc +++ b/vimrc @@ -14,6 +14,7 @@ Plugin 'ervandew/supertab' Plugin 'scrooloose/nerdtree' Plugin 'mileszs/ack.vim' Plugin 'altercation/vim-colors-solarized' +Plugin 'flazz/vim-colorschemes' Plugin 'L9' Plugin 'vim-scripts/gitignore' Plugin 'fatih/vim-go' @@ -85,4 +86,5 @@ let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files . -co --exclude-stand let g:ctrlp_use_caching = 0 set wildignore+=*/tmp/*,*.so,*.swp,*.zip " MacOSX/Linux -colorscheme solarized +" colorscheme solarized +colorscheme Monokai From 883ab762840edd7af3d417c0ead6cf0463bd24b1 Mon Sep 17 00:00:00 2001 From: Homan Date: Wed, 18 Feb 2015 20:46:53 +0800 Subject: [PATCH 4/9] Scheme --- vimrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vimrc b/vimrc index 5b3a94d..42db171 100644 --- a/vimrc +++ b/vimrc @@ -88,5 +88,4 @@ let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$' let g:ctrlp_use_caching = 0 set wildignore+=*/tmp/*,*.so,*.swp,*.zip " MacOSX/Linux -" colorscheme solarized -colorscheme Monokai +colorscheme solarized From 0feecdf351b7e809219d0dfe2ae197c6374023e6 Mon Sep 17 00:00:00 2001 From: Homan Date: Wed, 18 Feb 2015 20:48:19 +0800 Subject: [PATCH 5/9] Vimrc --- vimrc | 2 -- 1 file changed, 2 deletions(-) diff --git a/vimrc b/vimrc index f99907c..0f059c6 100644 --- a/vimrc +++ b/vimrc @@ -16,11 +16,9 @@ Plugin 'ervandew/supertab' Plugin 'scrooloose/nerdtree' Plugin 'mileszs/ack.vim' Plugin 'altercation/vim-colors-solarized' -Plugin 'flazz/vim-colorschemes' Plugin 'L9' Plugin 'vim-scripts/gitignore' Plugin 'fatih/vim-go' -Plugin 'tpope/vim-endwise' Plugin 'rking/ag.vim' Bundle 'flazz/vim-colorschemes' Bundle 'bling/vim-airline' From 8359df0b02930ec647ff4d847b3f5ff57488dd68 Mon Sep 17 00:00:00 2001 From: aranair Date: Mon, 27 Apr 2015 18:16:32 +0800 Subject: [PATCH 6/9] more golang stuff --- vimrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vimrc b/vimrc index 0f059c6..80dab2f 100644 --- a/vimrc +++ b/vimrc @@ -71,6 +71,15 @@ nnoremap e :wq nnoremap G nnoremap gg +"GOLANG STUFF BELOW +let g:go_fmt_command = "goimports" +let g:go_fmt_autosave = 1 +let g:go_highlight_functions = 1 +let g:go_highlight_methods = 1 +let g:go_highlight_structs = 1 +let g:go_highlight_operators = 1 +let g:go_highlight_build_constraints = 1 + " vp doesn't replace paste buffer function! RestoreRegister() let @" = s:restore_reg From ab8246907f70be92edb29604cb0c0a92851f634c Mon Sep 17 00:00:00 2001 From: aranair Date: Sun, 17 May 2015 12:46:57 +0800 Subject: [PATCH 7/9] All --- vimrc | 3 ++- zshrc-stuff | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 80dab2f..13e6ae3 100644 --- a/vimrc +++ b/vimrc @@ -23,6 +23,7 @@ Plugin 'rking/ag.vim' Bundle 'flazz/vim-colorschemes' Bundle 'bling/vim-airline' Bundle 'derekwyatt/vim-scala' +Bundle 'uarun/vim-protobuf' " All of your Plugins must be added before the following line call vundle#end() " required @@ -62,7 +63,7 @@ nnoremap j gj nnoremap k gk map :NERDTreeToggle -map :Ag +map :Ag map r :NERDTreeFind map t :tabnew nnoremap w :w diff --git a/zshrc-stuff b/zshrc-stuff index e069d3c..177a131 100644 --- a/zshrc-stuff +++ b/zshrc-stuff @@ -17,8 +17,16 @@ alias caba="cd ~/Projects/carebear" alias hot="cd ~/Projects/hoteru" alias be="bundle exec" +# tmux alias +alias tmux="TERM=screen-256color-bce tmux" +alias ta="tmux a -t" +alias tn="tmux new -s" + +export EDITOR='vim' export LANG=en_US.UTF-8 export LC_ALL=en_US.UTF-8 +export CC=/usr/bin/gcc +export GOPATH=$HOME/go export PATH="/Users/admin/.rvm/gems/ruby-2.0.0-p451/bin:/Users/admin/.rvm/gems/ruby-2.0.0-p451@global/bin:/Users/admin/.rvm/rubies/ruby-2.0.0-p451/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Users/admin/.rvm/bin" # Opens the github page for the current git repository in your browser From 3ac60959ec4259f08ee71399881f863a2933da70 Mon Sep 17 00:00:00 2001 From: aranair Date: Sun, 17 May 2015 12:54:40 +0800 Subject: [PATCH 8/9] Tmux conf --- tmux.conf | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tmux.conf b/tmux.conf index 118613a..65c8824 100644 --- a/tmux.conf +++ b/tmux.conf @@ -3,14 +3,15 @@ set-option -g default-shell $SHELL set-option -g default-command "reattach-to-user-namespace -l zsh" -set -g default-terminal "xterm" +set -g default-terminal "screen-256color" # shorten command delay set -sg escape-time 1 +set -g history-limit 100000 # act like GNU screen -unbind C-b -set -g prefix C-a +# unbind C-b +# set -g prefix C-a # a mouse set -g mode-mouse on @@ -38,6 +39,7 @@ bind-key -r C-l select-window -t :+ unbind [ bind ` copy-mode unbind p +bind -n C-k clear-history bind p paste-buffer bind -t vi-copy v begin-selection @@ -51,7 +53,7 @@ bind y run "tmux save-buffer - | reattach-to-user-namespace pbcopy" # ---------------------- # set pane colors - hilight the active pane set-option -g pane-border-fg colour15 #base02 -set-option -g pane-active-border-fg colour15 #base01 +set-option -g pane-active-border-fg colour23 #base01 # colorize messages in the command line set-option -g message-bg black #base02 @@ -70,10 +72,16 @@ set -g visual-activity on # set color for status bar set-option -g status-bg default #base02 -set-option -g status-fg white +set-option -g status-fg colour5 set-option -g status-attr dim # show session name, window & pane number, # date and time on right side of status bar set -g status-right-length 60 -set -g status-right "#[fg=color235]#S #I:#P #[fg=color235]:: %d %b %Y #[fg=color235]:: %l:%M %p :: #(date -u | awk '{print $4}')::" +set -g status-left "#[fg=colour39][#S]" +set -g status-right "#[fg=colour39]%d %b %Y :: %l:%M %p " +set -g window-status-format "#[fg=white,bg=default] #I #W " +set -g window-status-current-format "#[fg=colour17,bg=colour39,noreverse] #I #W " + +# scrolling +set -g terminal-overrides 'xterm*:smcup@:rmcup@' From f5db98dac6ad197bc2e6efbc41927364c10ce345 Mon Sep 17 00:00:00 2001 From: aranair Date: Fri, 3 Jul 2015 16:02:49 +0800 Subject: [PATCH 9/9] tagbar --- vimrc | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/vimrc b/vimrc index 5f33e3a..fb81b6f 100644 --- a/vimrc +++ b/vimrc @@ -25,6 +25,7 @@ Bundle 'bling/vim-airline' Bundle 'derekwyatt/vim-scala' Plugin 'tpope/vim-rsi' Bundle 'uarun/vim-protobuf' +Plugin 'majutsushi/tagbar' " All of your Plugins must be added before the following line call vundle#end() " required @@ -74,6 +75,34 @@ nnoremap G nnoremap gg "GOLANG STUFF BELOW +map :TagbarToggle +let g:tagbar_type_go = { + \ 'ctagstype' : 'go', + \ 'kinds' : [ + \ 'p:package', + \ 'i:imports:1', + \ 'c:constants', + \ 'v:variables', + \ 't:types', + \ 'n:interfaces', + \ 'w:fields', + \ 'e:embedded', + \ 'm:methods', + \ 'r:constructor', + \ 'f:functions' + \ ], + \ 'sro' : '.', + \ 'kind2scope' : { + \ 't' : 'ctype', + \ 'n' : 'ntype' + \ }, + \ 'scope2kind' : { + \ 'ctype' : 't', + \ 'ntype' : 'n' + \ }, + \ 'ctagsbin' : 'gotags', + \ 'ctagsargs' : '-sort -silent' +\ } let g:go_fmt_command = "goimports" let g:go_fmt_autosave = 1 let g:go_highlight_functions = 1