Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Latest changes

* Properly configure ZSH to work with tmux
* Added some experiments on Vim config files
* Some new aliases for the termina
  • Loading branch information...
commit 2368de1091d5ca40e81e6bf278c19431fc467083 1 parent b52ba4f
Francisco J authored
View
5 bash/bashrc
@@ -1,3 +1,2 @@
- [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # This loads RVM into a shell session.
-
-PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+export PATH="$HOME/.rbenv/bin:$PATH"
+eval "$(rbenv init -)"
View
22 gvimrc/vimrc
@@ -13,6 +13,7 @@ Bundle 'Textile-for-VIM'
Bundle 'tpope/vim-cucumber'
Bundle 'tpope/vim-haml'
Bundle 'tpope/vim-markdown'
+Bundle 'suan/vim-instant-markdown'
Bundle 'groenewege/vim-less'
Bundle 'pangloss/vim-javascript'
Bundle 'kchmck/vim-coffee-script'
@@ -26,6 +27,7 @@ Bundle 'gmarik/vundle'
Bundle 'mileszs/ack.vim'
Bundle 'tpope/vim-git'
Bundle 'tpope/vim-fugitive'
+Bundle 'airblade/vim-gitgutter'
Bundle 'tpope/vim-surround'
Bundle 'tpope/vim-ragtag'
@@ -45,6 +47,7 @@ Bundle 'scrooloose/nerdtree'
Bundle 'kien/ctrlp.vim'
Bundle 'xolox/vim-easytags'
+Bundle 'xolox/vim-misc'
Bundle 'tpope/vim-bundler'
Bundle 'jgdavey/tslime.vim'
@@ -57,11 +60,13 @@ Bundle "tomtom/tlib_vim"
Bundle "honza/snipmate-snippets"
Bundle "garbas/vim-snipmate"
+" Bundle "xolox/vim-notes"
+
" ******************************************************************************
" Make it pretty
" ******************************************************************************
if !has('gui_running')
- set background=light
+ set background=dark
let g:solarized_termtrans = 1
set guioptions=ac
endif
@@ -127,7 +132,7 @@ autocmd BufRead,BufNewFile {caprc,autotest,.caprc} set ft=ruby
" Filetype config for nginx conf files
autocmd BufRead,BufNewFile /opt/nginx/conf/* set ft=nginx
" Filetype config for octopress files
-autocmd BufRead,BufNewFile /projects/octopress/source/_posts/*.markdown set ft=octopress
+" autocmd BufRead,BufNewFile /projects/octopress/source/_posts/*.markdown set ft=octopress
" Set auto completion for ruby files
autocmd FileType ruby,eruby set omnifunc=rubycomplete#Complete
@@ -135,6 +140,12 @@ autocmd FileType ruby,eruby let g:rubycomplete_buffer_loading = 1
autocmd FileType ruby,eruby let g:rubycomplete_rails = 1
autocmd FileType ruby,eruby let g:rubycomplete_classes_in_global = 1
+" Set text width to 80 chars on markdown files
+au BufRead,BufNewFile *.md setlocal textwidth=80
+
+" Set spelling to Spanish for notes
+au BufRead,BufNewFile *.vimnotes.txt set spelllang=es_es
+
" Configuration for used plugins
let NERDTreeDirArrows=1
" Fixes incompatibility with NERDTree and vim-bundler
@@ -149,6 +160,10 @@ let g:yankring_manual_clipboard_check = 1
let g:Powerline_symbols = 'unicode'
" ctrlp mapping
let g:ctrlp_map = 'ff'
+" Vim notes plugin
+" let g:notes_directories = ['~/Dropbox/journal']
+" let g:notes_suffix = '.vimnotes.txt'
+" let g:notes_title_sync = 'rename_file'
" Some extras to rails.vim "{{{
autocmd User Rails Rnavcommand steps features/step_definitions -glob=**/*
@@ -212,3 +227,6 @@ function! s:PrettifyXml()
call setpos('.', l:save_cursor)
endfunction
command! PrettifyXml call <SID>PrettifyXml()
+
+" Abbreviations
+" iab <expr> dts strftime("%c")
View
19 ruby/gemrc
@@ -1,11 +1,12 @@
----
+---
+:benchmark: false
:verbose: true
-gem: --no-ri --no-rdoc
-:update_sources: true
-:sources:
- - http://gemcutter.org
- - http://gems.rubyforge.org/
- - http://gems.github.com
-:backtrace: false
+:sources:
+- http://gemcutter.org
+- http://gems.rubyforge.org/
+- http://gems.github.com
+- http://rubygems.org
:bulk_threshold: 1000
-:benchmark: false
+:backtrace: false
+:update_sources: true
+gem: --no-ri --no-rdoc
View
1  ruby/irbrc
@@ -1,6 +1,7 @@
#!/usr/bin/ruby
# require 'rubygems'
+# require 'interactive_editor'
# require 'pry'
#
# # Use pry for the console if it exists
View
1  zsh/zprofile
@@ -0,0 +1 @@
+eval "$(rbenv init -)"
View
53 zsh/zshrc
@@ -2,58 +2,37 @@
export ZSH=$HOME/.oh-my-zsh
-# export ZSH_THEME="eastwood"
-# export ZSH_THEME="gallois"
export ZSH_THEME="candy"
export DISABLE_AUTO_TITLE=true
+export ZSH_TMUX_AUTOSTART=true
+export ZSH_TMUX_FIXTERM=false
+export ZSH_TMUX_AUTOQUIT=false
-plugins=(git gem rails3)
+plugins=(git gem rails3 tmux bundler rbenv vundle)
source $ZSH/oh-my-zsh.sh
-export PATH="$HOME/bin:/usr/local/Cellar/bin:/usr/local/bin:/usr/local/sbin:/usr/local/mysql/bin:/usr/local/git/bin:$PATH"
+if [[ -z $TMUX ]]; then
+ export PATH="$HOME/bin:$HOME/.rbenv/bin:/usr/local/bin:/usr/local/sbin:$PATH"
+ eval "$(rbenv init -)"
+ ### Added by the Heroku Toolbelt
+ export PATH="/usr/local/heroku/bin:$PATH"
+fi
+
+export RBENV_ROOT="$HOME/.rbenv"
-# # Load android-sdk installed from homebrew
-# export ANDROID_SDK_ROOT=/usr/local/Cellar/android-sdk/r21.0.1
-# export ANDROID_HOME=/usr/local/Cellar/android-sdk/r21.0.1
-# Node.js load path
-export NODE_PATH=/usr/local/lib/node_modules
# Set Vim as the default editor
export EDITOR='vim'
-export PAGER='/usr/local/bin/vimpager'
-
-# Load RVM
-rvm_project_rvmrc=1
-unsetopt auto_name_dirs
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
# Load tmuxinator
[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
+# Load NVM
+[[ -s /home/flamel/.nvm/nvm.sh ]] && . /home/flamel/.nvm/nvm.sh
-# Load autojump
-# if [ -f `brew --prefix`/etc/autojump ]; then
-# . `brew --prefix`/etc/autojump
-# fi
-
-
+alias rake="bundle exec rake"
alias migrate="rake db:migrate db:test:clone"
-alias p="powder"
-alias annotate="annotate --exclude tests,fixtures --position after --show-indexes --simple-indexes"
-alias be="bundle exec"
-alias rst="touch tmp/restart.txt"
alias git="hub"
alias cu='bundle exec cucumber'
+alias tcu='CUCUMBER_FORMAT=pretty bundle exec cucumber'
alias cucumber='bundle exec cucumber'
alias rspec='bundle exec rspec'
-
-alias nginxconf='_ mvim /opt/nginx/conf/nginx.conf'
-alias redisserv='redis-server /usr/local/etc/redis.conf'
-alias nginx='rvmsudo /opt/nginx/sbin/nginx'
-
-alias less=$PAGER
-alias zless=$PAGER
-
-PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
-
-### Added by the Heroku Toolbelt
-export PATH="/usr/local/heroku/bin:$PATH"
Please sign in to comment.
Something went wrong with that request. Please try again.