Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles

Conflicts:
	.crontab

1 files changed, 21 insertions, 12 deletions

diff --git a/.emacs b/.emacs
index d2c5323..09c80f8 100644
--- a/.emacs
+++ b/.emacs
@@ -28,17 +28,7 @@
      (eval-print-last-sexp))))
 
 (setq el-get-sources
-      '(el-get
-        package
-        rainbow-delimiters
-        php-mode-improved
-        mmm-mode
-        dtrt-indent
-        magit
-        coffee-mode
-        folding
-        apel flim semi wanderlust
-        (:name scss-mode
+      '((:name scss-mode
                :url "git://github.com/antonj/scss-mode.git"
                :after (lambda ()
                         (setq scss-compile-at-save nil)))
@@ -76,8 +66,27 @@
                         (autopair-global-mode 1)
                         (setq autopair-autowrap t)))
         ))
+
+(setq lts-el-get-packages
+      '(el-get
+        package
+        rainbow-delimiters
+        php-mode-improved
+        mmm-mode
+        dtrt-indent
+        magit
+        coffee-mode
+        folding
+        apel flim semi wanderlust
+        scss-mode
+        color-theme color-theme-solarized
+        org-mode
+        identica-mode
+        smarttabs
+        autopair))
+                            
 (when (require 'el-get nil t)
-  (el-get 'sync))
+  (el-get 'sync lts-el-get-packages))
 
 (add-hook 'text-mode-hook 'turn-on-auto-fill)
 (add-hook 'after-make-frame-functions