Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 3 commits
  • 18 files changed
  • 0 commit comments
  • 1 contributor
View
20 aliases
@@ -61,22 +61,20 @@ alias db-backup-production='heroku pgbackups:capture --remote production'
alias whats-my-ip="curl -s checkip.dyndns.org | grep -Eo '[0-9\.]+'"
# Maven
-alias mc="mvn clean"
-alias mcpi="mvn clean package install"
+alias build="mvn clean package install"
get() {
url=http://local.slidev.org:8080/api/rest/v1$2
token=`mongo --quiet sli --eval 'db.userSession.find({"body.principal.externalId":"'$1'"})[0].body.appSession[0].token'`
response=`curl -s -H "Content-type: application/json" -H "accept: application/json" -H "Authorization: bearer $token" $url`
echo $response | python -mjson.tool
}
-#postgres
-alias postg-start='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'
-alias postg-stop='pg_ctl -D /usr/local/var/postgres stop -s -m fast'
#jenkins run
-alias jenkins='java -jar /usr/local/Cellar/jenkins/1.464/libexec/jenkins.war --httpPort=9000'
+alias jenkins='java -jar /usr/local/Cellar/jenkins/1.478/libexec/jenkins.war --httpPort=9000'
+#set veriable
+SLI_HOME=/Users/pghosh/codebase/sli/sli
shard() {
 if [ -z $1 ]
@@ -108,7 +106,9 @@ shard() {
   mongo is $SLI_HOME/config/indexes/is_indexes.js
 fi
}
-alias kill-jetty="ps -ef|grep jetty|grep -v grep|awk '{print $2}'|xargs kill -9"
-#Go path
-export GOPATH=$HOME/Projects/golang
-export PATH=$PATH:$HOME/Projects/golang/bin
+alias kill-jetty="ps -ef|grep jetty|grep -v grep|awk '{print \$2}'|xargs kill -9"
+alias kill-ruby="ps -ef|grep ruby|grep -v grep|awk '{print \$2}'|xargs kill -9"
+alias kill-tommy="ps -ef|grep tomcat|grep -v grep|awk '{print \$2}'|xargs kill -9"
+alias fast-build='mvn clean package install -DskipTests'
+export LZ='/Users/pghosh/codebase/sli/sli/ingestion/ingestion-service/target/ingestion/lz/inbound'
+
View
3 gitconfig
@@ -4,11 +4,10 @@
pretty = %Cblue%h%Creset %Cgreen[%ar]%Creset (%an) %s
[user]
name = pghosh
- email = topghosh@gmail.com
[color]
status = auto
branch = auto
- ui = true
+ ui = always
[alias]
us = reset HEAD
uc = reset --soft HEAD^
View
7 irbrc
@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'interactive_editor'
+require 'wirble'
+
+Wirble.init
+Wirble.colorize
+
View
1 tmux.conf
@@ -1,5 +1,6 @@
bind C-a send-prefix
set-option -g default-command "reattach-to-user-namespace -l zsh"
+bind-key C-c run-shell "tmux save-buffer - | reattach-to-user-namespace pbcopy"
setw -g mode-mouse on
set -g prefix C-a
View
9 vim/.netrwhist
@@ -1,4 +1,11 @@
let g:netrw_dirhistmax =10
-let g:netrw_dirhist_cnt =2
+<<<<<<< HEAD
+let g:netrw_dirhist_cnt =1
+let g:netrw_dirhist_1='/Users/pghosh/.zsh'
+=======
+let g:netrw_dirhist_cnt =4
let g:netrw_dirhist_1='/Users/pghosh/.zsh'
let g:netrw_dirhist_2='/Users/pghosh/Projects/npage/.git'
+let g:netrw_dirhist_3='/Users/pghosh/.vim'
+let g:netrw_dirhist_4='/Users/pghosh/codebase/sli/sli/config/indexes'
+>>>>>>> 788d389... updated vim and other stuff
View
2 vim/autoload/vimpowerline
1 vim/bundle/YouCompleteMe
@@ -0,0 +1 @@
+Subproject commit b4a9fabc3961063a51eb8cae461a6cba554da450
1 vim/bundle/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit d63a475fcb73c782ce09d63a591d69481a62b30f
View
33 vim/bundle/vim-peepopen/README.md
@@ -0,0 +1,33 @@
+vim-peepopen
+=============
+
+A plugin for the Vim text editor. PeepOpen provides fuzzy search of filenames and paths in a programming project.
+
+Installation
+------------
+
+Get the PeepOpen.app and open it at least once to approve the Mac OS X security dialog.
+
+Standard:
+
+Copy `peepopen.vim` to your `~/.vim/plugin` directory.
+
+With Tim Pope's [Pathogen](http://github.com/tpope/vim-pathogen):
+
+Copy the entire `vim-peepopen` plugin directory to your `~/.vim/bundle` directory.
+
+Usage
+-----
+
+`<Leader>p` opens the current project directory with the PeepOpen application.
+
+Use the [vim-rooter](http://github.com/airblade/vim-rooter) plugin for automatic assignment of the current working directory for projects stored in Git.
+
+(Leader is mapped to '\' by default)
+
+Credits
+-------
+
+- Initial Vim Plugin by [Andrew Stewart](http://www.airbladesoftware.com/).
+- Some plugin boilerplate from [Rein Henrichs](http://reinh.com/).
+
View
44 vim/bundle/vim-peepopen/plugin/peepopen.vim
@@ -0,0 +1,44 @@
+" plugin/peepopen.vim
+" Author: Geoffrey Grosenbach <boss@topfunky.com>
+" License: MIT License
+
+" Install this file as plugin/peepopen.vim.
+
+" If you prefer Command-T, use this snippet in your .gvimrc:
+
+" if has("gui_macvim")
+" macmenu &File.New\ Tab key=<nop>
+" map <D-t> <Plug>PeepOpen
+" end
+
+" ============================================================================
+
+" Exit quickly when:
+" - this plugin was already loaded (or disabled)
+" - when 'compatible' is set
+if &cp || exists("g:peepopen_loaded") && g:peepopen_loaded
+ finish
+endif
+let g:peepopen_loaded = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function s:LaunchPeepOpenViaVim()
+ let cwd = getcwd()
+ silent exe "!open \"peepopen://" . shellescape(cwd) . "?editor=MacVim\""
+endfunction
+
+command! PeepOpen :call <SID>LaunchPeepOpenViaVim()
+
+noremap <unique> <script> <Plug>PeepOpen <SID>Launch
+noremap <SID>Launch :call <SID>LaunchPeepOpenViaVim()<CR>
+
+if !hasmapto('<Plug>PeepOpen')
+ map <unique> <silent> <Leader>p <Plug>PeepOpen
+endif
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:set sw=2 sts=2:
1 vim/bundle/vundle
@@ -0,0 +1 @@
+Subproject commit 2a494ff00fc10ed5725fbb99ec267ec2c9917817
View
355 vim/colors/Tomorrow-Night-Bright.vim
@@ -0,0 +1,355 @@
+" Tomorrow Night Bright - Full Colour and 256 Colour
+" http://chriskempson.com
+"
+" Hex colour conversion functions borrowed from the theme "Desert256""
+
+" Default GUI Colours
+let s:foreground = "eaeaea"
+let s:background = "000000"
+let s:selection = "424242"
+let s:line = "2a2a2a"
+let s:comment = "969896"
+let s:red = "d54e53"
+let s:orange = "e78c45"
+let s:yellow = "e7c547"
+let s:green = "b9ca4a"
+let s:aqua = "70c0b1"
+let s:blue = "7aa6da"
+let s:purple = "c397d8"
+let s:window = "4d5057"
+
+set background=dark
+hi clear
+syntax reset
+
+let g:colors_name = "Tomorrow-Night-Bright"
+
+if has("gui_running") || &t_Co == 88 || &t_Co == 256
+ " Returns an approximate grey index for the given grey level
+ fun <SID>grey_number(x)
+ if &t_Co == 88
+ if a:x < 23
+ return 0
+ elseif a:x < 69
+ return 1
+ elseif a:x < 103
+ return 2
+ elseif a:x < 127
+ return 3
+ elseif a:x < 150
+ return 4
+ elseif a:x < 173
+ return 5
+ elseif a:x < 196
+ return 6
+ elseif a:x < 219
+ return 7
+ elseif a:x < 243
+ return 8
+ else
+ return 9
+ endif
+ else
+ if a:x < 14
+ return 0
+ else
+ let l:n = (a:x - 8) / 10
+ let l:m = (a:x - 8) % 10
+ if l:m < 5
+ return l:n
+ else
+ return l:n + 1
+ endif
+ endif
+ endif
+ endfun
+
+ " Returns the actual grey level represented by the grey index
+ fun <SID>grey_level(n)
+ if &t_Co == 88
+ if a:n == 0
+ return 0
+ elseif a:n == 1
+ return 46
+ elseif a:n == 2
+ return 92
+ elseif a:n == 3
+ return 115
+ elseif a:n == 4
+ return 139
+ elseif a:n == 5
+ return 162
+ elseif a:n == 6
+ return 185
+ elseif a:n == 7
+ return 208
+ elseif a:n == 8
+ return 231
+ else
+ return 255
+ endif
+ else
+ if a:n == 0
+ return 0
+ else
+ return 8 + (a:n * 10)
+ endif
+ endif
+ endfun
+
+ " Returns the palette index for the given grey index
+ fun <SID>grey_colour(n)
+ if &t_Co == 88
+ if a:n == 0
+ return 16
+ elseif a:n == 9
+ return 79
+ else
+ return 79 + a:n
+ endif
+ else
+ if a:n == 0
+ return 16
+ elseif a:n == 25
+ return 231
+ else
+ return 231 + a:n
+ endif
+ endif
+ endfun
+
+ " Returns an approximate colour index for the given colour level
+ fun <SID>rgb_number(x)
+ if &t_Co == 88
+ if a:x < 69
+ return 0
+ elseif a:x < 172
+ return 1
+ elseif a:x < 230
+ return 2
+ else
+ return 3
+ endif
+ else
+ if a:x < 75
+ return 0
+ else
+ let l:n = (a:x - 55) / 40
+ let l:m = (a:x - 55) % 40
+ if l:m < 20
+ return l:n
+ else
+ return l:n + 1
+ endif
+ endif
+ endif
+ endfun
+
+ " Returns the actual colour level for the given colour index
+ fun <SID>rgb_level(n)
+ if &t_Co == 88
+ if a:n == 0
+ return 0
+ elseif a:n == 1
+ return 139
+ elseif a:n == 2
+ return 205
+ else
+ return 255
+ endif
+ else
+ if a:n == 0
+ return 0
+ else
+ return 55 + (a:n * 40)
+ endif
+ endif
+ endfun
+
+ " Returns the palette index for the given R/G/B colour indices
+ fun <SID>rgb_colour(x, y, z)
+ if &t_Co == 88
+ return 16 + (a:x * 16) + (a:y * 4) + a:z
+ else
+ return 16 + (a:x * 36) + (a:y * 6) + a:z
+ endif
+ endfun
+
+ " Returns the palette index to approximate the given R/G/B colour levels
+ fun <SID>colour(r, g, b)
+ " Get the closest grey
+ let l:gx = <SID>grey_number(a:r)
+ let l:gy = <SID>grey_number(a:g)
+ let l:gz = <SID>grey_number(a:b)
+
+ " Get the closest colour
+ let l:x = <SID>rgb_number(a:r)
+ let l:y = <SID>rgb_number(a:g)
+ let l:z = <SID>rgb_number(a:b)
+
+ if l:gx == l:gy && l:gy == l:gz
+ " There are two possibilities
+ let l:dgr = <SID>grey_level(l:gx) - a:r
+ let l:dgg = <SID>grey_level(l:gy) - a:g
+ let l:dgb = <SID>grey_level(l:gz) - a:b
+ let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
+ let l:dr = <SID>rgb_level(l:gx) - a:r
+ let l:dg = <SID>rgb_level(l:gy) - a:g
+ let l:db = <SID>rgb_level(l:gz) - a:b
+ let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
+ if l:dgrey < l:drgb
+ " Use the grey
+ return <SID>grey_colour(l:gx)
+ else
+ " Use the colour
+ return <SID>rgb_colour(l:x, l:y, l:z)
+ endif
+ else
+ " Only one possibility
+ return <SID>rgb_colour(l:x, l:y, l:z)
+ endif
+ endfun
+
+ " Returns the palette index to approximate the 'rrggbb' hex string
+ fun <SID>rgb(rgb)
+ let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
+ let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
+ let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
+
+ return <SID>colour(l:r, l:g, l:b)
+ endfun
+
+ " Sets the highlighting for the given group
+ fun <SID>X(group, fg, bg, attr)
+ if a:fg != ""
+ exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
+ endif
+ if a:bg != ""
+ exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
+ endif
+ if a:attr != ""
+ exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+ endif
+ endfun
+
+ " Vim Highlighting
+ call <SID>X("Normal", s:foreground, s:background, "")
+ call <SID>X("LineNr", s:selection, "", "")
+ call <SID>X("NonText", s:selection, "", "")
+ call <SID>X("SpecialKey", s:selection, "", "")
+ call <SID>X("Search", s:background, s:yellow, "")
+ call <SID>X("TabLine", s:foreground, s:background, "reverse")
+ call <SID>X("StatusLine", s:window, s:yellow, "reverse")
+ call <SID>X("StatusLineNC", s:window, s:foreground, "reverse")
+ call <SID>X("VertSplit", s:window, s:window, "none")
+ call <SID>X("Visual", "", s:selection, "")
+ call <SID>X("Directory", s:blue, "", "")
+ call <SID>X("ModeMsg", s:green, "", "")
+ call <SID>X("MoreMsg", s:green, "", "")
+ call <SID>X("Question", s:green, "", "")
+ call <SID>X("WarningMsg", s:red, "", "")
+ call <SID>X("MatchParen", "", s:selection, "")
+ call <SID>X("Folded", s:comment, s:background, "")
+ call <SID>X("FoldColumn", "", s:background, "")
+ if version >= 700
+ call <SID>X("CursorLine", "", s:line, "none")
+ call <SID>X("CursorColumn", "", s:line, "none")
+ call <SID>X("PMenu", s:foreground, s:selection, "none")
+ call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
+ end
+ if version >= 703
+ call <SID>X("ColorColumn", "", s:line, "none")
+ end
+
+ " Standard Highlighting
+ call <SID>X("Comment", s:comment, "", "")
+ call <SID>X("Todo", s:comment, s:background, "")
+ call <SID>X("Title", s:comment, "", "")
+ call <SID>X("Identifier", s:red, "", "none")
+ call <SID>X("Statement", s:foreground, "", "")
+ call <SID>X("Conditional", s:foreground, "", "")
+ call <SID>X("Repeat", s:foreground, "", "")
+ call <SID>X("Structure", s:purple, "", "")
+ call <SID>X("Function", s:blue, "", "")
+ call <SID>X("Constant", s:orange, "", "")
+ call <SID>X("String", s:green, "", "")
+ call <SID>X("Special", s:foreground, "", "")
+ call <SID>X("PreProc", s:purple, "", "")
+ call <SID>X("Operator", s:aqua, "", "none")
+ call <SID>X("Type", s:blue, "", "none")
+ call <SID>X("Define", s:purple, "", "none")
+ call <SID>X("Include", s:blue, "", "")
+ "call <SID>X("Ignore", "666666", "", "")
+
+ " Vim Highlighting
+ call <SID>X("vimCommand", s:red, "", "none")
+
+ " C Highlighting
+ call <SID>X("cType", s:yellow, "", "")
+ call <SID>X("cStorageClass", s:purple, "", "")
+ call <SID>X("cConditional", s:purple, "", "")
+ call <SID>X("cRepeat", s:purple, "", "")
+
+ " PHP Highlighting
+ call <SID>X("phpVarSelector", s:red, "", "")
+ call <SID>X("phpKeyword", s:purple, "", "")
+ call <SID>X("phpRepeat", s:purple, "", "")
+ call <SID>X("phpConditional", s:purple, "", "")
+ call <SID>X("phpStatement", s:purple, "", "")
+ call <SID>X("phpMemberSelector", s:foreground, "", "")
+
+ " Ruby Highlighting
+ call <SID>X("rubySymbol", s:green, "", "")
+ call <SID>X("rubyConstant", s:yellow, "", "")
+ call <SID>X("rubyAttribute", s:blue, "", "")
+ call <SID>X("rubyInclude", s:blue, "", "")
+ call <SID>X("rubyLocalVariableOrMethod", s:orange, "", "")
+ call <SID>X("rubyCurlyBlock", s:orange, "", "")
+ call <SID>X("rubyStringDelimiter", s:green, "", "")
+ call <SID>X("rubyInterpolationDelimiter", s:orange, "", "")
+ call <SID>X("rubyConditional", s:purple, "", "")
+ call <SID>X("rubyRepeat", s:purple, "", "")
+
+ " Python Highlighting
+ call <SID>X("pythonInclude", s:purple, "", "")
+ call <SID>X("pythonStatement", s:purple, "", "")
+ call <SID>X("pythonConditional", s:purple, "", "")
+ call <SID>X("pythonFunction", s:blue, "", "")
+
+ " JavaScript Highlighting
+ call <SID>X("javaScriptBraces", s:foreground, "", "")
+ call <SID>X("javaScriptFunction", s:purple, "", "")
+ call <SID>X("javaScriptConditional", s:purple, "", "")
+ call <SID>X("javaScriptRepeat", s:purple, "", "")
+ call <SID>X("javaScriptNumber", s:orange, "", "")
+ call <SID>X("javaScriptMember", s:orange, "", "")
+
+ " HTML Highlighting
+ call <SID>X("htmlTag", s:red, "", "")
+ call <SID>X("htmlTagName", s:red, "", "")
+ call <SID>X("htmlArg", s:red, "", "")
+ call <SID>X("htmlScriptTag", s:red, "", "")
+
+ " Diff Highlighting
+ call <SID>X("diffAdded", s:green, "", "")
+ call <SID>X("diffRemoved", s:red, "", "")
+
+ " Lua Highlighting
+ call <SID>X("luaStatement", s:purple, "", "")
+ call <SID>X("luaRepeat", s:purple, "", "")
+ call <SID>X("luaCondStart", s:purple, "", "")
+ call <SID>X("luaCondElseif", s:purple, "", "")
+ call <SID>X("luaCond", s:purple, "", "")
+ call <SID>X("luaCondEnd", s:purple, "", "")
+
+ " Delete Functions
+ delf <SID>X
+ delf <SID>rgb
+ delf <SID>colour
+ delf <SID>rgb_colour
+ delf <SID>rgb_level
+ delf <SID>rgb_number
+ delf <SID>grey_colour
+ delf <SID>grey_level
+ delf <SID>grey_number
+endif
View
3 vim/colors/codeschool.vim
@@ -16,7 +16,10 @@ hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#3f4b52 gui=NONE
hi CursorLine ctermfg=NONE ctermbg=23 cterm=NONE guifg=NONE guibg=#2e373b gui=NONE
hi CursorColumn ctermfg=NONE ctermbg=23 cterm=NONE guifg=NONE guibg=#2e373b gui=NONE
hi ColorColumn ctermfg=NONE ctermbg=23 cterm=NONE guifg=NONE guibg=#2e373b gui=NONE
+<<<<<<< HEAD
hi LineNr guifg=#8b8bcd guibg=#2e2e2e guisp=#2e2e2e gui=NONE ctermfg=104 ctermbg=236 cterm=NONE
+=======
+>>>>>>> 788d389... updated vim and other stuff
"hi LineNr ctermfg=102 ctermbg=23 cterm=NONE guifg=#84898c guibg=#2a343a gui=NONE
hi VertSplit ctermfg=59 ctermbg=59 cterm=NONE guifg=#252c31 guibg=#252c31 gui=NONE
hi MatchParen ctermfg=180 ctermbg=NONE cterm=underline guifg=#dda790 guibg=NONE gui=underline
View
20 vim/colors/ir_black.vim
@@ -1,5 +1,9 @@
" ir_black color scheme
+<<<<<<< HEAD
" More at: http://blog.infinitered.com/entries/show/8
+=======
+" More at: http://blog.infinitered.com
+>>>>>>> 788d389... updated vim and other stuff
" ********************************************************************************
@@ -46,7 +50,11 @@
" Red #FF6C60 #FFB6B0
" Green #A8FF60 #CEFFAB
" Yellow #FFFFB6 #FFFFCB
+<<<<<<< HEAD
" Blue #96CBFE #FFFFCB
+=======
+" Blue #96CBFE #B5DCFE
+>>>>>>> 788d389... updated vim and other stuff
" Magenta #FF73FD #FF9CFE
" Cyan #C6C5FE #DFDFFE
" White #EEEEEE #FFFFFF
@@ -78,7 +86,11 @@ hi StatusLineNC guifg=black guibg=#202020 gui=NONE ctermfg=bl
hi Folded guifg=#a0a8b0 guibg=#384048 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
hi Title guifg=#f6f3e8 guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=NONE
+<<<<<<< HEAD
hi Visual guifg=NONE guibg=#262D51 gui=NONE ctermfg=NONE ctermbg=darkgray cterm=NONE
+=======
+hi Visual guifg=NONE guibg=#262D51 gui=NONE ctermfg=NONE ctermbg=NONE cterm=REVERSE
+>>>>>>> 788d389... updated vim and other stuff
hi SpecialKey guifg=#808080 guibg=#343434 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -89,6 +101,10 @@ hi PmenuSbar guifg=black guibg=white gui=NONE ctermfg=bl
hi Error guifg=NONE guibg=NONE gui=undercurl ctermfg=white ctermbg=red cterm=NONE guisp=#FF6C60 " undercurl color
hi ErrorMsg guifg=white guibg=#FF6C60 gui=BOLD ctermfg=white ctermbg=red cterm=NONE
hi WarningMsg guifg=white guibg=#FF6C60 gui=BOLD ctermfg=white ctermbg=red cterm=NONE
+<<<<<<< HEAD
+=======
+hi LongLineWarning guifg=NONE guibg=#371F1C gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+>>>>>>> 788d389... updated vim and other stuff
" Message displayed in lower left, such as --INSERT--
hi ModeMsg guifg=black guibg=#C6C5FE gui=BOLD ctermfg=black ctermbg=cyan cterm=BOLD
@@ -99,7 +115,11 @@ if version >= 700 " Vim 7.x specific colors
hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=BOLD ctermfg=white ctermbg=darkgray cterm=NONE
hi Pmenu guifg=#f6f3e8 guibg=#444444 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
hi PmenuSel guifg=#000000 guibg=#cae682 gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+<<<<<<< HEAD
hi Search guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+=======
+ hi Search guifg=NONE guibg=#2F2F00 gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+>>>>>>> 788d389... updated vim and other stuff
endif
" Syntax highlighting
View
250 vim/doc/tags
@@ -1,3 +1,9 @@
+:MatchDebug matchit.txt /*:MatchDebug*
+:TComment tComment.txt /*:TComment*
+:TCommentAs tComment.txt /*:TCommentAs*
+:TCommentBlock tComment.txt /*:TCommentBlock*
+:TCommentInline tComment.txt /*:TCommentInline*
+:TCommentRight tComment.txt /*:TCommentRight*
AddToLispWords clojure.txt /*AddToLispWords*
DocLookupInteractive clojure.txt /*DocLookupInteractive*
DocLookupWord clojure.txt /*DocLookupWord*
@@ -13,6 +19,7 @@ JavadocLookupInteractive clojure.txt /*JavadocLookupInteractive*
JavadocLookupWord clojure.txt /*JavadocLookupWord*
MacroExpand clojure.txt /*MacroExpand*
MacroExpand1 clojure.txt /*MacroExpand1*
+MatchError matchit.txt /*MatchError*
MetaLookupInteractive clojure.txt /*MetaLookupInteractive*
MetaLookupWord clojure.txt /*MetaLookupWord*
RequireFile clojure.txt /*RequireFile*
@@ -22,11 +29,30 @@ SourceLookupInteractive clojure.txt /*SourceLookupInteractive*
SourceLookupWord clojure.txt /*SourceLookupWord*
StartLocalRepl clojure.txt /*StartLocalRepl*
StartRepl clojure.txt /*StartRepl*
+TCommentDefineType() tComment.txt /*TCommentDefineType()*
ToggleParenRainbow clojure.txt /*ToggleParenRainbow*
+[% matchit.txt /*[%*
+]% matchit.txt /*]%*
^ clojure.txt /*^*
aw clojure.txt /*aw*
+b:match_col matchit.txt /*b:match_col*
+b:match_debug matchit.txt /*b:match_debug*
+b:match_ignorecase matchit.txt /*b:match_ignorecase*
+b:match_ini matchit.txt /*b:match_ini*
+b:match_iniBR matchit.txt /*b:match_iniBR*
+b:match_match matchit.txt /*b:match_match*
+b:match_pat matchit.txt /*b:match_pat*
+b:match_skip matchit.txt /*b:match_skip*
+b:match_table matchit.txt /*b:match_table*
+b:match_tail matchit.txt /*b:match_tail*
+b:match_wholeBR matchit.txt /*b:match_wholeBR*
+b:match_word matchit.txt /*b:match_word*
+b:match_words matchit.txt /*b:match_words*
clj-nailgun-server clojure.txt /*clj-nailgun-server*
clojure.vim clojure.txt /*clojure.vim*
+config/rails.vim rails.txt /*config\/rails.vim*
+cs surround.txt /*cs*
+ds surround.txt /*ds*
eb clojure.txt /*eb*
ef clojure.txt /*ef*
el clojure.txt /*el*
@@ -35,22 +61,246 @@ et clojure.txt /*et*
fd clojure.txt /*fd*
ft-clj-indent clojure.txt /*ft-clj-indent*
ft-clj-syntax clojure.txt /*ft-clj-syntax*
+g% matchit.txt /*g%*
+g:loaded_rails rails.txt /*g:loaded_rails*
+g:rails_abbreviations rails.txt /*g:rails_abbreviations*
+g:rails_ctags_arguments rails.txt /*g:rails_ctags_arguments*
+g:rails_dbext rails.txt /*g:rails_dbext*
+g:rails_default_database rails.txt /*g:rails_default_database*
+g:rails_default_file rails.txt /*g:rails_default_file*
+g:rails_expensive rails.txt /*g:rails_expensive*
+g:rails_gnu_screen rails.txt /*g:rails_gnu_screen*
+g:rails_history_size rails.txt /*g:rails_history_size*
+g:rails_mappings rails.txt /*g:rails_mappings*
+g:rails_menu rails.txt /*g:rails_menu*
+g:rails_modelines rails.txt /*g:rails_modelines*
+g:rails_statusline rails.txt /*g:rails_statusline*
+g:rails_syntax rails.txt /*g:rails_syntax*
+g:rails_tabstop rails.txt /*g:rails_tabstop*
+g:rails_url rails.txt /*g:rails_url*
+g:tcommentMapLeader1 tComment.txt /*g:tcommentMapLeader1*
+g:tcommentMapLeader2 tComment.txt /*g:tcommentMapLeader2*
+g:tcommentMapLeaderOp1 tComment.txt /*g:tcommentMapLeaderOp1*
+g:tcommentMapLeaderOp2 tComment.txt /*g:tcommentMapLeaderOp2*
+g:tcommentOpModeExtra tComment.txt /*g:tcommentOpModeExtra*
gi clojure.txt /*gi*
+greplace.txt greplace.txt /*greplace.txt*
gw clojure.txt /*gw*
+i_CTRL-G_S surround.txt /*i_CTRL-G_S*
+i_CTRL-G_s surround.txt /*i_CTRL-G_s*
ji clojure.txt /*ji*
jw clojure.txt /*jw*
li clojure.txt /*li*
lw clojure.txt /*lw*
m1 clojure.txt /*m1*
+macros/rails.vim rails.txt /*macros\/rails.vim*
+matchit matchit.txt /*matchit*
+matchit-% matchit.txt /*matchit-%*
+matchit-\1 matchit.txt /*matchit-\\1*
+matchit-activate matchit.txt /*matchit-activate*
+matchit-backref matchit.txt /*matchit-backref*
+matchit-bugs matchit.txt /*matchit-bugs*
+matchit-choose matchit.txt /*matchit-choose*
+matchit-configure matchit.txt /*matchit-configure*
+matchit-debug matchit.txt /*matchit-debug*
+matchit-details matchit.txt /*matchit-details*
+matchit-highlight matchit.txt /*matchit-highlight*
+matchit-hl matchit.txt /*matchit-hl*
+matchit-intro matchit.txt /*matchit-intro*
+matchit-languages matchit.txt /*matchit-languages*
+matchit-modes matchit.txt /*matchit-modes*
+matchit-newlang matchit.txt /*matchit-newlang*
+matchit-o_% matchit.txt /*matchit-o_%*
+matchit-parse matchit.txt /*matchit-parse*
+matchit-s:notend matchit.txt /*matchit-s:notend*
+matchit-s:sol matchit.txt /*matchit-s:sol*
+matchit-spaces matchit.txt /*matchit-spaces*
+matchit-troubleshoot matchit.txt /*matchit-troubleshoot*
+matchit-v_% matchit.txt /*matchit-v_%*
+matchit.txt matchit.txt /*matchit.txt*
+matchit.vim matchit.txt /*matchit.vim*
me clojure.txt /*me*
mi clojure.txt /*mi*
mw clojure.txt /*mw*
+o_[% matchit.txt /*o_[%*
+o_]% matchit.txt /*o_]%*
+o_g% matchit.txt /*o_g%*
rF clojure.txt /*rF*
+rails rails.txt /*rails*
+rails-'cfu' rails.txt /*rails-'cfu'*
+rails-'completefunc' rails.txt /*rails-'completefunc'*
+rails-'et' rails.txt /*rails-'et'*
+rails-'expandtab' rails.txt /*rails-'expandtab'*
+rails-'filetype' rails.txt /*rails-'filetype'*
+rails-'ft' rails.txt /*rails-'ft'*
+rails-'includeexpr' rails.txt /*rails-'includeexpr'*
+rails-'inex' rails.txt /*rails-'inex'*
+rails-'pa' rails.txt /*rails-'pa'*
+rails-'path' rails.txt /*rails-'path'*
+rails-'shiftwidth' rails.txt /*rails-'shiftwidth'*
+rails-'softtabstop' rails.txt /*rails-'softtabstop'*
+rails-'statusline' rails.txt /*rails-'statusline'*
+rails-'stl' rails.txt /*rails-'stl'*
+rails-'sts' rails.txt /*rails-'sts'*
+rails-'sua' rails.txt /*rails-'sua'*
+rails-'suffixesadd' rails.txt /*rails-'suffixesadd'*
+rails-'sw' rails.txt /*rails-'sw'*
+rails-:A rails.txt /*rails-:A*
+rails-:AD rails.txt /*rails-:AD*
+rails-:AE rails.txt /*rails-:AE*
+rails-:AS rails.txt /*rails-:AS*
+rails-:AT rails.txt /*rails-:AT*
+rails-:AV rails.txt /*rails-:AV*
+rails-:OpenURL rails.txt /*rails-:OpenURL*
+rails-:R rails.txt /*rails-:R*
+rails-:RD rails.txt /*rails-:RD*
+rails-:RE rails.txt /*rails-:RE*
+rails-:RS rails.txt /*rails-:RS*
+rails-:RT rails.txt /*rails-:RT*
+rails-:RV rails.txt /*rails-:RV*
+rails-:Rabbrev rails.txt /*rails-:Rabbrev*
+rails-:Rabbrev! rails.txt /*rails-:Rabbrev!*
+rails-:Rails rails.txt /*rails-:Rails*
+rails-:Rake rails.txt /*rails-:Rake*
+rails-:Rake! rails.txt /*rails-:Rake!*
+rails-:Rapi rails.txt /*rails-:Rapi*
+rails-:Rcd rails.txt /*rails-:Rcd*
+rails-:Rcommand rails.txt /*rails-:Rcommand*
+rails-:Rconsole rails.txt /*rails-:Rconsole*
+rails-:Rcontroller rails.txt /*rails-:Rcontroller*
+rails-:Rdbext rails.txt /*rails-:Rdbext*
+rails-:Rdestroy rails.txt /*rails-:Rdestroy*
+rails-:Rdoc rails.txt /*rails-:Rdoc*
+rails-:Rdoc! rails.txt /*rails-:Rdoc!*
+rails-:Redit rails.txt /*rails-:Redit*
+rails-:Renvironment rails.txt /*rails-:Renvironment*
+rails-:Rextract rails.txt /*rails-:Rextract*
+rails-:Rfind rails.txt /*rails-:Rfind*
+rails-:Rfixtures rails.txt /*rails-:Rfixtures*
+rails-:Rfunctionaltest rails.txt /*rails-:Rfunctionaltest*
+rails-:Rgenerate rails.txt /*rails-:Rgenerate*
+rails-:Rhelper rails.txt /*rails-:Rhelper*
+rails-:Rinitializer rails.txt /*rails-:Rinitializer*
+rails-:Rintegrationtest rails.txt /*rails-:Rintegrationtest*
+rails-:Rinvert rails.txt /*rails-:Rinvert*
+rails-:Rjavascript rails.txt /*rails-:Rjavascript*
+rails-:Rlayout rails.txt /*rails-:Rlayout*
+rails-:Rlcd rails.txt /*rails-:Rlcd*
+rails-:Rlib rails.txt /*rails-:Rlib*
+rails-:Rlocale rails.txt /*rails-:Rlocale*
+rails-:Rlog rails.txt /*rails-:Rlog*
+rails-:Rmetal rails.txt /*rails-:Rmetal*
+rails-:Rmigration rails.txt /*rails-:Rmigration*
+rails-:Rmodel rails.txt /*rails-:Rmodel*
+rails-:Rnavcommand rails.txt /*rails-:Rnavcommand*
+rails-:Robserver rails.txt /*rails-:Robserver*
+rails-:Rp rails.txt /*rails-:Rp*
+rails-:Rpartial rails.txt /*rails-:Rpartial*
+rails-:Rplugin rails.txt /*rails-:Rplugin*
+rails-:Rpp rails.txt /*rails-:Rpp*
+rails-:Rpreview rails.txt /*rails-:Rpreview*
+rails-:Rpreview! rails.txt /*rails-:Rpreview!*
+rails-:Rproject rails.txt /*rails-:Rproject*
+rails-:Rrefresh rails.txt /*rails-:Rrefresh*
+rails-:Rrefresh! rails.txt /*rails-:Rrefresh!*
+rails-:Rrunner rails.txt /*rails-:Rrunner*
+rails-:Rscript rails.txt /*rails-:Rscript*
+rails-:Rserver rails.txt /*rails-:Rserver*
+rails-:Rserver! rails.txt /*rails-:Rserver!*
+rails-:Rset rails.txt /*rails-:Rset*
+rails-:Rspec rails.txt /*rails-:Rspec*
+rails-:Rstylesheet rails.txt /*rails-:Rstylesheet*
+rails-:Rtags rails.txt /*rails-:Rtags*
+rails-:Rtask rails.txt /*rails-:Rtask*
+rails-:Rtree rails.txt /*rails-:Rtree*
+rails-:Runittest rails.txt /*rails-:Runittest*
+rails-:Rview rails.txt /*rails-:Rview*
+rails-:Ry rails.txt /*rails-:Ry*
+rails-:autocmd rails.txt /*rails-:autocmd*
+rails-@params rails.txt /*rails-@params*
+rails-abbreviations rails.txt /*rails-abbreviations*
+rails-about rails.txt /*rails-about*
+rails-alternate rails.txt /*rails-alternate*
+rails-alternate-related rails.txt /*rails-alternate-related*
+rails-autocommands rails.txt /*rails-autocommands*
+rails-commands rails.txt /*rails-commands*
+rails-configuration rails.txt /*rails-configuration*
+rails-controller-navigation rails.txt /*rails-controller-navigation*
+rails-cream rails.txt /*rails-cream*
+rails-custom-navigation rails.txt /*rails-custom-navigation*
+rails-dbext rails.txt /*rails-dbext*
+rails-gf rails.txt /*rails-gf*
+rails-global-settings rails.txt /*rails-global-settings*
+rails-install-plugin rails.txt /*rails-install-plugin*
+rails-install-vim rails.txt /*rails-install-vim*
+rails-installation rails.txt /*rails-installation*
+rails-integration rails.txt /*rails-integration*
+rails-introduction rails.txt /*rails-introduction*
+rails-license rails.txt /*rails-license*
+rails-menu rails.txt /*rails-menu*
+rails-merb rails.txt /*rails-merb*
+rails-migrations rails.txt /*rails-migrations*
+rails-misc-navigation rails.txt /*rails-misc-navigation*
+rails-model-navigation rails.txt /*rails-model-navigation*
+rails-modelines rails.txt /*rails-modelines*
+rails-navigation rails.txt /*rails-navigation*
+rails-options rails.txt /*rails-options*
+rails-partials rails.txt /*rails-partials*
+rails-plugin-author rails.txt /*rails-plugin-author*
+rails-rails-integration rails.txt /*rails-rails-integration*
+rails-rake rails.txt /*rails-rake*
+rails-rake-defaults rails.txt /*rails-rake-defaults*
+rails-refactoring rails.txt /*rails-refactoring*
+rails-related rails.txt /*rails-related*
+rails-rspec rails.txt /*rails-rspec*
+rails-screen rails.txt /*rails-screen*
+rails-scripts rails.txt /*rails-scripts*
+rails-slow rails.txt /*rails-slow*
+rails-snippets rails.txt /*rails-snippets*
+rails-surround rails.txt /*rails-surround*
+rails-syntax rails.txt /*rails-syntax*
+rails-syntax-assertions rails.txt /*rails-syntax-assertions*
+rails-syntax-classes rails.txt /*rails-syntax-classes*
+rails-syntax-deprecated rails.txt /*rails-syntax-deprecated*
+rails-syntax-keywords rails.txt /*rails-syntax-keywords*
+rails-syntax-strings rails.txt /*rails-syntax-strings*
+rails-syntax-yaml rails.txt /*rails-syntax-yaml*
+rails-tabs rails.txt /*rails-tabs*
+rails-template-types rails.txt /*rails-template-types*
+rails-vim-integration rails.txt /*rails-vim-integration*
+rails.txt rails.txt /*rails.txt*
rf clojure.txt /*rf*
rt clojure.txt /*rt*
sR clojure.txt /*sR*
si clojure.txt /*si*
sr clojure.txt /*sr*
+surround surround.txt /*surround*
+surround-author surround.txt /*surround-author*
+surround-customizing surround.txt /*surround-customizing*
+surround-issues surround.txt /*surround-issues*
+surround-mappings surround.txt /*surround-mappings*
+surround-replacements surround.txt /*surround-replacements*
+surround-targets surround.txt /*surround-targets*
+surround.txt surround.txt /*surround.txt*
sw clojure.txt /*sw*
+tComment-Installation tComment.txt /*tComment-Installation*
+tComment-Key-Bindings tComment.txt /*tComment-Key-Bindings*
+tComment-Usage tComment.txt /*tComment-Usage*
+tComment-commands tComment.txt /*tComment-commands*
+tComment.txt tComment.txt /*tComment.txt*
+textile-changelog textile.txt /*textile-changelog*
+textile-commands textile.txt /*textile-commands*
+textile-credits textile.txt /*textile-credits*
+textile-requirements textile.txt /*textile-requirements*
+textile.txt textile.txt /*textile.txt*
tr clojure.txt /*tr*
+v_[% matchit.txt /*v_[%*
+v_]% matchit.txt /*v_]%*
+v_a% matchit.txt /*v_a%*
+v_g% matchit.txt /*v_g%*
vimclojure.txt clojure.txt /*vimclojure.txt*
+vs surround.txt /*vs*
+yS surround.txt /*yS*
+ySS surround.txt /*ySS*
+ys surround.txt /*ys*
+yss surround.txt /*yss*
View
52 vimrc
@@ -8,14 +8,6 @@ set nowritebackup
set ruler " show the cursor position all the time
set showcmd " display incomplete commands
-" Switch syntax highlighting on, when the terminal has colors
-" Also switch on highlighting the last used search pattern.
-if (&t_Co > 2 || has("gui_running")) && !exists("syntax_on")
- syntax on
-endif
-
-filetype plugin indent on
-
augroup vimrcEx
au!
@@ -104,12 +96,46 @@ au BufRead,BufNewFile *.md set filetype=markdown
let vimclojure#HighlightBuiltins = 1 " Highlight Clojure's builtins
let vimclojure#ParenRainbow = 1 " Rainbow parentheses'!
-"pathogen.vim
-call pathogen#infect()
+"Vundle
+set nocompatible
+filetype off
+
+set rtp+=~/.vim/bundle/vundle/
+ call vundle#rc()
+ "Bundle repos here
+ "github repos
+Bundle 'gmarik/vundle'
+Bundle 'tpope/vim-fugitive'
+Bundle 'Valloric/YouCompleteMe'
+
+ " non github repos
+Bundle 'wincent/Command-T'
+
+" Switch syntax highlighting on, when the terminal has colors
+" Also switch on highlighting the last used search pattern.
+if (&t_Co > 2 || has("gui_running")) && !exists("syntax_on")
+ syntax on
+endif
+
+filetype plugin indent on
+
+
map <F2> :NERDTreeToggle<CR>
syntax enable
set background=dark
-colorscheme codeschool
-let g:Powerline_symbols = 'unicode'
-let g:rct_completion_use_fri = 1
+
+"Autocomplete
+set ofu=syntaxcomplete#Complete
+autocmd FileType ruby,eruby set omnifunc=rubycomplete#Complete
+autocmd Filetype java set omnifunc=javacomplete#Complete
+set guifont=Monaco:h12
+if has("autocmd")
+ " Restore cursor position
+ autocmd BufReadPost *
+ \ if line("'\"") > 1 && line("'\"") <= line("$") |
+ \ exe "normal! g`\"" |
+ \ endif
+endif
+autocmd FileType ruby map <F9> :w<CR>:!ruby -c %<CR>
+colorscheme Tomorrow-Night-Bright
View
4 zlogin
@@ -2,7 +2,7 @@
git_prompt_info() {
ref=$(git symbolic-ref HEAD 2> /dev/null)
if [[ -n $ref ]]; then
- echo "[%{$fg_bold[green]%}${ref#refs/heads/}%{$reset_color%}]"
+ echo "%{$fg_bold[green]%}${ref#refs/heads/}%{$reset_color%}|"
fi
}
@@ -17,7 +17,7 @@ export CLICOLOR=1
setopt prompt_subst
# prompt
-export PS1='$(git_prompt_info)[${SSH_CONNECTION+"%{$fg_bold[green]%}%n@%m:"}%{$fg_bold[blue]%}%~%{$reset_color%}] '
+export PS1='$(git_prompt_info)${SSH_CONNECTION+"%{$fg_bold[green]%}%n@%m:"}%{$fg_bold[red]%}%~%{$reset_color%} > '
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
View
67 zshrc
@@ -11,22 +11,19 @@ export FORCE_COLOR=1
# automatically enter directories without cd
setopt auto_cd
-# use vim as an editor
-export EDITOR=vim
-
# aliases
if [ -e "$HOME/.aliases" ]; then
source "$HOME/.aliases"
fi
# vi mode
bindkey -v
-bindkey "^F" vi-cmd-mode
-bindkey jj vi-cmd-mode
-
-# use incremental search
bindkey "^R" history-incremental-search-backward
-
+bindkey -M viins 'jk' vi-cmd-mode
+autoload -U edit-command-line
+zle -N edit-command-line
+bindkey -M vicmd v edit-command-line
+export EDITOR=vim
# add some readline keys back
bindkey "^A" beginning-of-line
bindkey "^E" end-of-line
@@ -69,8 +66,56 @@ setopt EXTENDED_GLOB
[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function
NODE_PATH=/usr/local/lib/node_modules
NODE_PATH=/usr/local/lib/node_modules
-export PATH=/usr/local/bin:$PATH
-
-#share history among shell
+<<<<<<< HEAD
+=======
+export PATH=/Users/pghosh/tools/apache-jmeter-2.7/bin:/usr/local/bin:/Users/pghosh/tools/play-2.0.4:$PATH
+export SLI_HOME=/Users/pghosh/codebase/sli/sli
+launchctl setenv PATH $PATH
+export PATH=/usr/local/mysql/bin:$PATH
+# Appends every command to the history file once it is executed
setopt inc_append_history
+# Reloads the history whenever you use it
setopt share_history
+
+function zle-line-init zle-keymap-select {
+ RPS1="${${KEYMAP/vicmd/-- NORMAL --}/(main|viins)/-- INSERT --}"
+ RPS2=$RPS1
+ zle reset-prompt
+}
+zle -N zle-line-init
+zle -N zle-keymap-select
+ingest-zip() {
+  if [ -z $1 ] || [ -z $2 ]
+  then
+    echo "No zip and/or tenant specified. Usage:"
+    echo "  ingest-zip <PATH_TO_ZIP> <TENANT>"
+    echo "  Example tenants: Midgar-DAYBREAK, Midgar-SUNSET, Hyrule-NYC"
+    return
+  fi
+  echo "Removing existing log files..."
+  rm -rf $LZ/$2/*.log
+  echo "Copying $1 to $LZ/$2/"
+  cp $1 $LZ/$2/
+  echo "Sleep for 2 seconds..."
+  sleep 2
+  zip_file=`basename $1`
+  ruby $SLI_HOME/opstools/ingestion_trigger/publish_file_uploaded.rb STOR $LZ/$2/$zip_file localhost
+  #poll for job log file
+  echo "Polling $LZ/$2/ for job log file..."
+  while [ 1 ]
+  do
+    job_log_file=`find $LZ/$2/ -name *.log`
+    if [ ! -z $job_log_file ]
+    then
+      for file in $job_log_file
+      do
+        echo "$file found."
+      done
+      break
+    fi
+    echo -n "."
+    sleep 3
+  done
+}
+export TOGGLE_TABLESCANS=true
+>>>>>>> 788d389... updated vim and other stuff

No commit comments for this range

Something went wrong with that request. Please try again.