# HG changeset patch
# User The Geek Inside <thegeek@thegeekinside.net>
# Date 1304086039 18000
# Node ID 0bdf9bbe16efafd73f5d963e756595b2ca7e9669
# Parent  633d7a92fc5031c2b62a7b92af59da9030c60309
Emacs dotfile added

diff -r 633d7a92fc5031c2b62a7b92af59da9030c60309 -r 0bdf9bbe16efafd73f5d963e756595b2ca7e9669 emacs/emacs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/emacs/emacs	Fri Apr 29 09:07:19 2011 -0500
@@ -0,0 +1,111 @@
+;; Emacs configuration file
+;; 
+;; Author: thegeekinside 
+;;
+
+;; TODO: Revisar si se pueden usar rutas no-absolutas
+;; TODO: Revisar si paso esta configuracion al archivo Preferences.el
+
+
+;; Miscellaneous
+(global-font-lock-mode 1)
+;; (desktop-save-mode 1)
+(put 'downcase-region 'disabled nil)
+(setq make-backup-files nil) ; stop creating those backup~ files
+(setq auto-save-default nil) ; stop creating those #autosave# files
+(setq delete-by-moving-to-trash t) ; deleting files goes to OS's trash folder
+(setq inhibit-startup-echo-area-message t) ; don't show the startup message
+
+;; SSH support
+(require 'ssh)
+
+;; CEDET
+(global-ede-mode 1)
+(require 'semantic/sb)
+(semantic-mode 1)
+
+;; SCons support
+(setq auto-mode-alist
+      (cons '("SConstruct" . python-mode) auto-mode-alist))
+(setq auto-mode-alist
+      (cons '("SConscript" . python-mode) auto-mode-alist))
+
+;; Mercurial support
+(require 'mercurial)
+
+;; sr-speedbar
+;; (require 'sr-speedbar) ;; TODO: Revisar por que no funciona 
+
+;; Org and MoblieOrg support
+;; Set to the location of my Org files
+(setq org-directory "~/Documents/Org")
+;; Set to the name of the file where new notes will be stored
+(setq org-mobile-inbox-for-pull "~/Documents/Org/flagged.org")
+;; Set to <my Dropbox root directory>/MobileOrg.
+(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")
+
+;; Haskell mode
+(add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
+(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
+;;(add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
+;;(add-hook 'haskell-mode-hook 'turn-on-haskell-simple-indent)
+;;(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)
+
+;; Groovy mode
+(autoload 'groovy-mode "groovy-mode" "Major mode for editing Groovy code." t)
+(add-to-list 'auto-mode-alist '("\.groovy$" . groovy-mode))
+(add-to-list 'auto-mode-alist '("\.gradle$" . groovy-mode))
+(add-to-list 'interpreter-mode-alist '("groovy" . groovy-mode))
+
+;;; make Groovy mode electric by default.
+(add-hook 'groovy-mode-hook
+          '(lambda ()
+             (require 'groovy-electric)
+             (groovy-electric-mode)))
+
+;; 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))
+
+;; INI mode
+(autoload 'ini-mode "ini-mode.el"
+   "Major mode for editing INI files" t)
+(setq auto-mode-alist 
+  (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
+(setq hippie-expand-try-functions-list '(try-expand-dabbrev 
+					 try-expand-dabbrev-all-buffers 
+					 try-expand-dabbrev-from-kill 
+					 try-complete-file-name-partially 
+					 try-complete-file-name 
+					 try-expand-all-abbrevs 
+					 try-expand-list 
+					 try-expand-line 
+					 try-complete-lisp-symbol-partially 
+					 try-complete-lisp-symbol))
+
+;; 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
diff -r 633d7a92fc5031c2b62a7b92af59da9030c60309 -r 0bdf9bbe16efafd73f5d963e756595b2ca7e9669 hg/hgrc
--- a/hg/hgrc	Sun Apr 24 19:04:43 2011 -0500
+++ b/hg/hgrc	Fri Apr 29 09:07:19 2011 -0500
@@ -17,9 +17,10 @@
 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
+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
 
 [extdiff]
 # DeltaWalker configuration
diff -r 633d7a92fc5031c2b62a7b92af59da9030c60309 -r 0bdf9bbe16efafd73f5d963e756595b2ca7e9669 zsh/zshrc
--- a/zsh/zshrc	Sun Apr 24 19:04:43 2011 -0500
+++ b/zsh/zshrc	Fri Apr 29 09:07:19 2011 -0500
@@ -218,4 +218,3 @@
     cd $1
 }
 
-