# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1266112815 21600
# Node ID 2a4efba0fe8b9a630f0ade2eed2e93bdb95e85e1
# Parent  1947b2c08f29b20d84d011ed4431d77307df71f8
emacs: move package bootstrap to its own file

diff --git a/.elisp/settings/00.bootstrap.el b/.elisp/settings/00.bootstrap.el
new file mode 100644
--- /dev/null
+++ b/.elisp/settings/00.bootstrap.el
@@ -0,0 +1,26 @@
+(add-to-list 'load-path (expand-file-name "~/.elisp"))
+(load "package")
+(package-initialize)
+
+(setq package-archives '(("durin42" . "http://home.durin42.com/elpa/")
+                         ("elpa" . "http://tromey.com/elpa/")))
+
+(defun af-bootstrap-packages ()
+  (interactive)
+  (unless package-archive-contents (package-refresh-contents))
+  (dolist (pack '(diff-mode-
+                  doctest-mode
+                  http-twiddle
+                  ipython
+                  nose
+                  ;; disabled until I don't need a modified version
+                  ;; textmate
+                  iedit
+                  ;; from elpa
+                  js2-mode
+                  paredit
+                  yaml-mode))
+    (unless (or (member pack package-activated-list)
+                (functionp pack))
+      (message "Installing %s" (symbol-name pack))
+      (package-install pack))))
diff --git a/.elisp/settings/10.require.el b/.elisp/settings/10.require.el
--- a/.elisp/settings/10.require.el
+++ b/.elisp/settings/10.require.el
@@ -4,32 +4,6 @@
 (setq ido-enable-flex-matching t)
 (ido-mode t)
 
-(load "package")
-(package-initialize)
-
-(setq package-archives '(("durin42" . "http://home.durin42.com/elpa/")
-                         ("elpa" . "http://tromey.com/elpa/")))
-
-(defun af-bootstrap-packages ()
-  (interactive)
-  (unless package-archive-contents (package-refresh-contents))
-  (dolist (pack '(diff-mode-
-                  doctest-mode
-                  http-twiddle
-                  ipython
-                  nose
-                  ;; disabled until I don't need a modified version
-                  ;; textmate
-                  iedit
-                  ;; from elpa
-                  js2-mode
-                  paredit
-                  yaml-mode))
-    (unless (or (member pack package-activated-list)
-                (functionp pack))
-      (message "Installing %s" (symbol-name pack))
-      (package-install pack))))
-
 (require 'python-mode)
 (require 'ipython)
 (require 'show-wspace)
diff --git a/.emacs b/.emacs
--- a/.emacs
+++ b/.emacs
@@ -4,10 +4,7 @@
 ;  Dave Anderson: https://ssl.natulte.net/hg/dotfiles/
 ;  Emacs Starter Kit: http://github.com/technomancy/emacs-starter-kit
 
-(add-to-list 'load-path (expand-file-name "~/.elisp"))
-
 ; Start the server so that emacsclient will work
-; TODO: is there a way to *not* start a server if one was already running?
 (server-start)
 
 (let ((settings-files (concat (getenv "HOME") "/.elisp/settings")))