summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.el4
-rw-r--r--lisp/init-elpa.el33
2 files changed, 3 insertions, 34 deletions
diff --git a/init.el b/init.el
index 957b6f0..315dca9 100644
--- a/init.el
+++ b/init.el
@@ -25,7 +25,9 @@
(defvar km/init-lisp-dir (expand-file-name "lisp/" user-emacs-directory))
(add-to-list 'load-path km/init-lisp-dir)
-(require 'init-elpa)
+(require 'package)
+(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
+(package-initialize)
(require 'cask)
(cask-initialize)
diff --git a/lisp/init-elpa.el b/lisp/init-elpa.el
deleted file mode 100644
index d5eeeda..0000000
--- a/lisp/init-elpa.el
+++ /dev/null
@@ -1,33 +0,0 @@
-;;; init-elpa.el --- Elpa configuration
-
-;; Copyright (C) 2012-2016 Kyle Meyer <kyle@kyleam.com>
-
-;; Author: Kyle Meyer <kyle@kyleam.com>
-;; URL: https://github.com/kyleam/emacs.d
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-;; Modified from
-;; https://github.com/purcell/emacs.d/blob/master/lisp/init-elpa.el.
-
-(require 'package)
-
-(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
-
-(package-initialize)
-
-(provide 'init-elpa)
-;;; init-elpa.el ends here