Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

New aliases and bundle

  • Loading branch information...
commit 4a1ec5ca9ef2e50335727cd4cbae19a78070f588 1 parent 06a80f1
Rohan Deshpande authored
Showing with 13 additions and 8 deletions.
  1. +1 −1  .gitignore
  2. +2 −1  vim/update_bundles.rb
  3. +4 −1 vim/vimrc
  4. +6 −5 zsh/zshrc
2  .gitignore
View
@@ -1,5 +1,5 @@
vim/doc/*
.netrwhist
vim/bundle
-zsh/work.sh
+zsh/work.zsh
vim/autoload
3  vim/update_bundles.rb
View
@@ -1,10 +1,11 @@
#!/usr/bin/env ruby
-git_bundles = [
+git_bundles = [
"git://github.com/tpope/vim-fugitive.git",
"https://github.com/sickill/vim-pasta.git",
"https://github.com/kien/ctrlp.vim.git",
"git://github.com/tpope/vim-haml.git",
+ "https://github.com/groenewege/vim-less",
"git://github.com/kchmck/vim-coffee-script.git",
"git://github.com/Raimondi/delimitMate",
"https://github.com/tpope/vim-endwise.git",
5 vim/vimrc
View
@@ -50,7 +50,7 @@ set ruler " Ruler on
set scrolloff=3
set smartcase
set smarttab
-set statusline+=\ %t\ \|\ len:\ \%L\ \|\ type:\ %Y\ \|\ ascii:\ \%03.3b\ \|\ hex:\ %2.2B\ \|\ line:\ \%2l
+set statusline+=\ %t\ \|\ len:\ \%L\ \|\ type:\ %Y\ \|\ ascii:\ \%03.3b\ \|\ hex:\ %2.2B\ \|\ line:\ \%2l\ \|\ %m
set timeoutlen=200 " Time to wait after ESC (default causes an annoying delay)
set wildmode=longest,list
set tabstop=2
@@ -81,3 +81,6 @@ autocmd FileType scss set iskeyword=@,48-57,_,-,?,!,192-255
" Reload Vimrc
map <leader>rv :source ~/.vimrc<CR>
+
+" Kill whitespace
+autocmd BufWritePre *.rb,*.yml,*.js,*.json,*.css,*.less,*.sass,*.html,*.xml,*.erb,*.haml,*.feature :%s/\s\+$//e
11 zsh/zshrc
View
@@ -35,23 +35,24 @@ function gws {
## ALIAS
alias cpd="cap production deploy"
-alias ws="sed -i '' 's/[[:space:]]*$//g' $1"
-alias mysqlstart='sudo /opt/local/bin/mysqld_safe5 &'
alias pgstart="sudo -u postgres pg_ctl -D /usr/local/var/postgres start"
-alias mysqlstop='/opt/local/bin/mysqladmin5 -u root shutdown'
alias s='sudo'
alias l='gls -GHCl --color=auto'
alias ls='gls -GHCF --color=auto'
-alias ss='script/rails server'
-alias sc='script/rails console'
alias bi='bundle install'
alias be='bundle exec'
alias gap="git add -e"
alias gca="git commit -a -v"
+alias sc="script/rails console"
+alias ss="script/rails server"
+alias git=hub
alias g="git"
+alias gph="git push heroku"
+alias hdb="heroku run rake db:migrate"
alias ..="cd .."
alias ...="cd ..."
alias socks="ssh -C2qTnN -D 8080"
+alias h="heroku"
# PW MANAGER
PW_PATH="~/.pw.yml"
Please sign in to comment.
Something went wrong with that request. Please try again.