Commit c1e012d2 authored by Srikanth Agaram's avatar Srikanth Agaram

Multiple updates

parent e81f61bc
alias ps='ps U $USER'
alias vi='2>/dev/null gvim'
alias mplayer='mplayer -stop-xscreensaver'
if [ `which dircolors` ]; then
eval "`dircolors`"
alias ls='ls --color=auto'
......@@ -8,11 +5,20 @@ elif [ `which gdircolors` ]; then
eval "`gdircolors`"
alias ls='ls -G'
fi
alias mpdev='mplayer -ao oss:/dev/dsp1'
alias ps='ps U $USER'
alias vi='2>/dev/null gvim'
alias mplayer='mplayer -stop-xscreensaver'
alias java='java -Xms16m -Xmx1024m'
alias log='vi ~/datalog/current.datalog'
alias music='ogg123 http://srikanthak.name:8000/mpd.ogg'
alias webcam='mplayer -tv driver=v4l2:device=/dev/video0:width=640:height=480:fps=30 tv://'
alias su='sudo -s'
alias glog='git log --author=srikanth --no-merges'
alias gnew='git log --author=srikanth --no-merges origin/trunk..HEAD'
alias gnew='git log --author=srikanth --no-merges origin/master..HEAD'
alias glast='git log origin/master@{1}..origin/master@{0}'
alias be='bundle exec'
alias c='bundle exec rails console'
alias r='bundle exec rake'
alias s='bundle exec rails server thin'
alias t='bundle exec rspec'
......@@ -6,20 +6,11 @@ export KDEDIR=/usr
export QTDIR=/usr/share/qt3
export EDITOR=vim
. ~/.alias
[ -f ~/.local_alias ] && . ~/.local_alias
if [ "x$TERM" != "x" ]
then
. ~/.prompt
twttypow
fi
if [ "$COLORTERM" == "gnome-terminal" ]; then
export TERM=xterm-256color
fi
export PATH=$PATH:$HOME/settings/bin
export PATH=$PATH:$HOME/settings/bin:$HOME/.local_bin
# don't put duplicate lines in the history. See bash(1) for more options
export HISTCONTROL=ignoredups
......@@ -37,5 +28,19 @@ shopt -s checkwinsize
# Make sure our customised gtkrc file is loaded.
export GTK2_RC_FILES=$HOME/.gtkrc-2.0
. ~/.alias
[ -f ~/.local_alias ] && . ~/.local_alias
if [ "x$TERM" != "x" ]
then
. ~/.prompt
twttypow
fi
function cdp() {
pushd `find "$HOME/work/projects" -type d -maxdepth 2 | grep '^.*/'$1'$' | \
awk '{ print length($0),$0 | "sort -n"}' | head -1 | sed 's@^.* @@'`
}
# Ensure that local settings override the defaults
[ -f ~/.local_bashrc ] && . ~/.local_bashrc
[user]
name = Srikanth Agaram
email = ak@srikanthak.name
name = Srikanth Agaram
email = ak@srikanthak.name
[color]
ui = auto
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
current = green reverse
local = cyan
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
added = green
changed = cyan
untracked = red
[pack]
threads = 0
threads = 0
[diff]
renamelimit = 0
renamelimit = 0
[core]
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
[branch]
autosetupmerge = true
autosetupmerge = true
[push]
default = current
default = current
[alias]
st = status
ci = commit
br = branch
co = checkout
df = diff
lg = log -p
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
ls = ls-files
ign = ls-files -o -i --exclude-standard
" pathogen.vim - path option manipulation
" Maintainer: Tim Pope <http://tpo.pe/>
" Version: 2.0
" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
"
" For management of individually installed plugins in ~/.vim/bundle (or
" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc
" prior to `fileype plugin indent on` is the only other setup necessary.
"
" The API is documented inline below. For maximum ease of reading,
" :set foldmethod=marker
if exists("g:loaded_pathogen") || &cp
finish
endif
let g:loaded_pathogen = 1
" Point of entry for basic default usage. Give a directory name to invoke
" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path
" to invoke pathogen#runtime_prepend_subdirectories(). Afterwards,
" pathogen#cycle_filetype() is invoked.
function! pathogen#infect(...) abort " {{{1
let source_path = a:0 ? a:1 : 'bundle'
if source_path =~# '[\\/]'
call pathogen#runtime_prepend_subdirectories(source_path)
else
call pathogen#runtime_append_all_bundles(source_path)
endif
call pathogen#cycle_filetype()
endfunction " }}}1
" Split a path into a list.
function! pathogen#split(path) abort " {{{1
if type(a:path) == type([]) | return a:path | endif
let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
endfunction " }}}1
" Convert a list to a path.
function! pathogen#join(...) abort " {{{1
if type(a:1) == type(1) && a:1
let i = 1
let space = ' '
else
let i = 0
let space = ''
endif
let path = ""
while i < a:0
if type(a:000[i]) == type([])
let list = a:000[i]
let j = 0
while j < len(list)
let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
let path .= ',' . escaped
let j += 1
endwhile
else
let path .= "," . a:000[i]
endif
let i += 1
endwhile
return substitute(path,'^,','','')
endfunction " }}}1
" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
function! pathogen#legacyjoin(...) abort " {{{1
return call('pathogen#join',[1] + a:000)
endfunction " }}}1
" Remove duplicates from a list.
function! pathogen#uniq(list) abort " {{{1
let i = 0
let seen = {}
while i < len(a:list)
if has_key(seen,a:list[i])
call remove(a:list,i)
else
let seen[a:list[i]] = 1
let i += 1
endif
endwhile
return a:list
endfunction " }}}1
" \ on Windows unless shellslash is set, / everywhere else.
function! pathogen#separator() abort " {{{1
return !exists("+shellslash") || &shellslash ? '/' : '\'
endfunction " }}}1
" Convenience wrapper around glob() which returns a list.
function! pathogen#glob(pattern) abort " {{{1
let files = split(glob(a:pattern),"\n")
return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
endfunction "}}}1
" Like pathogen#glob(), only limit the results to directories.
function! pathogen#glob_directories(pattern) abort " {{{1
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
endfunction "}}}1
" Turn filetype detection off and back on again if it was already enabled.
function! pathogen#cycle_filetype() " {{{1
if exists('g:did_load_filetypes')
filetype off
filetype on
endif
endfunction " }}}1
" Checks if a bundle is 'disabled'. A bundle is considered 'disabled' if
" its 'basename()' is included in g:pathogen_disabled[]' or ends in a tilde.
function! pathogen#is_disabled(path) " {{{1
if a:path =~# '\~$'
return 1
elseif !exists("g:pathogen_disabled")
return 0
endif
let sep = pathogen#separator()
return index(g:pathogen_disabled, strpart(a:path, strridx(a:path, sep)+1)) != -1
endfunction "}}}1
" Prepend all subdirectories of path to the rtp, and append all 'after'
" directories in those subdirectories.
function! pathogen#runtime_prepend_subdirectories(path) " {{{1
let sep = pathogen#separator()
let before = filter(pathogen#glob_directories(a:path.sep."*"), '!pathogen#is_disabled(v:val)')
let after = filter(pathogen#glob_directories(a:path.sep."*".sep."after"), '!pathogen#is_disabled(v:val[0:-7])')
let rtp = pathogen#split(&rtp)
let path = expand(a:path)
call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
let &rtp = pathogen#join(pathogen#uniq(before + rtp + after))
return &rtp
endfunction " }}}1
" For each directory in rtp, check for a subdirectory named dir. If it
" exists, add all subdirectories of that subdirectory to the rtp, immediately
" after the original directory. If no argument is given, 'bundle' is used.
" Repeated calls with the same arguments are ignored.
function! pathogen#runtime_append_all_bundles(...) " {{{1
let sep = pathogen#separator()
let name = a:0 ? a:1 : 'bundle'
if "\n".s:done_bundles =~# "\\M\n".name."\n"
return ""
endif
let s:done_bundles .= name . "\n"
let list = []
for dir in pathogen#split(&rtp)
if dir =~# '\<after$'
let list += filter(pathogen#glob_directories(substitute(dir,'after$',name,'').sep.'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
else
let list += [dir] + filter(pathogen#glob_directories(dir.sep.name.sep.'*[^~]'), '!pathogen#is_disabled(v:val)')
endif
endfor
let &rtp = pathogen#join(pathogen#uniq(list))
return 1
endfunction
let s:done_bundles = ''
" }}}1
" Invoke :helptags on all non-$VIM doc directories in runtimepath.
function! pathogen#helptags() " {{{1
let sep = pathogen#separator()
for dir in pathogen#split(&rtp)
if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.'/doc') == 2 && !empty(glob(dir.'/doc/*')) && (!filereadable(dir.'/doc/tags') || filewritable(dir.'/doc/tags'))
helptags `=dir.'/doc'`
endif
endfor
endfunction " }}}1
command! -bar Helptags :call pathogen#helptags()
" Like findfile(), but hardcoded to use the runtimepath.
function! pathogen#rtpfindfile(file,count) "{{{1
let rtp = pathogen#join(1,pathogen#split(&rtp))
return fnamemodify(findfile(a:file,rtp,a:count),':p')
endfunction " }}}1
function! s:find(count,cmd,file,...) " {{{1
let rtp = pathogen#join(1,pathogen#split(&runtimepath))
let file = pathogen#rtpfindfile(a:file,a:count)
if file ==# ''
return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
elseif a:0
let path = file[0:-strlen(a:file)-2]
execute a:1.' `=path`'
return a:cmd.' '.fnameescape(a:file)
else
return a:cmd.' '.fnameescape(file)
endif
endfunction " }}}1
function! s:Findcomplete(A,L,P) " {{{1
let sep = pathogen#separator()
let cheats = {
\'a': 'autoload',
\'d': 'doc',
\'f': 'ftplugin',
\'i': 'indent',
\'p': 'plugin',
\'s': 'syntax'}
if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
let request = cheats[a:A[0]].a:A[1:-1]
else
let request = a:A
endif
let pattern = substitute(request,'\'.sep,'*'.sep,'g').'*'
let found = {}
for path in pathogen#split(&runtimepath)
let matches = split(glob(path.sep.pattern),"\n")
call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
call map(matches,'v:val[strlen(path)+1:-1]')
for match in matches
let found[match] = 1
endfor
endfor
return sort(keys(found))
endfunction " }}}1
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(<count>,'edit<bang>',<q-args>)
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(<count>,'edit<bang>',<q-args>)
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(<count>,'split<bang>',<q-args>)
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(<count>,'vsplit<bang>',<q-args>)
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit<bang>',<q-args>)
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(<count>,'pedit<bang>',<q-args>)
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(<count>,'read<bang>',<q-args>)
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(<count>,'edit<bang>',<q-args>,'lcd')
" vim:set ft=vim ts=8 sw=2 sts=2:
......@@ -33,6 +33,7 @@ set wildmenu
set listchars=eol:-,tab:+-,extends:+,precedes:<,nbsp:~
set foldmethod=marker
set background=dark
set colorcolumn=81
" Default colorscheme
colorscheme jellybeans
......@@ -53,3 +54,5 @@ let extfile = expand("<sfile>:h") . "/.local_vimrc"
if filereadable(extfile)
source <sfile>:h/.local_vimrc
endif
call pathogen#infect()
......@@ -3,13 +3,24 @@ set ts=2
set sw=2
set guifont=Monaco\ 9
set colorcolumn=120
map <F2> :vsplit :vsplit
cabbr c ~/current/frontend/app/controllers/**
cabbr h ~/current/frontend/app/helpers/**
cabbr m ~/current/frontend/app/models/**
cabbr t ~/current/frontend/spec/**
cabbr v ~/current/frontend/app/views/**
cabbr j ~/current/frontend/public/javascripts/**
cabbr s ~/current/frontend/public/stylesheets/**
cabbr a app/mailers/**
cabbr c app/controllers/**
cabbr f config/**
cabbr h app/helpers/**
cabbr j app/assets/javascripts/**
cabbr l lib/**
cabbr m app/models/**
cabbr s app/assets/stylesheets/**
cabbr t spec/**
cabbr tc spec/controllers/**
cabbr tf spec/support/factories/**
cabbr th spec/helpers/**
cabbr tl spec/lib/**
cabbr tm spec/models/**
cabbr ts spec/support/**
cabbr tv spec/views/**
cabbr v app/views/**
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment