.site-lisp/color-theme-subdued.el .site-lisp/feature-mode/feature-mode.el .site-lisp/feature-mode/snippets/feature-mode/and .site-lisp/feature-mode/snippets/feature-mode/fea .site-lisp/feature-mode/snippets/feature-mode/giv .site-lisp/feature-mode/snippets/feature-mode/sce .site-lisp/feature-mode/snippets/feature-mode/the .site-lisp/feature-mode/snippets/feature-mode/whe .site-lisp/haml-mode.el .site-lisp/magit .site-lisp/mode-compile.el .site-lisp/rspec-mode/.gitignore .site-lisp/rspec-mode/rspec-mode-expectations.el .site-lisp/rspec-mode/rspec-mode.el .site-lisp/sass-mode.el .site-lisp/smex @@ -75,34 +75,34 @@ (require 'yaml-mode) (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode)) ;; Rinari (rails helpers) -(add-to-list 'load-path (concat home-dir ".site-lisp/rinari")) -(require 'rinari) +;;; (add-to-list 'load-path (concat home-dir ".site-lisp/rinari")) +;;; (require 'rinari) ;; Markdown mode -(add-to-list 'load-path (concat home-dir ".site-lisp/markdown-mode")) -(require 'markdown-mode) +;;(add-to-list 'load-path (concat home-dir ".site-lisp/markdown-mode")) +;;(require 'markdown-mode) ;; magit -(add-to-list 'load-path (concat home-dir ".site-lisp/magit")) -(require 'magit) -(global-set-key "\C-c\C-v" 'magit-status) +;;; (add-to-list 'load-path (concat home-dir ".site-lisp/magit")) +;;; (require 'magit) +;;; (global-set-key "\C-c\C-v" 'magit-status) ;; egg ;(add-to-list 'load-path (concat home-dir ".site-lisp/egg")) ;(require 'egg) ;; yasnippet ;(add-to-list 'load-path (concat home-dir ".site-lisp/yasnippet-0.5.7")) -(require 'yasnippet) -(yas/initialize) -(yas/load-directory (concat home-dir ".site-lisp/snippets")) +;;; (require 'yasnippet) +;;; (yas/initialize) +;;; (yas/load-directory (concat home-dir ".site-lisp/snippets")) ;; closure mode -(add-to-list 'load-path (concat home-dir "/projects/resources/clojure/clojure-mode")) -(setq inferior-lisp-program "~/bin/clj") -;(require 'clojure-auto) -(autoload 'clojure-mode "clojure-mode" "A major mode for Clojure" t) -;; php mode -(setq auto-mode-alist - (cons '("\\.php\\w?" . html-mode) auto-mode-alist)) -(setq auto-mode-alist - (cons '("\\.inc" . html-mode) auto-mode-alist)) +;;; (add-to-list 'load-path (concat home-dir "/projects/resources/clojure/clojure-mode")) +;;; (setq inferior-lisp-program "~/bin/clj") +;;; ;(require 'clojure-auto) +;;; (autoload 'clojure-mode "clojure-mode" "A major mode for Clojure" t) +;;; ;; php mode +;;; (setq auto-mode-alist +;;; (cons '("\\.php\\w?" . html-mode) auto-mode-alist)) +;;; (setq auto-mode-alist +;;; (cons '("\\.inc" . html-mode) auto-mode-alist)) ;(require 'toggle) ;(require 'autotest) @@ -325,3 +325,25 @@ buffer read-only, so I suggest setting kill-read-only-ok to t." (setenv "PATH" (concat "/opt/local/bin:/usr/local/bin:" (getenv "PATH"))) (push "/opt/local/bin" exec-path)) + + +;;; This was installed by package-install.el. +;;; This provides support for the package system and +;;; interfacing with ELPA, the package archive. +;;; Move this code earlier if you want to reference +;;; packages in your .emacs. +(when + (load + (expand-file-name "~/.emacs.d/elpa/package.el")) + (package-initialize)) + + +;;; This was installed by package-install.el. +;;; This provides support for the package system and +;;; interfacing with ELPA, the package archive. +;;; Move this code earlier if you want to reference +;;; packages in your .emacs. +(when + (load + (expand-file-name "~/.emacs.d/elpa/package.el")) + (package-initialize)) .emacs @@ -1 +1 @@ -Subproject commit 3b1d1fe36621ac927bee9755a08977e98e3f5b1a +Subproject commit 1dd749f558985a408bc1ac47b88f7634807e4767 .site-lisp/rinari @@ -35,8 +35,8 @@ setopt SHARE_HISTORY # share history between open shells ### # Setup vars ### -PATH=~/bin:"/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/local/sbin/:/opt/local/lib/postgresql83/bin/:$PATH" - +PATH="/Users/bwilson/bin:/Users/bwilson/.gem/ruby/1.8/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/local/sbin/:/opt/local/lib/postgresql83/bin/:$PATH" +#PATH=~/projects/readingeggs/vendor/plugins/cucumber/bin:$PATH export PATH TZ="Australia/Sydney" @@ -44,11 +44,11 @@ HISTFILE=$HOME/.zsh_history HISTSIZE=10000 SAVEHIST=10000 HOSTNAME="`hostname`" -REPORTTIME=10 # print elapsed time when more than 10 seconds +REPORTTIME=120 # print elapsed time when more than 10 seconds export PAGER='less' export SHELL="/bin/zsh" -export RUBYLIB="/Users/brad/projects/scripts/lib" +export RUBYLIB="~/projects/scripts/lib" export EDITOR="emacsclient" export GIT_EDITOR="emacsclient" @@ -103,7 +103,7 @@ alias l="ls -laFhG" alias m="mate ." alias mw="mate -w" alias myip="ifconfig | grep 192.168 || ifconfig | grep 10.32" -alias psg="ps ax | grep " +alias psg="ps ax | grep -i " alias wget="wget -c" alias top="top -o cpu" alias mtop="top -o rsize" @@ -118,10 +118,14 @@ alias pgstart="sudo /opt/local/etc/LaunchDaemons/org.macports.postgresql83-serve alias pgstop="sudo /opt/local/etc/LaunchDaemons/org.macports.postgresql83-server/postgresql83-server.wrapper stop" # rails helpers -alias ss="rm -f log/development.log; rm -f log/test.log* ; thin start" -alias ssd="rm -f log/development.log && ./script/server webrick --debugger" +alias ss="rm -f log/*.log; thin start" +alias ssd="rm -f log/*.log; ./script/server webrick --debugger" alias mdmu="rake db:migrate VERSION=0; rake db:migrate; rake db:test:clone" alias test_timer="rake TIMER=true 2>/dev/null | grep \" - \" | sort -r | head -n 20" +alias s="spec -f p spec/models" +alias c="cucumber" +alias lunchtime="~/bin/recov" +alias rg="rake routes | grep -i" # svn helpers alias sst="svn st" @@ -134,14 +138,15 @@ alias srp="svn propset svn:ignore '*.log' log/ && svn propset svn:ignore '*.db' # git helpers alias gst='git status' -alias gl='git pull' -alias gp='git push' +alias gl='git pull origin staging' +alias gp='git push origin staging' alias gd='git diff | mate' alias gc='git commit -v' alias gca='git commit -v -a' alias gb='git branch' alias gba='git branch -a' alias gpcd='git push && cap deploy' +alias gr="git reset --hard HEAD" #heroku helpers alias hp="git push heroku master" @@ -274,11 +279,14 @@ then fi -source /Users/brad/.profile - +if [ -s ~/.profile ] ; then + source .profile +fi # # RVM if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; # rvm system; fi + +cd ~/projects/readingeggs .zshrc .site-lisp/haml-mode.el .site-lisp/sass-mode.el 15352f93570977365abb3bf78375a24d202c827e Brad Wilson brad.wilson@blake.com.au http://github.com/bradx3/dotfiles/commit/172e1a9fe8790e86ac598176ab75b50b643ca6c3 172e1a9fe8790e86ac598176ab75b50b643ca6c3

2009-10-20T20:18:13-07:00

changes to zshrc for work, add in a bunch of emacs .site-lisp stuff 934120b3d02aad99f3592dbd0a6fed0b0ad1c0cb Brad Wilson brad.wilson@blake.com.au