some misc packaging fixes

[.emacs.d.git] / packages.el

diff --git a/packages.el b/packages.el
index 0ca26371fe5d89a40f39471c35734e34374cf042..a98100a5df0dc9fc8753e0d72e59fd066e2972d6 100644 (file)
--- a/packages.el
+++ b/packages.el
@@ -1,14 +1,22 @@
 ; my-packages.el
 (require 'package)
+
+(defconst emacs-d
+  (file-name-directory
+   (file-chase-links load-file-name))
+  "The giant turtle on which the world rests.")
+
+(setq package-user-dir
+      (expand-file-name "elpa" emacs-d))
+
 (add-to-list 'package-archives
              '("melpa" . "http://melpa.milkbox.net/packages/") t)
 (add-to-list 'package-archives
-             '("marmalade" . "http://marmalade-repo.org/packages/") t)
+             '("gnu" . "http://elpa.gnu.org/packages/") t)
 (package-initialize)
 
 ; fetch the list of packages available
-(unless package-archive-contents
-  (package-refresh-contents))
+(package-refresh-contents)
 
 ;; make sure my list of packages are installed
 (setq package-list '(go-mode
@@ -25,7 +33,9 @@
                      racket-mode
                      auto-complete
                      magit
-                     ledger-mode))
+                     ledger-mode
+                     company
+                     company-ghc))
 
 ; install the missing packages
 (dolist (package package-list)