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

Conflicts:
	.crontab

4 files changed, 33 insertions, 16 deletions

diff --git a/.crontab b/.crontab
index 77e6afe..d4e21e0 100644
--- a/.crontab
+++ b/.crontab
@@ -1,3 +1,2 @@
 # m	h	dom	mon	dow	command
-#*/5	*	*	*	*	offlineimap -u quiet
 */5	*	*	*	*	cd $HOME && make -k
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
diff --git a/.profile b/.profile
index bc8d481..004b7a2 100644
--- a/.profile
+++ b/.profile
@@ -9,9 +9,12 @@
 umask 022
 
 # set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/.prefix/bin" ]; then
-    export PATH="$HOME/.prefix/bin:$PATH"
-fi
+bins=`echo $HOME/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin`
+for dir in $bins; do
+    if [ -d "$dir" ]; then
+	export PATH="$dir:$PATH"
+    fi
+done
 
 if [ -d "$HOME/tmp"]; then
     export TMPDIR="$HOME/tmp"
diff --git a/Makefile b/Makefile
index 0efe771..da553de 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,12 @@ clean:
 	cat $^ | crontab -
 	date > '$@'
 
+# don't do anything, just create these if they doesn't exist
+.crontab.local:
+	touch '$@'
+Maildir:
+	mkdir -p '$@'/{cur,new,tmp}
+
 commit:
 	git commit -a