Commit 6d7c471a93e5

Vincent Demeester <vincent@sbr.pm>
2015-05-05 22:56:03
Update init.el & setup-package.el in emacs.org
Reflect the simplification that happened in these files in the org-mode file.
1 parent 56882bd
Changed files (1)
.emacs.d
.emacs.d/emacs.org
@@ -82,33 +82,15 @@
 
       (sanityinc/package-maybe-enable-signatures)
 
-      ;; On demand installation of packages
-      (defun require-package (package &optional min-version no-refresh)
-        "Install given PACKAGE, optionally requiring MIN-VERSION.
-      if NO-REFRESH is non-nil, the available package lists will not be
-      re-downloaded in order to locate PACKAGE."
-        (if (package-installed-p package min-version)
-            t
-          (if (or (assoc package package-archive-contents) no-refresh)
-              (package-install package)
-            (progn
-              (when (not package-archive-contents)
-                (package-refresh-contents))
-              (require-package package min-version t)))))
-
       ;; Fire up package.el
       (package-initialize)
 
-      ;; Require use-package
-      (require-package 'use-package)
-      (require 'use-package)
+      ;; Load package contents if not present
+      (when (not package-archive-contents)
+        (package-refresh-contents))
 
-      ;; install fullframe for list-packages
-      (use-package fullframe
-                   :init
-                   (progn
-                     (fullframe list-packages quit-window))
-                   :ensure t)
+      ;; Load use-package
+      (require 'use-package)
 
       (provide 'setup-package)
     #+END_SRC
@@ -128,6 +110,8 @@
 
       ;; Add custom lisp files to the load-path
       (add-to-list 'load-path "~/.emacs.d/lisp")
+      ;; Add a specific version of use-package
+      (add-to-list 'load-path "~/.emacs.d/lisp/use-package")
 
       (require 'vde-functions)
       ;; initialize all ELPA packages
@@ -158,9 +142,7 @@
 
       ;; load the literate configuration
       (require 'ob-tangle)
-      ;;(org-babel-load-file
-      ;; (expand-file-name "emacs.org"
-      ;;                 user-emacs-directory))
+
       (org-babel-load-file "~/.emacs.d/emacs.org")
 
       (let ((elapsed (float-time (time-subtract (current-time)