Skip to content

Commit

Permalink
Add some tslime fun and Go programming tricks
Browse files Browse the repository at this point in the history
  • Loading branch information
@mitechie
mitechie committed Apr 3, 2012
1 parent d44073b commit f8b9235
Show file tree
Hide file tree
Showing 7 changed files with 155 additions and 36 deletions.
6 changes: 5 additions & 1 deletion .vim/.netrwhist
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =2
let g:netrw_dirhist_cnt =6
let g:netrw_dirhist_1='/home/rharding/src/wadllib/datetime-924240/src/wadllib/tests/data'
let g:netrw_dirhist_2='/home/rharding/configs/pyvim'
let g:netrw_dirhist_3='/home/rharding/src/shownotes/shownotes'
let g:netrw_dirhist_4='/home/rharding/launchpad/lp-sourcedeps/eggs/lazr.lifecycle-1.1-py2.6.egg/lazr/lifecycle'
let g:netrw_dirhist_5='/home/rharding/launchpad/lp-branches/email_notice_959482'
let g:netrw_dirhist_6='/home/rharding/launchpad/lp-branches/email_notice_959482/lib'
118 changes: 102 additions & 16 deletions .vim/colors/lucius.vim
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
" Lucius vim color file
" Maintainer: Jonathan Filip <jfilip1024@gmail.com>
" Version: 7.0.0
" Version: 7.1.0

hi clear
if exists("syntax_on")
Expand Down Expand Up @@ -33,13 +33,14 @@ let colors_name="lucius"
" the colors and also adds more contrast between text and interface.
"
" The color scheme is dark, by default. You can change this by setting the
" g:lucius_style variable to "light" or "dark". Once the color scheme is
" loaded, you can use the commands "LuciusLight" or "LuciusDark" to change
" schemes quickly.
" g:lucius_style variable to "light", "dark", or "dark_dim". Once the color
" scheme is loaded, you can use the commands "LuciusLight", "LuciusDark", or
" "LuciusDarkDim" to change schemes quickly.
"
" Screenshots of version 7:
"
" * Dark: http://i.imgur.com/ktdFm.png
" * DarkDim: http://i.imgur.com/0bOCv.png
" * Light: http://i.imgur.com/ndd9A.png
"
" Screenshots of version 6:
Expand Down Expand Up @@ -122,8 +123,8 @@ if g:lucius_style == "dark"
" == UI ==
hi Pmenu guifg=bg guibg=#b2b2b2 ctermfg=bg ctermbg=249 gui=none cterm=none
hi PmenuSel guifg=fg guibg=#005f87 ctermfg=fg ctermbg=24 gui=none cterm=none
hi PMenuSbar guifg=#b2b2b2 guibg=#d0d0d0 ctermfg=249 ctermbg=252 gui=none cterm=none
hi PMenuThumb guifg=fg guibg=#808080 ctermfg=fg ctermbg=244 gui=none cterm=none
hi PmenuSbar guifg=#b2b2b2 guibg=#d0d0d0 ctermfg=249 ctermbg=252 gui=none cterm=none
hi PmenuThumb guifg=fg guibg=#808080 ctermfg=fg ctermbg=244 gui=none cterm=none
hi StatusLine guifg=bg guibg=#b2b2b2 ctermfg=bg ctermbg=249 gui=bold cterm=bold
hi StatusLineNC guifg=#444444 guibg=#b2b2b2 ctermfg=238 ctermbg=249 gui=none cterm=none
hi TabLine guifg=bg guibg=#b2b2b2 ctermfg=bg ctermbg=249 gui=none cterm=none
Expand All @@ -134,10 +135,10 @@ if g:lucius_style == "dark"
hi FoldColumn guifg=#bcbcbc guibg=#4e4e4e ctermfg=250 ctermbg=239 gui=bold cterm=none

" ## Spelling ##
hi SpellBad guisp=#d70000 ctermfg=bg ctermbg=160 gui=undercurl cterm=undercurl
hi SpellCap guisp=#00afd7 ctermfg=bg ctermbg=38 gui=undercurl cterm=undercurl
hi SpellRare guisp=#5faf00 ctermfg=bg ctermbg=70 gui=undercurl cterm=undercurl
hi SpellLocal guisp=#d7af00 ctermfg=bg ctermbg=178 gui=undercurl cterm=undercurl
hi SpellBad guisp=#d70000 ctermfg=160 ctermbg=NONE gui=undercurl cterm=underline
hi SpellCap guisp=#00afd7 ctermfg=38 ctermbg=NONE gui=undercurl cterm=underline
hi SpellRare guisp=#5faf00 ctermfg=70 ctermbg=NONE gui=undercurl cterm=underline
hi SpellLocal guisp=#d7af00 ctermfg=178 ctermbg=NONE gui=undercurl cterm=underline

" ## Diff ##
hi DiffAdd guifg=fg guibg=#5f875f ctermfg=fg ctermbg=65 gui=none cterm=none
Expand All @@ -159,6 +160,90 @@ if g:lucius_style == "dark"
hi Ignore guifg=bg ctermfg=bg


elseif g:lucius_style == "dark_dim"


hi Normal guifg=#bcbcbc guibg=#303030 ctermfg=250 ctermbg=236 gui=none cterm=none

hi Comment guifg=#6c6c6c guibg=NONE ctermfg=242 ctermbg=NONE gui=none cterm=none

hi Constant guifg=#afaf87 guibg=NONE ctermfg=144 ctermbg=NONE gui=none cterm=none
hi BConstant guifg=#afaf87 guibg=NONE ctermfg=144 ctermbg=NONE gui=bold cterm=bold

hi Identifier guifg=#87af5f guibg=NONE ctermfg=107 ctermbg=NONE gui=none cterm=none
hi BIdentifier guifg=#87af5f guibg=NONE ctermfg=107 ctermbg=NONE gui=bold cterm=bold

hi Statement guifg=#57afd7 guibg=NONE ctermfg=74 ctermbg=NONE gui=none cterm=none
hi BStatement guifg=#57afd7 guibg=NONE ctermfg=74 ctermbg=NONE gui=bold cterm=bold

hi PreProc guifg=#5faf87 guibg=NONE ctermfg=72 ctermbg=NONE gui=none cterm=none
hi BPreProc guifg=#5faf87 guibg=NONE ctermfg=72 ctermbg=NONE gui=bold cterm=bold

hi Type guifg=#5fafaf guibg=NONE ctermfg=73 ctermbg=NONE gui=none cterm=none
hi BType guifg=#5fafaf guibg=NONE ctermfg=73 ctermbg=NONE gui=bold cterm=bold

hi Special guifg=#af87af guibg=NONE ctermfg=139 ctermbg=NONE gui=none cterm=none
hi BSpecial guifg=#af87af guibg=NONE ctermfg=139 ctermbg=NONE gui=bold cterm=bold

" ## Text Markup ##
hi Underlined guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=underline cterm=underline
hi Error guifg=#d75f5f guibg=#870000 ctermfg=167 ctermbg=88 gui=none cterm=none
hi Todo guifg=#afaf00 guibg=#5f5f00 ctermfg=142 ctermbg=58 gui=none cterm=none
hi MatchParen guifg=bg guibg=#87af5f ctermfg=bg ctermbg=107 gui=none cterm=bold
hi NonText guifg=#5f5f87 guibg=NONE ctermfg=60 ctermbg=NONE gui=none cterm=none
hi SpecialKey guifg=#5f875f guibg=NONE ctermfg=65 ctermbg=NONE gui=none cterm=none
hi Title guifg=#00afd7 guibg=NONE ctermfg=38 ctermbg=NONE gui=bold cterm=bold

" ## Text Selection ##
hi Cursor guifg=bg guibg=#5f87af ctermfg=bg ctermbg=67 gui=none cterm=none
hi CursorIM guifg=bg guibg=#5f87af ctermfg=bg ctermbg=67 gui=none cterm=none
hi CursorColumn guifg=NONE guibg=#444444 ctermfg=NONE ctermbg=238 gui=none cterm=none
hi CursorLine guifg=NONE guibg=#444444 ctermfg=NONE ctermbg=238 gui=none cterm=none
hi Visual guifg=NONE guibg=#005f87 ctermfg=NONE ctermbg=24 gui=none cterm=none
hi VisualNOS guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=underline cterm=underline
hi IncSearch guifg=bg guibg=#00afaf ctermfg=bg ctermbg=37 gui=none cterm=none
hi Search guifg=bg guibg=#d78700 ctermfg=bg ctermbg=172 gui=none cterm=none

" == UI ==
hi Pmenu guifg=bg guibg=#8a8a8a ctermfg=bg ctermbg=245 gui=none cterm=none
hi PmenuSel guifg=fg guibg=#005f87 ctermfg=fg ctermbg=24 gui=none cterm=none
hi PmenuSbar guifg=#8a8a8a guibg=#bcbcbc ctermfg=245 ctermbg=250 gui=none cterm=none
hi PmenuThumb guifg=fg guibg=#585858 ctermfg=fg ctermbg=240 gui=none cterm=none
hi StatusLine guifg=bg guibg=#8a8a8a ctermfg=bg ctermbg=245 gui=bold cterm=bold
hi StatusLineNC guifg=#444444 guibg=#8a8a8a ctermfg=238 ctermbg=245 gui=none cterm=none
hi TabLine guifg=bg guibg=#8a8a8a ctermfg=bg ctermbg=245 gui=none cterm=none
hi TabLineFill guifg=#444444 guibg=#8a8a8a ctermfg=238 ctermbg=245 gui=none cterm=none
hi TabLineSel guifg=fg guibg=#005f87 ctermfg=fg ctermbg=24 gui=bold cterm=bold
hi VertSplit guifg=#626262 guibg=#8a8a8a ctermfg=241 ctermbg=245 gui=none cterm=none
hi Folded guifg=#a8a8a8 guibg=#4e4e4e ctermfg=248 ctermbg=239 gui=bold cterm=none
hi FoldColumn guifg=#a8a8a8 guibg=#4e4e4e ctermfg=248 ctermbg=239 gui=bold cterm=none

" ## Spelling ##
hi SpellBad guisp=#d70000 ctermfg=160 ctermbg=NONE gui=undercurl cterm=underline
hi SpellCap guisp=#00afd7 ctermfg=38 ctermbg=NONE gui=undercurl cterm=underline
hi SpellRare guisp=#5faf00 ctermfg=70 ctermbg=NONE gui=undercurl cterm=underline
hi SpellLocal guisp=#d7af00 ctermfg=178 ctermbg=NONE gui=undercurl cterm=underline

" ## Diff ##
hi DiffAdd guifg=fg guibg=#5f875f ctermfg=fg ctermbg=65 gui=none cterm=none
hi DiffChange guifg=fg guibg=#87875f ctermfg=fg ctermbg=101 gui=none cterm=none
hi DiffDelete guifg=fg guibg=#875f5f ctermfg=fg ctermbg=95 gui=none cterm=none
hi DiffText guifg=#d7d75f guibg=#87875f ctermfg=185 ctermbg=101 gui=none cterm=none

" ## Misc ##
hi Directory guifg=#87af87 guibg=NONE ctermfg=108 ctermbg=NONE gui=none cterm=none
hi ErrorMsg guifg=#d75f5f guibg=NONE ctermfg=167 ctermbg=NONE gui=none cterm=none
hi SignColumn guifg=#8a8a8a guibg=#4e4e4e ctermfg=245 ctermbg=239 gui=none cterm=none
hi LineNr guifg=#626262 guibg=#444444 ctermfg=241 ctermbg=238 gui=none cterm=none
hi MoreMsg guifg=#00afaf guibg=NONE ctermfg=37 ctermbg=NONE gui=none cterm=none
hi ModeMsg guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=none cterm=none
hi Question guifg=fg guibg=NONE ctermfg=fg ctermbg=NONE gui=none cterm=none
hi WarningMsg guifg=#af875f guibg=NONE ctermfg=173 ctermbg=NONE gui=none cterm=none
hi WildMenu guifg=fg guibg=#005f87 ctermfg=fg ctermbg=24 gui=none cterm=none
hi ColorColumn guifg=NONE guibg=#87875f ctermfg=NONE ctermbg=101 gui=none cterm=none
hi Ignore guifg=bg ctermfg=bg


elseif g:lucius_style == "light"


Expand Down Expand Up @@ -206,8 +291,8 @@ elseif g:lucius_style == "light"
" ## UI ##
hi Pmenu guifg=bg guibg=#808080 ctermfg=bg ctermbg=244 gui=none cterm=none
hi PmenuSel guifg=fg guibg=#afd7ff ctermfg=fg ctermbg=153 gui=none cterm=none
hi PMenuSbar guifg=#808080 guibg=#444444 ctermfg=244 ctermbg=238 gui=none cterm=none
hi PMenuThumb guifg=fg guibg=#9e9e9e ctermfg=fg ctermbg=247 gui=none cterm=none
hi PmenuSbar guifg=#808080 guibg=#444444 ctermfg=244 ctermbg=238 gui=none cterm=none
hi PmenuThumb guifg=fg guibg=#9e9e9e ctermfg=fg ctermbg=247 gui=none cterm=none
hi StatusLine guifg=bg guibg=#808080 ctermfg=bg ctermbg=244 gui=bold cterm=bold
hi StatusLineNC guifg=#e4e4e4 guibg=#808080 ctermfg=254 ctermbg=244 gui=none cterm=none
hi TabLine guifg=bg guibg=#808080 ctermfg=bg ctermbg=244 gui=none cterm=none
Expand All @@ -218,10 +303,10 @@ elseif g:lucius_style == "light"
hi FoldColumn guifg=#626262 guibg=#bcbcbc ctermfg=241 ctermbg=250 gui=bold cterm=none

" ## Spelling ##
hi SpellBad guisp=#d70000 ctermfg=fg ctermbg=160 gui=undercurl cterm=undercurl
hi SpellCap guisp=#00afd7 ctermfg=fg ctermbg=38 gui=undercurl cterm=undercurl
hi SpellRare guisp=#5faf00 ctermfg=fg ctermbg=70 gui=undercurl cterm=undercurl
hi SpellLocal guisp=#d7af00 ctermfg=fg ctermbg=178 gui=undercurl cterm=undercurl
hi SpellBad guisp=#d70000 ctermfg=160 ctermbg=NONE gui=undercurl cterm=underline
hi SpellCap guisp=#00afd7 ctermfg=38 ctermbg=NONE gui=undercurl cterm=underline
hi SpellRare guisp=#5faf00 ctermfg=70 ctermbg=NONE gui=undercurl cterm=underline
hi SpellLocal guisp=#d7af00 ctermfg=178 ctermbg=NONE gui=undercurl cterm=underline

" ## Diff ##
hi DiffAdd guifg=fg guibg=#afd7af ctermfg=fg ctermbg=151 gui=none cterm=none
Expand Down Expand Up @@ -262,5 +347,6 @@ hi link TagbarAccessPrivate PreProc
" ## Commands ##
command! LuciusLight let g:lucius_style = "light" | colorscheme lucius
command! LuciusDark let g:lucius_style = "dark" | colorscheme lucius
command! LuciusDarkDim let g:lucius_style = "dark_dim" | colorscheme lucius


24 changes: 13 additions & 11 deletions .vim/colors/void.vim
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" Vim color file
" Maintainer: Andrew Lyon <orthecreedence@gmail.com>
" Last Change: $Date: 2010-11-20 12:27:30PST $
" Version: 1.1
" Last Change: 2012-03-21 06:01:00 PST
" Version: 2.1

" Note that this color scheme is loosely based off of desert.vim (Hans Fugal
" <hans@fugal.net>) mixed with some of slate.vim (Ralph Amissah
Expand All @@ -18,7 +18,7 @@ if version > 580
endif
let g:colors_name="void"

hi Normal guifg=#f5f5f5 guibg=grey15
hi Normal guifg=#e0e0e0 guibg=grey15

" highlight groups
hi Cursor guibg=khaki guifg=slategrey
Expand Down Expand Up @@ -52,21 +52,25 @@ hi WarningMsg guifg=salmon
"hi Tooltip

" syntax highlighting groups
hi Comment guifg=grey50
hi Constant guifg=#e09085
hi Identifier guifg=#f5f5f5
hi Statement guifg=darkkhaki " #bbccee
hi Comment guifg=grey50 ctermfg=darkcyan
hi Constant guifg=#e09085 ctermfg=brown
hi Identifier guifg=#d0d0b0
hi Statement guifg=#ccaa88 gui=bold cterm=bold term=bold
"hi Statement guifg=darkkhaki
hi PreProc guifg=#c8e0b0
hi Type guifg=darkkhaki
hi Type guifg=#99cccc term=NONE cterm=NONE gui=NONE
hi Special guifg=#bbccee cterm=bold term=bold
hi Operator guifg=navajowhite cterm=NONE
hi Function guifg=#c8e0b0 cterm=NONE
"hi Underlined
hi Ignore guifg=grey40
"hi Error
hi Todo guifg=orangered guibg=yellow2
hi Todo guifg=orange guibg=gray40

" Fuf/menu stuff
hi Pmenu guifg=#aadddd guibg=#333333
hi PmenuSel guifg=#ddeeee guibg=#335533

" color terminal definitions
hi SpecialKey ctermfg=darkgreen
hi NonText guibg=grey15 cterm=bold ctermfg=darkblue
Expand All @@ -92,8 +96,6 @@ hi DiffAdd ctermbg=4
hi DiffChange ctermbg=5
hi DiffDelete cterm=bold ctermfg=4 ctermbg=6
hi DiffText cterm=bold ctermbg=1
hi Comment ctermfg=darkcyan
hi Constant ctermfg=brown
hi Special ctermfg=5
hi Identifier ctermfg=6
hi Statement ctermfg=3
Expand Down
1 change: 1 addition & 0 deletions .vim/dict.add
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ Codemash
added
actions
buildout
$/!
Binary file modified .vim/dict.add.spl
View file
Binary file not shown.
39 changes: 31 additions & 8 deletions .vimrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
" ==================================================
" jj - esc
" ,b - bufferlist
" ,v - load .vimrc
" ,V - reload .vimrc
" ,V - load .vimrc
" ,VV - reload .vimrc
" ,m - run make
" ,M - alt make for filetype (pep8 for python, etc)
" ,y - yank to clipboard
Expand Down Expand Up @@ -105,10 +105,11 @@ if has("gui_running")
set background=dark " adapt colors for background
set keymodel=
set mousehide
colorscheme lucius
colorscheme twilight
colorscheme aldmeris
colorscheme solarized
" colorscheme lucius
" colorscheme twilight
" colorscheme aldmeris
" colorscheme solarized
colorscheme void

" To set the toolbars off (icons on top of the screen)
set guioptions-=T
Expand Down Expand Up @@ -158,7 +159,7 @@ set spell
set expandtab " tabs are converted to spaces, use only when required
set sm " show matching braces, somewhat annoying...

set statusline=%{fugitive#statusline()}%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [ASCII=\%03.3b]\ [HEX=\%02.2B]\ [POS=%04l,%04v][%p%%]\ [LEN=%L]
set statusline=%F%m%r%h%w\ [FORMAT=%{&ff}]\ [TYPE=%Y]\ [ASCII=\%03.3b]\ [HEX=\%02.2B]\ [POS=%04l,%04v][%p%%]\ [LEN=%L]
hi StatusLine guifg=#fcf4ba guibg=#333333
hi StatusLineNC guifg=#808080 guibg=#333333

Expand All @@ -181,6 +182,9 @@ set grepprg=ack-grep
" auto save when focus is lost
au FocusLost * :wa

" run the current file with F5
map <F5> <Esc>:w<CR>:!%:p<CR>
" ==================================================
" Config Specific Settings
" ==================================================
Expand Down Expand Up @@ -372,7 +376,6 @@ au FileType javascript call JavaScriptFold()
au FileType javascript setl fen
au FileType javascript set errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m
au FileType javascript set makeprg=jshint\ %
au FileType javascript set textwidth=78
au FileType javascript set tags=tags-js;/

autocmd BufRead,BufNewFile *.json set filetype=json
Expand All @@ -396,6 +399,15 @@ map <Leader>T :!tidy -config ~/.tidyrc<cr><cr>
" enable html tag folding with ,f
nnoremap <leader>f Vatzf
" ==================================================
" GoLang
" ==================================================
" Highlight word and 'K' to get GoDoc output for word.
au BufRead,BufNewFile *.go set filetype=go
" ,m will run gomake
au BufRead *.go set makeprg=gomake
" ,M will run gofmt on the code to lint it
autocmd FileType go map <buffer> <leader>M :Fmt<CR>:cw<CR>
" ==================================================
" Git Tricks
Expand Down Expand Up @@ -506,6 +518,16 @@ ino <silent> <leader>n <c-r>=ShowAvailableSnips()<cr>
" default config for underlines of syntax errors in gvim
let g:pyflakes_use_quickfix = 0

" tslime
" https://github.com/evhan/tslime.vim.git
" let g:tmux_sessionname = "default"
let g:tmux_windowname = 1
let g:tmux_panenumber = 0
nmap <leader>mt :call Send_to_Tmux("make test"."\n")<CR>
nmap <leader>lt :call Send_to_Tmux("./bin/test -x -cvvt \"test_".expand("%:t:r")."\"\n")<CR>
nmap <leader>rst :call Send_to_Tmux("rst2html.py ".expand("%")." > /tmp/".expand("%:t:r").".html\n")<CR>

" Gist - github pastbin
" http://www.vim.org/scripts/script.php?script_id=2423
" :Gist
Expand Down Expand Up @@ -571,6 +593,7 @@ nmap <silent> <leader>L :TagbarToggle<CR>
" endfunction
"
" autocmd FileType python map <buffer> <leader>t :call MakeArgs()<CR>

"
" ==================================================
" Custom Functions
Expand Down
3 changes: 3 additions & 0 deletions bundle_list
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ http://github.com/depuracao/vim-darkdevel.git
https://github.com/vim-scripts/jshint.vim.git
https://github.com/kien/ctrlp.vim
https://github.com/tpope/vim-fugitive
https://github.com/evhan/tslime.vim.git
https://github.com/kana/vim-smartinput.git
https://github.com/mitechie/govim.git

0 comments on commit f8b9235

Please sign in to comment.