.gitmodules fish/bin/edit_gem fish/bin/gem_doc fish/bin/parse_db_yml fish/completions/cap.fish fish/completions/cdgem.fish fish/completions/createdb.fish fish/completions/cucumber.fish fish/completions/dropdb.fish fish/completions/edit_gem.fish fish/completions/gem_doc.fish fish/completions/git-svn.fish fish/completions/git.fish fish/completions/pg_dump.fish fish/completions/psql.fish fish/completions/rake.fish fish/completions/rcd.fish fish/completions/rmate.fish fish/config.fish fish/functions/__completion_cache_path.fish fish/functions/__db_list.fish fish/functions/__db_list_pg.fish fish/functions/__db_list_web.fish fish/functions/__detect_webapp.fish fish/functions/__sinatra_app.fish fish/functions/c.fish fish/functions/cdgem.fish fish/functions/clean_rake_cache.fish fish/functions/confirm.fish fish/functions/deplol.fish fish/functions/eprof.fish fish/functions/fish_prompt.fish fish/functions/fish_title.fish fish/functions/ga.fish fish/functions/gau fish/functions/gc.fish fish/functions/gca.fish fish/functions/gco.fish fish/functions/gd.fish fish/functions/gdc..fish fish/functions/gdc.fish fish/functions/git_cwd_info.fish fish/functions/git_dirty.fish fish/functions/git_dirty_files_count.fish fish/functions/git_parse_branch.fish fish/functions/gl.fish fish/functions/glc.fish fish/functions/glcg.fish fish/functions/glp.fish fish/functions/gps.fish fish/functions/gst.fish fish/functions/log.fish fish/functions/m.fish fish/functions/migrate.fish fish/functions/migration.fish fish/functions/mysqlbackup.fish fish/functions/netpid.fish fish/functions/new_function.fish fish/functions/rcd.fish fish/functions/rdir.fish fish/functions/rmate.fish fish/functions/s.fish fish/functions/save.fish fish/functions/sc.fish fish/functions/ss.fish fish/functions/sshkey.fish fish/functions/tigs.fish fish/functions/vi.fish @@ -1,5 +1,5 @@ alias gem='sudo gem' # sick of always forgetting sudo -alias ls='ls -G' +alias ls='ls -FG' alias ll='ls -lah' alias ..='cd ..;' # can then do .. .. .. to move up multiple directories. alias ...='.. ..' @@ -7,14 +7,18 @@ alias g='grep -i' #case insensitive grep alias h='history|g' alias ducks='du -cks * | sort -rn|head -11' # Lists the size of all the folders alias top='top -o cpu' -alias systail='tail -f /var/log/system.log' alias m='mate .' alias o='open .' alias et="m" alias home='cd ~' # the tilda is too hard to reach +alias systail='tail -f -n0 /var/log/system.log' +alias aptail='tail -f -n0 /var/log/apache*/*log' +alias l='ls' +alias b='cd -' + alias c='clear' # shortcut to clear your terminal -alias eprof='mate ~/.dot-files' + alias sprof='source ~/.bash_profile' # useful command to find what you should be aliasing: @@ -30,25 +34,58 @@ alias controller='script/generate controller' alias migration='script/generate migration' alias migrate='rake db:migrate' alias rollback='rake db:rollback' +alias r='rake' +alias webshare='python -c "import SimpleHTTPServer;SimpleHTTPServer.test()"' -alias startpg='sudo /Library/StartupItems/PostgreSQL/PostgreSQL start' +alias pubkey='cat ~/.ssh/*.pub' # replacement netstat cmd to find ports used by apps on OS X alias netstat="sudo lsof -i -P" -alias hidefile='/usr/bin/SetFile -a "V"' -alias showfile='/usr/bin/SetFile -a "v"' - alias colorslist="set | egrep 'COLOR_\w*'" # lists all the colors function f() { find * -name $1; } -function manpdf() { man -t $@ | open -f -a Preview; } +function extract() { + if [ -f $1 ] ; then + case $1 in + *.tar.bz2) tar xvjf $1 ;; + *.tar.gz) tar xvzf $1 ;; + *.bz2) bunzip2 $1 ;; + *.rar) unrar x $1 ;; + *.gz) gunzip $1 ;; + *.tar) tar xvf $1 ;; + *.tbz2) tar xvjf $1 ;; + *.tgz) tar xvzf $1 ;; + *.zip) unzip $1 ;; + *.Z) uncompress $1 ;; + *.7z) 7z x $1 ;; + *) echo "'$1' cannot be extracted via >extract<" ;; + esac + else + echo "'$1' is not a valid file" + fi +} -function osinfo() { - x1="$(/usr/bin/sw_vers -productName)" - x2="$(/usr/bin/sw_vers -productVersion)" - x3="$(/usr/bin/sw_vers -buildVersion)" - x4="$(/usr/bin/arch)" - echo "${x1} - ${x2} - ${x3} - ${x4}" -} \ No newline at end of file +if [ $system_name == 'Darwin' ]; then + function manpdf() { man -t $@ | open -f -a Preview; } + function osinfo() { + x1="$(/usr/bin/sw_vers -productName)" + x2="$(/usr/bin/sw_vers -productVersion)" + x3="$(/usr/bin/sw_vers -buildVersion)" + x4="$(/usr/bin/arch)" + echo "${x1} - ${x2} - ${x3} - ${x4}" + } + alias ls='ls -G' + alias pubkey='cat ~/.ssh/*.pub | pbcopy && echo "Keys copied to clipboard"' + alias m='mate .' + alias et="m" + alias o='open .' + alias eprof="mate ~/.dot-files" + alias hidefile='/usr/bin/SetFile -a "V"' + alias showfile='/usr/bin/SetFile -a "v"' + alias startpg='sudo /Library/StartupItems/PostgreSQL/PostgreSQL start' + alias readrails="mate `ruby -rubygems -e "puts( ['rails', 'activerecord', 'activeresource', 'actionpack', 'activesupport'].collect { |gem| gems = Gem.source_index.find_name(gem); gems.last.full_gem_path; }.join(' '))"`" +else + alias ls='ls --color=auto' +fi aliases @@ -1,12 +1,24 @@ +system_name=`uname -s` # Sets 'Darwin' or 'Linux' etc + source ~/.exports -# source ~/.bash_completion source ~/.gitrc -source ~/.gemdoc source ~/.aliases -source ~/.terminal source ~/.save-directory -export PS1='$(__git_ps1 "\[${COLOR_RED}\](%s)\[${COLOR_NC}\] ")\$ ' +if [ $system_name == 'Darwin' ]; then + source ~/.gemdoc + source ~/.terminal +else + if [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi + +export PS1=' [`pwd`$(__git_ps1 " \[${COLOR_RED}\](%s)\[${COLOR_NC}\]")]\n$ ' + +function __pair_status { + hitchstatus " %s"; +} # readline settings bind "set completion-ignore-case on" @@ -15,5 +27,6 @@ bind "set show-all-if-ambiguous On" # this allows you to automatically show comp shopt -s checkwinsize shopt -s histappend +shopt -s globstar -complete -C ~/.rake-completion.rb -o default rake \ No newline at end of file +complete -C ~/.rake-completion.rb -o default rake} bashrc @@ -1,9 +1,23 @@ -export PATH="/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/:$PATH" -export PATH="/Library/PostgreSQL8/bin/:$PATH" +if [ $system_name == 'Darwin' ]; then + export EDITOR='mate -w' + export PATH="/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/:$PATH" + export PATH="/Library/PostgreSQL8/bin/:$PATH" + export CDPATH='.:~:~/Projecs:~/Sites' + export GEM_OPEN_EDITOR='mate' +else + export EDITOR='nano -w' +fi + export PATH="/usr/local/mysql/bin/:$PATH" -export PATH=/opt/local/bin:/opt/local/sbin:$PATH +export PATH="/opt/local/bin:/opt/local/sbin:$PATH" +export PATH="$PATH:/usr/local/jruby/bin" + + export IRBRC="$HOME/.irbrc" +export GIT_EDITOR=$EDITOR +export VISUAL=$EDITOR + export COLOR_NC='\e[0m' # No Color export COLOR_WHITE='\e[1;37m' export COLOR_BLACK='\e[0;30m' @@ -25,14 +39,10 @@ export COLOR_LIGHT_GRAY='\e[0;37m' export TERM=xterm-color export GREP_OPTIONS='--color=auto' GREP_COLOR='1;32' export CLICOLOR=1 -export EDITOR='mate -w' -export GIT_EDITOR=$EDITOR -export VISUAL=$EDITOR # sets title of window to be user@host export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*} ${PWD}"; echo -ne "\007"' -export BASH_COMPLETION='~/.bash_completion' - # export HISTCONTROL=erasedups # I actually want duplicates because of profileme -export HISTSIZE=1000000 \ No newline at end of file +export HISTSIZE=1000000 + exports @@ -1,10 +1,10 @@ --- +:benchmark: false :gem: --no-ri --no-rdoc :verbose: true :update_sources: true +:bulk_threshold: 1000 +:backtrace: false :sources: - http://gems.rubyforge.org/ - http://gems.github.com/ -:backtrace: false -:bulk_threshold: 1000 -:benchmark: false gemrc @@ -20,3 +20,12 @@ excludesfile = ~/.gitignore whitespace = fix +[github] + user = bjeanes + token = df574517df9e5cef449ff0010fdce8b6 +[push] + default = matching +[codebase] + username = bjeanes + domain = mocra.codebasehq.com + apikey = 5f1pkluckqk82ip9if8jomfbfxi38ofbn2keiata gitconfig @@ -8,4 +8,49 @@ pkg/* *.move1v3 *~ log/* -tmp/**/* \ No newline at end of file +tmp/**/* +# use glob syntax. +syntax: glob +*.ser +*.class +*~ +*.bak +*.off +*.old +.DS_Store + +# logs +derby.log + +# eclipse conf file +.settings +.classpath +.project +.manager + +# building +target +build +null +tmp* +temp* +dist +test-output + +# other scm +.svn +.CVS +.hg* + +# switch to regexp syntax. +# syntax: regexp +# ^\.pc/ + + +# IntelliJ +*.iml +*.ipr +*.iws + +# Rubymine +.idea \ No newline at end of file gitignore @@ -1,10 +1,11 @@ -# require 'wirble' +require 'pp' require 'rubygems' require 'wirble' Wirble.init(:history_size => 10000) Wirble.colorize +=begin Wirble::Colorize.colors = { # delimiter colors :comma => :white, @@ -38,6 +39,7 @@ Wirble::Colorize.colors = { :class => :red, :range => :light_blue, } +=end class Object # Return a list of methods defined locally for a particular object. Useful @@ -46,4 +48,10 @@ class Object def local_methods(obj = self) (obj.methods - obj.class.superclass.instance_methods).sort end -end \ No newline at end of file +end + +# Log to STDOUT if in Rails +if ENV.include?('RAILS_ENV') && !Object.const_defined?('RAILS_DEFAULT_LOGGER') + require 'logger' + RAILS_DEFAULT_LOGGER = Logger.new(STDOUT) +end irbrc @@ -1,5 +1,8 @@ # From http://codesnippets.joyent.com/posts/show/1516 +declare -x PROMPT_COMMAND='printf "\e]0;$(/bin/pwd | /usr/bin/tr -d "[[:cntrl:]]") \a"' + + # Minimise terminal window to Dock function mintw() { printf "\e[2t"; return 0; } @@ -48,12 +51,6 @@ function maxr() { printf "\e[3;0;0;t\e[8;0;100t"; /usr/bin/clear; return 0; } # show number of lines & columns function lc() { printf "lines: $(/usr/bin/tput lines)\ncolums: $(/usr/bin/tput cols)\n"; return 0; } -unset -v TITLE PROMPT_COMMAND -declare -x TITLE="Terminal" -declare -x PROMPT_COMMAND='printf "\e]0;${TITLE}\a"' - -function title() { declare -x TITLE="$@"; } - # open a new Terminal window in same location as current directory unset -f newin function newin() { terminal 8eccc2c17229cf676c32799f31a306e807b321f3 4f41f9279a4e6891674cb0e1d6f5cc87026cab35 Bodaniel Jeanes me@bjeanes.com http://github.com/bjeanes/dot-files/commit/92adb0a28979b1cf11129284a5a6e8de836ed06c 92adb0a28979b1cf11129284a5a6e8de836ed06c 2009-06-12T18:48:28-07:00 2009-06-12T18:48:28-07:00 Merge branch 'master' of git@github.com:bjeanes/dot-files * 'master' of git@github.com:bjeanes/dot-files: More fish config Renamed a lot of @ben_h's git aliases to the ones used at the office Added stuff from fish-nuggets and changed behaviour of a few Fish configuration from benhoskings Lots of changes over last few weeks the colorize option for ls is different on linux and darwin Reorganising slightly to hopefully work on Linux Conflicts: aliases 2bcec4a0fef0abd05b5cafb9a1c80dcdea139a44 Bodaniel Jeanes me@bjeanes.com