diff --git a/prompt b/prompt index cf5ed0b..2a87fb9 100644 --- a/prompt +++ b/prompt @@ -91,7 +91,7 @@ Jobs="\j" #export PS1=$IBlack$Time12h" \u@\h"$Color_Off'$(git branch &>/dev/null;\ -Default="\[\033[01;32m\]\u@\h\[\033[00m\]:" +Default="\[\033[01;34m\][\D{%F %T}] \[\033[01;32m\]\u@\h\[\033[00m\]:" ColorPathShort="\[\033[01;34m\]\w\[\033[00m\]" export PS1=$Default'$(git branch &>/dev/null;\ diff --git a/tmux.conf b/tmux.conf index 21bf452..09cc168 100644 --- a/tmux.conf +++ b/tmux.conf @@ -7,9 +7,7 @@ set -g base-index 1 set-option -g default-command "/bin/bash -c 'which reattach-to-user-namespace >/dev/null && exec reattach-to-user-namespace $SHELL -l || exec $SHELL -l'" set -g default-terminal "screen-256color" -set -g mode-mouse on -setw -g mouse-select-window on -setw -g mouse-select-pane on +set -g mouse # Use vim keybindings in copy mode setw -g mode-keys vi @@ -28,10 +26,7 @@ set -g visual-activity on source '/Users/victorcoder/Library/Python/2.7/lib/python/site-packages/powerline/bindings/tmux/powerline.conf' -# enable utf-8 on status bar -set -g status on -set -g status-utf8 on -set -s escape-time 0 +set -g status-interval 0 # List of plugins set -g @plugin 'tmux-plugins/tpm' diff --git a/v.terminal b/v.terminal new file mode 100644 index 0000000..1614cc3 --- /dev/null +++ b/v.terminal @@ -0,0 +1,196 @@ + + + + + ANSIBlueColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEB4w + IDAuMDAzOTIxNTY4NjI3IDAuNzMzMzMzMzMzMwAQAYAC0hAREhNaJGNsYXNzbmFtZVgk + Y2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hpdmVy0RcYVHJv + b3SAAQgRGiMtMjc7QUhOW2KDhYeMl6Coq7TGyc4AAAAAAAABAQAAAAAAAAAZAAAAAAAA + AAAAAAAAAAAA0A== + + ANSIBrightBlueColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww + LjMzMzMzMzMzMzMgMC4zMzMzMzMzMzMzIDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs + YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290 + gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA + AAAAAAAAAM4= + + ANSIBrightCyanColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBEw + LjMzMzMzMzMzMzMgMSAxABABgALSEBESE1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29s + b3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztB + SE5bYnZ4en+Kk5uep7m8wQAAAAAAAAEBAAAAAAAAABkAAAAAAAAAAAAAAAAAAADD + + ANSIBrightGreenColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww + LjMzMzMzMzMzMzMgMSAwLjMzMzMzMzMzMzMAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs + YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290 + gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA + AAAAAAAAAM4= + + ANSIBrightMagentaColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww + Ljk4ODIzNTI5NDEgMC4zMzMzMzMzMzMzIDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs + YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290 + gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA + AAAAAAAAAM4= + + ANSIBrightRedColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw + Ljk4ODIzNTI5NDEgMC4zMzMzMzMzMzMzIDAuMzMzMzMzMzMzMwAQAYAC0hAREhNaJGNs + YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp + dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA + AAAZAAAAAAAAAAAAAAAAAAAA2Q== + + ANSIBrightWhiteColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NGMSAx + IDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVj + dF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FITltiaWttcn2GjpGa + rK+0AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAALY= + + ANSIBrightYellowColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBEx + IDEgMC4zMzMzMzMzMzMzABABgALSEBESE1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29s + b3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztB + SE5bYnZ4en+Kk5uep7m8wQAAAAAAAAEBAAAAAAAAABkAAAAAAAAAAAAAAAAAAADD + + ANSICyanColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECgw + LjA5NDExNzY0NzA2IDAuNzMzMzMzMzMzMyAwLjczMzMzMzMzMzMAEAGAAtIQERITWiRj + bGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNo + aXZlctEXGFRyb290gAEIERojLTI3O0FITltijY+RlqGqsrW+0NPYAAAAAAAAAQEAAAAA + AAAAGQAAAAAAAAAAAAAAAAAAANo= + + ANSIGreenColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECow + LjA5NDExNzY0NzA2IDAuNzMzMzMzMzMzMyAwLjAwNzg0MzEzNzI1NQAQAYAC0hAREhNa + JGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFy + Y2hpdmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KPkZOYo6y0t8DS1doAAAAAAAABAQAA + AAAAAAAZAAAAAAAAAAAAAAAAAAAA3A== + + ANSIMagentaColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECkw + LjczMzMzMzMzMzMgMC4wMDM5MjE1Njg2MjcgMC43MzMzMzMzMzMzABABgALSEBESE1ok + Y2xhc3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJj + aGl2ZXLRFxhUcm9vdIABCBEaIy0yNztBSE5bYo6Qkpeiq7O2v9HU2QAAAAAAAAEBAAAA + AAAAABkAAAAAAAAAAAAAAAAAAADb + + ANSIRedColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEB0w + LjczMzMzMzMzMzMgMCAwLjAxMTc2NDcwNTg4ABABgALSEBESE1okY2xhc3NuYW1lWCRj + bGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRFxhUcm9v + dIABCBEaIy0yNztBSE5bYoKEhouWn6eqs8XIzQAAAAAAAAEBAAAAAAAAABkAAAAAAAAA + AAAAAAAAAADP + + ANSIWhiteColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw + LjczMzMzMzMzMzMgMC43MzMzMzMzMzMzIDAuNzMzMzMzMzMzMwAQAYAC0hAREhNaJGNs + YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp + dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA + AAAZAAAAAAAAAAAAAAAAAAAA2Q== + + ANSIYellowColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECgw + LjczMzMzMzMzMzMgMC43MzMzMzMzMzMzIDAuMDE5NjA3ODQzMTQAEAGAAtIQERITWiRj + bGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNo + aXZlctEXGFRyb290gAEIERojLTI3O0FITltijY+RlqGqsrW+0NPYAAAAAAAAAQEAAAAA + AAAAGQAAAAAAAAAAAAAAAAAAANo= + + BackgroundColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OV05TV2hpdGVcTlNDb2xvclNwYWNlViRjbGFzc00w + IDAuODk5OTk5OTgAEAOAAtIQERITWiRjbGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqIS + FFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290gAEIERojLTI3O0FIUF1k + cnR2e4aPl5qjtbi9AAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAL8= + + CursorBlink + + CursorColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBwx + IDAuOTk0NDYxMzU5NyAwLjk5MTgwMzQ0NjkAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs + YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290 + gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA + AAAAAAAAAM4= + + CursorType + 0 + Font + + YnBsaXN0MDDUAQIDBAUGGBlYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKQHCBESVSRudWxs1AkKCwwNDg8QVk5TU2l6ZVhOU2ZGbGFnc1ZOU05hbWVWJGNs + YXNzI0AoAAAAAAAAEBCAAoADXxAaU2F1Y2VDb2RlUG93ZXJsaW5lLVJlZ3VsYXLSExQV + FlokY2xhc3NuYW1lWCRjbGFzc2VzVk5TRm9udKIVF1hOU09iamVjdF8QD05TS2V5ZWRB + cmNoaXZlctEaG1Ryb290gAEIERojLTI3PEJLUltiaXJ0dniVmqWutbjB09bbAAAAAAAA + AQEAAAAAAAAAHAAAAAAAAAAAAAAAAAAAAN0= + + FontAntialias + + ProfileCurrentVersion + 2.04 + SelectionColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww + LjcwOTgwMzkyMTYgMC44MzUyOTQxMTc2IDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs + YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290 + gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA + AAAAAAAAAM4= + + TextBoldColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBsw + Ljk4NjA1NzE2MiAwLjk4NDUwNjI0NTEgMQAQAYAC0hAREhNaJGNsYXNzbmFtZVgkY2xh + c3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hpdmVy0RcYVHJvb3SA + AQgRGiMtMjc7QUhOW2KAgoSJlJ2lqLHDxssAAAAAAAABAQAAAAAAAAAZAAAAAAAAAAAA + AAAAAAAAzQ== + + TextColor + + YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS + AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPEBww + Ljk5MTUyNDE5NzQgMC45ODI1NjcwNjI3IDEAEAGAAtIQERITWiRjbGFzc25hbWVYJGNs + YXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEXGFRyb290 + gAEIERojLTI3O0FITltigYOFipWepqmyxMfMAAAAAAAAAQEAAAAAAAAAGQAAAAAAAAAA + AAAAAAAAAM4= + + UseBrightBold + + name + v + type + Window Settings + + diff --git a/vimrc b/vimrc index 613f4ca..4719695 100644 --- a/vimrc +++ b/vimrc @@ -28,11 +28,19 @@ NeoBundle 'vim-scripts/tComment' NeoBundle 'scrooloose/syntastic' NeoBundle 'Townk/vim-autoclose' NeoBundle 'fatih/vim-go' -NeoBundle 'ervandew/supertab' +" NeoBundle 'ervandew/supertab' NeoBundle 'bling/vim-airline' NeoBundle 'chase/vim-ansible-yaml' NeoBundle 'altercation/vim-colors-solarized' NeoBundle 'kien/ctrlp.vim' +NeoBundle 'Valloric/YouCompleteMe', { + \ 'build' : { + \ 'mac' : './install.py', + \ 'unix' : './install.py', + \ 'windows' : 'install.py', + \ 'cygwin' : './install.py' + \ } + \ } call neobundle#end() NeoBundleCheck @@ -58,21 +66,9 @@ set encoding=utf-8 filetype plugin indent on filetype plugin on -" set tabstop=2 softtabstop=2 shiftwidth=2 textwidth=0 expandtab -autocmd Filetype html setlocal ts=2 sts=2 sw=2 expandtab -autocmd Filetype ruby setlocal ts=2 sts=2 sw=2 expandtab autocmd BufNewFile,BufRead *.coffee set filetype=coffee -autocmd Filetype coffee setlocal ts=2 sts=2 sw=2 expandtab -autocmd Filetype javascript setlocal ts=2 sts=2 sw=2 expandtab -autocmd Filetype json setlocal ts=2 sts=2 sw=2 expandtab -autocmd Filetype htmlcheetah setlocal ts=2 sts=2 sw=2 expandtab -autocmd Filetype go setlocal ts=4 sts=4 sw=4 -autocmd Filetype yaml setlocal ts=2 sts=2 sw=2 -autocmd Filetype scss setlocal ts=2 sts=2 sw=2 expandtab -autocmd Filetype css setlocal ts=2 sts=2 sw=2 expandtab -autocmd Filetype eruby setlocal ts=2 sts=2 sw=2 expandtab -" Autoformat go source files autocmd BufRead,BufNewFile *.md set filetype=markdown +autocmd Filetype html,ruby,coffee,javascript,json,htmlcheetah,yaml,scss,css,eruby setlocal ts=2 sts=2 sw=2 expandtab set autoindent smartindent smarttab set backspace=indent,eol,start set hidden @@ -130,33 +126,15 @@ autocmd BufEnter * silent! lcd %:p:h " Colors " ========================= " -" Try to load a nice colourscheme syntax on set background=dark -"color vividchalk - -fun! LoadColourScheme(schemes) - let l:schemes = a:schemes . ":" - while l:schemes != "" - let l:scheme = strpart(l:schemes, 0, stridx(l:schemes, ":")) - let l:schemes = strpart(l:schemes, stridx(l:schemes, ":") + 1) - try - exec "colorscheme" l:scheme - break - catch - endtry - endwhile -endfun - -if has('gui') - call LoadColourScheme("inkpot:night:rainbow_night:darkblue:elflord") -else - if &t_Co == 88 || &t_Co == 256 - call LoadColourScheme("vividchalk:inkpot:desert256:darkblack:darkblue:elflord") - endif -endif - +set t_Co=256 +let g:solarized_termcolors=256 +let g:solarized_termtrans=1 +let g:solarized_contrast="normal" +let g:solarized_visibility="normal" +color solarized " ========================= " Vim UI @@ -238,3 +216,5 @@ if v:version >= 700 catch endtry endif + +set cursorline