diff options
| -rw-r--r-- | emacs/elisp/el-get-setup.el | 29 | ||||
| -rw-r--r-- | emacs/init.el | 35 |
2 files changed, 3 insertions, 61 deletions
diff --git a/emacs/elisp/el-get-setup.el b/emacs/elisp/el-get-setup.el index bd880dbc..53f3a462 100644 --- a/emacs/elisp/el-get-setup.el +++ b/emacs/elisp/el-get-setup.el @@ -1,27 +1,11 @@ -(package-initialize) - (setq - el-get-sources '( - (:name use-package - :type github - :pkgname "jwiegley/use-package") - (:name packed - :type github - :pkgname "tarsius/packed") - (:name auto-compile - :type github - :depends packed - :pkgname "tarsius/auto-compile") - (:name project-persist - :type github - :pkgname "rdallasgray/project-persist")) - eg:basic-packages '( auto-compile auto-indent-mode autopair ace-jump-mode + bind-key company dired+ diminish @@ -54,14 +38,3 @@ eg:cygwin-packages '(windows-path)) - -(el-get-elpa-build-local-recipes) - -(el-get 'sync eg:basic-packages) - -(cond ((eq system-type 'cygwin) - (el-get 'sync eg:cygwin-packages) - (el-get 'sync eg:windows-packages)) - - ((eq system-type 'windows-nt) - (el-get 'sync eg:windows-packages))) diff --git a/emacs/init.el b/emacs/init.el index dc594fd1..4716c595 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -10,36 +10,14 @@ (setq custom-file "~/.emacs.d/custom.el") ;;;; Package Management -(setq *el-get-dir* (expand-file-name "el-get/" user-emacs-directory) - *elisp-dir* (expand-file-name "elisp/" user-emacs-directory) +(setq *elisp-dir* (expand-file-name "elisp/" user-emacs-directory) *custom-dir* (expand-file-name "custom/" user-emacs-directory) - el-get-github-default-url-type "git" - el-get-emacswiki-base-url "http://raw.github.com/emacsmirror/emacswiki.org/master/" package-archives '(("ELPA" . "http://tromey.com/elpa/") ("gnu" . "http://elpa.gnu.org/packages/") ("marmalade" . "http://marmalade-repo.org/packages/") ("melpa" . "http://melpa.milkbox.net/packages/"))) -(defun add-subdirs-to-load-path (path) - (unless (member path load-path) - (mapc (lambda (file) - (let ((full-path (concat path file))) - (if (and (not (string-prefix-p "." file)) - (file-directory-p full-path)) - (add-to-list 'load-path full-path)))) - (directory-files path))) - (add-to-list 'load-path path)) - -(if (file-exists-p (concat *el-get-dir* "el-get")) - (add-subdirs-to-load-path *el-get-dir*) - (unless (require 'el-get nil t) - (with-current-buffer - (url-retrieve-synchronously - "https://raw.github.com/dimitri/el-get/master/el-get-install.el") - (make-local-variable 'el-get-master-branch) - (goto-char (point-max)) - (eval-print-last-sexp) - (load (concat *elisp-dir* "el-get-setup"))))) +(package-initialize) (add-to-list 'load-path *elisp-dir*) @@ -49,15 +27,6 @@ (unless (fboundp 'diminish) (require 'diminish nil t))) -(use-package el-get - :commands (el-get-init - el-get-install - el-get-reinstall - el-get-remove - el-get-update - el-get-self-update - el-get-describe)) - ;;;; Style (use-package linum |