1 files changed, 32 insertions, 50 deletions
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 83b622d..2ec87da 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,50 +1,32 @@
-;; no menu
-(menu-bar-mode -1)
-
-;; show parenthesis
-(show-paren-mode +1)
-
-;; no color
-(global-font-lock-mode -1)
-
-;; and lose the stupid pipe chars on the split-screen bar
-(set-face-foreground 'vertical-border "white")
-(set-face-background 'vertical-border "white")
-
-;; alias yes-or-no to y-or-n
-(fset 'yes-or-no-p 'y-or-n-p)
-
-;; set utf-8 as the default encoding
-(prefer-coding-system 'utf-8-unix)
-
-(autoload 'ibuffer "ibuffer" "List buffers." t)
-
-;;; set some variables
-;; add a new line at the end of the file
-(setq
- auto-save-default nil
- auto-save-list-file-prefix nil
- frame-title-format '(buffer-file-name "%f" ("%b"))
- inhibit-startup-message t
- make-backup-files nil
- require-final-newline t
- tab-always-indent 'complete
- vc-follow-symlinks t)
-
-;; twitter's default
-(setq-default
- c-basic-offset 2
- indent-tabs-mode nil
- python-indent-offset 2
- scala-indent:use-javadoc-style t
- sh-basic-offset 2
- sh-indentation 2)
-
-;;; some bindings
-(global-set-key (kbd "M-j") 'join-line)
-(global-set-key (kbd "C-x C-b") 'ibuffer)
-
-;;; if our version is >= 24 and we have the packages.el file, load it.
-(when (>= emacs-major-version 24)
-  (if (file-exists-p "~/.emacs.d/packages.el")
-      (load "~/.emacs.d/packages.el")))
+(require 'package)
+
+;;; Code:
+(setq package-archives
+      (append package-archives
+              '(("melpa" . "http://melpa.milkbox.net/packages/"))))
+
+(package-initialize)
+(setq package-enable-at-startup nil)
+
+(unless package-archive-contents
+  (message "Refreshing ELPA package archives...")
+  (package-refresh-contents))
+
+(unless (package-installed-p 'use-package)
+  (message "`use-package' not found.  Installing...")
+  (package-install 'use-package))
+
+(require 'use-package)
+(setq use-package-minimum-reported-time 0
+      use-package-verbose t)
+
+(use-package init-loader
+  :ensure t
+  :config
+  (setq init-loader-show-log-after-init t)
+  (init-loader-load (locate-user-emacs-file "inits")))
+
+(use-package server
+  :config
+  (unless (server-running-p)
+    (server-start)))