about summary refs log tree commit diff
path: root/init.el
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@gmail.com>2015-12-13T23·04+0100
committerVincent Ambo <tazjin@gmail.com>2015-12-13T23·04+0100
commitaf87ca21eeffe7faa7663ed23af20374f0407168 (patch)
tree78723367b63db14ab55213f47bc121a40d86c976 /init.el
parent560176bc7789c2b0aa12b4dbab064f328c3454a5 (diff)
Various changes
Diffstat (limited to 'init.el')
-rw-r--r--init.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/init.el b/init.el
index d1bd702da8a5..9358bb6c0107 100644
--- a/init.el
+++ b/init.el
@@ -6,7 +6,7 @@
 
 ;; ... and melpa. Melpa packages that exist on marmalade will have
 ;; precendence.
-; (add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/"))
+(add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/"))
 
 ;; And load things!
 (package-refresh-contents)
@@ -14,7 +14,6 @@
 
 (defvar my-pkgs
   '(;; All packages
-    ac-cider-compliment
     ace-jump-mode
     ag
     browse-kill-ring
@@ -36,8 +35,6 @@
     markdown-mode+
     multiple-cursors
     multi-term
-    mvn
-    nyan-mode
     paredit
     password-store
     pkgbuild-mode
@@ -85,6 +82,9 @@
 (setq custom-file (concat user-emacs-directory "init/custom.el"))
 (load custom-file)
 
+;; Local configuration
+(load-file-if-exists "~/.emacs.d/init/local.el")
+
 ;; Load magnars' string manipulation library
 (require 's)
 
@@ -92,5 +92,5 @@
 (random t)
 
 ;; SML should respect theme colours
-;; (setq sml/theme 'black)
+;; (setq sml/theme 'powerline)
 (sml/setup)