# HG changeset patch
# User The Geek Inside <thegeek@thegeekinside.net>
# Date 1314381952 18000
# Node ID 23ac3d05892bec8ee80e3818f113bd010101b36d
# Parent  0bdf9bbe16efafd73f5d963e756595b2ca7e9669
A lot of changes

diff -r 0bdf9bbe16efafd73f5d963e756595b2ca7e9669 -r 23ac3d05892bec8ee80e3818f113bd010101b36d emacs/emacs
--- a/emacs/emacs	Fri Apr 29 09:07:19 2011 -0500
+++ b/emacs/emacs	Fri Aug 26 13:05:52 2011 -0500
@@ -1,3 +1,5 @@
+;; -*- mode: Emacs-Lisp; -*-
+;;
 ;; Emacs configuration file
 ;; 
 ;; Author: thegeekinside 
@@ -6,6 +8,10 @@
 ;; TODO: Revisar si se pueden usar rutas no-absolutas
 ;; TODO: Revisar si paso esta configuracion al archivo Preferences.el
 
+;; Marmalade
+(require 'package)
+(add-to-list 'package-archives
+	     '("marmalade" . "http://marmalade-repo.org/packages/"))
 
 ;; Miscellaneous
 (global-font-lock-mode 1)
@@ -20,9 +26,27 @@
 (require 'ssh)
 
 ;; CEDET
-(global-ede-mode 1)
-(require 'semantic/sb)
-(semantic-mode 1)
+(load-file (expand-file-name "~/Library/Application Support/Aquamacs Emacs/site-lisp/plugins/cedet-1.0/common/cedet.el"))
+(global-ede-mode 1)                      ; Enable the Project management system
+(semantic-load-enable-code-helpers)      ; Enable prototype help and smart completion
+;;(global-srecode-minor-mode 1)            ; Enable template insertion menu
+
+;; ECB
+(require 'ecb)
+
+;; SLIME
+(setq slime-lisp-implementations
+      '((sbcl ("/usr/local/bin/sbcl") :coding-system utf-8-unix)
+        (ccl ("/usr/local/ccl/dx86cl64" "-K utf-8"))))
+        
+(require 'slime-autoloads)
+(setq slime-net-coding-system 'utf-8-unix)
+(slime-setup '(slime-fancy))
+
+(add-hook 'slime-mode-hook
+	  (lambda ()
+	    (unless (slime-connected-p)
+	      (save-excursion (slime)))))
 
 ;; SCons support
 (setq auto-mode-alist
@@ -45,12 +69,38 @@
 (setq org-mobile-directory "~/Dropbox/MobileOrg")   
 
 ;; YASnippet
-(add-to-list 'load-path
-                  "/Users/thegeekinside/Library/Application Support/Aquamacs Emacs/plugins/yasnippet-0.6.1c")
-
 (require 'yasnippet) ;; not yasnippet-bundle
 (yas/initialize)
-(yas/load-directory "/Users/thegeekinside/Library/Application Support/Aquamacs Emacs/plugins/yasnippet-0.6.1c")
+(yas/load-directory (expand-file-name "~/Library/Application Support/Aquamacs Emacs/site-lisp/plugins/yasnippet-0.6.1c"))
+
+;; Color themes
+;; (require 'color-theme-tango)
+;; (color-theme-tango)
+
+;; (require 'color-theme-tangotango)
+;; (color-theme-tangotango)
+
+;; (require 'color-theme-inspiration-matrix)
+;; (color-theme-inspiration-matrix)
+
+;; (require 'color-theme-inspiration-tgi)
+;; (color-theme-inspiration-tgi)
+
+(require 'color-theme-inspiration-tgi-dark)
+(color-theme-inspiration-tgi-dark)
+
+;;(require 'color-theme-twilight)
+;;(color-theme-twilight)
+
+;; (require 'color-theme-gruber-darker)
+;; (color-theme-gruber-darker)
+
+;; (require 'color-theme-subdued)
+;; (color-theme-subdued)
+
+;; (require 'color-theme-less)
+;; (color-theme-less)
+
 
 ;; Haskell mode
 (add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
@@ -60,9 +110,17 @@
 ;;(speedbar-add-supported-extension ".hs")
 
 ;; Scala mode
-(add-to-list 'load-path "/Users/thegeekinside/Library/Application Support/Aquamacs Emacs/site-lisp/scala-mode")
 (require 'scala-mode-auto)
 
+;; SBT mode
+(load (expand-file-name "~/Library/Application Support/Aquamacs Emacs/site-lisp/modes/sbt.el"))
+
+;; Clojure mode
+(autoload 'clojure-mode "clojure-mode.el" 
+  "Major mode for editing Clojure code." t)
+(setq auto-mode-alist
+   (cons '("\\.clj" . clojure-mode) auto-mode-alist))
+
 ;; Groovy mode
 (autoload 'groovy-mode "groovy-mode" "Major mode for editing Groovy code." t)
 (add-to-list 'auto-mode-alist '("\.groovy$" . groovy-mode))
@@ -75,12 +133,42 @@
              (require 'groovy-electric)
              (groovy-electric-mode)))
 
+;; C# mode
+(autoload 'csharp-mode "csharp-mode.el" 
+  "Major mode for editing C# code." t) ;; TODO: Implementar completo este modo
+(setq auto-mode-alist
+   (cons '("\\.cs" . csharp-mode) auto-mode-alist))
+
+;; newLISP mode
+(autoload 'newlisp-mode "newlisp.el" 
+  "Major mode for editing newLISP code." t) ;; TODO: Implementar completo este modo
+(setq auto-mode-alist
+   (cons '("\\.lsp" . newlisp-mode) auto-mode-alist))
+
+;; Quack Scheme mode
+(require 'quack)
+
+;; Taskpaper mode
+(require 'taskpaper)
+
 ;; Markdown mode
 (autoload 'markdown-mode "markdown-mode.el"
    "Major mode for editing Markdown files" t)
 (setq auto-mode-alist
    (cons '("\\.markdown" . markdown-mode) auto-mode-alist))
 
+;; Muse mode
+(add-to-list 'load-path 
+	     (expand-file-name "~/Library/Application Support/Aquamacs Emacs/elpa/muse-3.20"))
+
+(require 'muse-mode)	; load authoring mode
+(require 'muse-html)	; load publishing styles I use 
+(require 'muse-latex) 
+(require 'muse-texinfo) 
+(require 'muse-docbook)
+
+(require 'muse-project) ; publish files in projects
+
 ;; INI mode
 (autoload 'ini-mode "ini-mode.el"
    "Major mode for editing INI files" t)
@@ -88,7 +176,6 @@
   (cons '("\\.[iI][nN][iI]$" . ini-mode) auto-mode-alist))
 
 ;; Twittering mode
-;;(add-to-list 'load-path "/Users/thegeekinside/Library/Application Support/Aquamacs Emacs/plugins/twittering-mode-2.0.0")
 ;;(require 'twittering-mode)
 
 ;; Hippie expand
@@ -103,9 +190,66 @@
 					 try-complete-lisp-symbol-partially 
 					 try-complete-lisp-symbol))
 
+;; Autopair mode
+(require 'autopair)
+(autopair-global-mode) ;; to enable in all buffers
+
+;; Folding mode
+;; (autoload 'folding-mode		 "folding" "Folding mode" t)
+;; (autoload 'turn-off-folding-mode "folding" "Folding mode" t)
+;; (autoload 'turn-on-folding-mode	 "folding" "Folding mode" t)
+
+(if (load "folding" 'nomessage 'noerror)
+    (folding-mode-add-find-file-hook))
+
+;; My commands
+;; (defun delete-line ()
+;;   (interactive)
+;;   (beginning-of-line)
+;;   (kill-line))
+
+;; Duplicate line
+;; TODO: Lograr que esta funcion copie regiones, no solo lineas
+(defun duplicate-line (arg) 
+  "Duplicate current line, leaving point in lower line." 
+  (interactive "*p") 
+  ;; save the point for undo 
+  (setq buffer-undo-list (cons (point) buffer-undo-list)) 
+  ;; local variables for start and end of line 
+  (let ((bol (save-excursion (beginning-of-line) (point))) 
+        eol) 
+    (save-excursion 
+      ;; don't use forward-line for this, because you would have 
+      ;; to check whether you are at the end of the buffer 
+      (end-of-line) 
+      (setq eol (point)) 
+      ;; store the line and disable the recording of undo information 
+      (let ((line (buffer-substring bol eol)) 
+            (buffer-undo-list t) 
+            (count arg)) 
+        ;; insert the line arg times 
+        (while (> count 0) 
+          (newline)         ;; because there is no newline in 'line' 
+          (insert line) 
+          (setq count (1- count))) 
+        ) 
+      ;; create the undo information 
+      (setq buffer-undo-list (cons (cons eol (point)) buffer-undo-list))) 
+    ) ; end-of-let 
+  ;; put the point in the lowest line and return 
+  (next-line arg)) 
+
 ;; Customize the keyboard
 ;;(setq mac-option-modifier nil)
 (setq mac-function-modifier 'meta) ; use function key as meta
 (define-key osx-key-mode-map (kbd "A-M-f") 'aquamacs-toggle-full-frame)
 (define-key osx-key-mode-map (kbd "<f7>") 'toggle-truncate-lines) ; truncate lines on-off
-(define-key osx-key-mode-map (kbd "M-/") 'hippie-expand) ; use hippie-expand instead dabbrev-expand
\ No newline at end of file
+(define-key osx-key-mode-map (kbd "M-/") 'hippie-expand) ; use hippie-expand instead dabbrev-expand
+(define-key osx-key-mode-map (kbd "A-d") 'duplicate-line) 
+;; (global-unset-key "\C-k")
+;; (global-set-key "\C-k" 'delete-line) ; use a "true" delete-line
+
+;; Aquamacs specific stuff
+;; (when (boundp 'aquamacs-version)
+;;    ... Aquamacs specific code ...
+;; )
diff -r 0bdf9bbe16efafd73f5d963e756595b2ca7e9669 -r 23ac3d05892bec8ee80e3818f113bd010101b36d git/gitconfig
--- a/git/gitconfig	Fri Apr 29 09:07:19 2011 -0500
+++ b/git/gitconfig	Fri Aug 26 13:05:52 2011 -0500
@@ -1,5 +1,5 @@
 [user]
-name = The Geek Inside
+	name = The Geek Inside
 email = thegeek@thegeekinside.net
 [diff]
 external = "/Applications/DeltaWalker.app/Contents/MacOS/git-diff"
diff -r 0bdf9bbe16efafd73f5d963e756595b2ca7e9669 -r 23ac3d05892bec8ee80e3818f113bd010101b36d hg/hgrc
--- a/hg/hgrc	Fri Apr 29 09:07:19 2011 -0500
+++ b/hg/hgrc	Fri Aug 26 13:05:52 2011 -0500
@@ -15,12 +15,14 @@
 fetch =
 progress =
 purge =
-crecord = $HGEXT_LOCAL/crecord/crecord
-hgpaste = $HGEXT_LOCAL/hgpaste/hgpaste.py
-qup     = $HGEXT_LOCAL/qup/qup.py
-config  = $HGEXT_LOCAL/hgconfig/hgext/config.py
-release = $HGEXT_LOCAL/release/release.py
-flow    = $HGEXT_LOCAL/hgflow/hgflow.py
+crecord  = $HGEXT_LOCAL/crecord/crecord
+paste    = $HGEXT_LOCAL/hg-paste/paste.py
+qup      = $HGEXT_LOCAL/qup/qup.py
+config   = $HGEXT_LOCAL/hgconfig/hgext/config.py
+release  = $HGEXT_LOCAL/release/release.py
+flow     = $HGEXT_LOCAL/hgflow/hgflow.py
+activity = $HGEXT_LOCAL/hgactivity/activity.py
+foreign  = $HGEXT_LOCAL/foreign/foreign.py
 
 [extdiff]
 # DeltaWalker configuration
@@ -47,6 +49,9 @@
 changes.executable = chdiff
 changes.args = --wait $local $other
 
+bbedit.executable = bbdiff
+bbedit.args = --wait $local $other
+
 # Araxis Merge configuration
 araxismergetool.premerge = False
 araxismergetool.args = $other $base $local $output
@@ -60,3 +65,7 @@
 
 [alias]
 qstat = qdiff --stat
+qpaste = paste -r qtip
+
+[defaults]
+paste = --dest lodgeit
diff -r 0bdf9bbe16efafd73f5d963e756595b2ca7e9669 -r 23ac3d05892bec8ee80e3818f113bd010101b36d zsh/zshrc
--- a/zsh/zshrc	Fri Apr 29 09:07:19 2011 -0500
+++ b/zsh/zshrc	Fri Aug 26 13:05:52 2011 -0500
@@ -45,11 +45,14 @@
 #TMAKE_HOME='/usr/local/tmake'
 export JAVA_HOME='/Library/Java/Home'
 export RACKET_HOME='/usr/local/racket'
-export SCALA_HOME='/usr/local/scala'
+export SCALA_HOME='/usr/local/typesafe-stack'
+export AKKA_HOME='/usr/local/typesafe-stack'
+export EMACS='/Applications/Aquamacs.app/Contents/MacOS/Aquamacs'
 # export PYTHON_HOME='/Library/Frameworks/Python.framework/Versions/2.7'
 export SCALATEST_HOME='/usr/local/scalatest'
 export SCALATE_HOME='/usr/local/scalate'
 export SBT_HOME='/usr/local/sbt'
+export CCL_DEFAULT_DIRECTORY='/usr/local/ccl'
 export CLOJURE_HOME="/usr/local/clojure"
 export GROOVY_HOME='/usr/local/groovy'
 export GRIFFON_HOME='/usr/local/griffon'
@@ -65,14 +68,18 @@
 export GWT2_HOME='/usr/local/gwt-2'
 export JETTY_HOME='/usr/local/jetty-6'
 export CATALINA_HOME='/usr/local/tomcat-6'
-export M2_HOME='/usr/share/maven'
+export NGINX_HOME='/usr/local/nginx'
+export M2_HOME='/usr/share/java/maven-2.2.1'
 export GANT_HOME='/usr/local/gant'
 export GRADLE_HOME='/usr/local/gradle'
 export DERBY_HOME='/usr/share/derby'
+export H2_HOME='/usr/local/h2'
 export ARCHIVA_HOME='/usr/local/archiva'
 export NATURALDOCS_HOME='/usr/local/NaturalDocs'
 export GIT_HOME='/usr/local/git'
 export VIOLET_UML_HOME='/usr/local/violet'
+export JMETER_HOME='/usr/local/jmeter'
+export GRINDER_HOME='/usr/local/grinder'
 export JMXSH_HOME='/usr/local/jmxsh'
 export BLOG_CONVERTERS='/usr/local/google-blog-converters'
 
@@ -102,6 +109,8 @@
 PYTHON_SCRIPTS="$HOME/Source/python/scripts/unix"
 PERL_SCRIPTS="$HOME/Source/perl/scripts/unix"
 RUBY_SCRIPTS="$HOME/Source/ruby/scripts/unix"
+GROOVY_SCRIPTS="$HOME/Source/groovy/Scripts/"
+SCALA_SCRIPTS="$HOME/Source/scala/Scripts/"
 
 RUBY_USRLOCAL_BIN="$HOME/.gem/ruby/1.9.1/bin"
 HASKELL_BIN="$HOME/Library/Haskell/bin"
@@ -111,7 +120,7 @@
 export GRADLE_OPTS="-Dorg.gradle.daemon=true"
 
 # Set the path variable
-path=( /usr/local/bin /usr/local/sbin $path )
+path=( $HOME/.local/bin /usr/local/bin /usr/local/sbin $path )
 path=( $path /usr/local/mysql/bin )
 path=( $path /usr/local/rar )
 path=( $path $GIT_HOME/bin )
@@ -119,6 +128,7 @@
 path=( $path $GRADLE_HOME/bin )
 path=( $M2_HOME/bin $path )
 path=( $path $DERBY_HOME/bin )
+path=( $path $H2_HOME/bin )
 path=( $path $RACKET_HOME/bin )
 path=( $path $SCALA_HOME/bin )
 # path=( $PYTHON_HOME/bin $path )
@@ -127,6 +137,7 @@
 path=( $path $ROO_HOME/bin )
 path=( $path $GROOVY_HOME/bin )
 path=( $path $GRIFFON_HOME/bin )
+path=( $path $CCL_DEFAULT_DIRECTORY/scripts )
 path=( $path $JRUBY_HOME/bin )
 path=( $path $JYTHON_HOME/bin )
 path=( $path $GOSU_HOME/bin )
@@ -137,18 +148,23 @@
 path=( $path $GLASSFISH_HOME/bin )
 path=( $path $GERONIMO_HOME/bin )
 path=( $path $CATALINA_HOME/bin )
+path=( $path $NGINX_HOME/sbin )
 path=( $path $APPENGINE_HOME/bin )
 path=( $path $GWT2_HOME )
 path=( $path $ARCHIVA_HOME/bin )
 path=( $path $NATURALDOCS_HOME )
 path=( $path $VIOLET_UML_HOME )
+path=( $path $JMETER_HOME/bin )
+path=( $path $GRINDER_HOME/bin )
 path=( $path $JMXSH_HOME )
 path=( $path $WLS_HOME/common/bin )
 path=( $path $DOMAIN_HOME )
 path=( ~/bin $path )
 path=( $PYTHON_SCRIPTS $path )
+path=( $PERL_SCRIPTS $path )
 path=( $RUBY_SCRIPTS $path )
-path=( $PERL_SCRIPTS $path )
+path=( $GROOVY_SCRIPTS $path )
+path=( $SCALA_SCRIPTS $path )
 path=( $path $RUBY_USRLOCAL_BIN )
 path=( $path $HASKELL_BIN )
 path=( $path $BLOG_CONVERTERS/bin )
@@ -199,7 +215,9 @@
 alias ports='sudo lsof -i -P'
 alias flushdns='dscacheutil -flushcache'
 alias xcp='cp -Rp'
-alias aq=aquamacs
+alias amacs=aquamacs
+alias pgrep=pcregrep
+alias mq='hg -R $(hg root)/.hg/patches'
 
 # Set Key Binding to vi mode
 # setopt vi
@@ -214,7 +232,7 @@
 
 # Make a directory and go to in.
 function take() {
-    mkdir $1
+    mkdir -p $1
     cd $1
 }