From 896455c44179a7e91511fb40dc4df6c6333ba708 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Mon, 19 Sep 2016 23:52:15 -0400
Subject: [PATCH] Use melpa instead of quelpa for most things

I don't really need the bleeding edge most of the time
---
 .emacs.d/init.el | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index c6439fb..8f189be 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -36,6 +36,8 @@
 
 ;;; Packages
 ;;;; install/load quelpa
+(require 'package)
+(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
 (package-initialize)
 (setq quelpa-update-melpa-p nil)
 (unless (require 'quelpa nil t)
@@ -155,7 +157,7 @@
   (add-to-list 'org-src-lang-modes '("dot" . graphviz-dot)))
 
 ;;;; external packages (required)
-(use-package company :quelpa
+(use-package company :ensure
   :config
   (global-company-mode)
   (setq company-idle-delay 0.1
@@ -163,7 +165,7 @@
     company-dabbrev-ignore-case nil)
   (global-set-key (kbd "<C-tab>") 'company-manual-begin))
 
-(use-package smart-mode-line :quelpa
+(use-package smart-mode-line :ensure
   :config
   (setq sml/no-confirm-load-theme t)
   (sml/setup)
@@ -175,17 +177,17 @@
   (add-to-list 'sml/replacer-regexp-list '("^:ccc:/home/asgoldsmith" ":ccc:~") t)
   (setq rm-blacklist '(" company" " Undo-Tree" " ivy")))
 
-(use-package avy :quelpa
+(use-package avy :ensure
   :config
   (eval-after-load "isearch"
     '(define-key isearch-mode-map (kbd "C-'") 'avy-isearch))
   :bind ("C-;" . avy-goto-char)
   :bind ("C-'" . avy-goto-char-2))
 
-(use-package smex :quelpa
+(use-package smex :ensure
   :bind ("M-X" . smex-major-mode-commands))
 
-(use-package swiper :quelpa
+(use-package swiper :ensure
   :bind ("C-s" . swiper)
   :bind ("C-r" . swiper)
   :bind ("C-c C-r" . ivy-resume)
@@ -197,7 +199,7 @@
   (define-key swiper-map (kbd "C-r") 'ivy-previous-line-or-history)
   (define-key ivy-minibuffer-map (kbd "C-'") 'ivy-avy))
 
-(use-package counsel :quelpa
+(use-package counsel :ensure
   :bind ("M-x" . counsel-M-x)
   :bind ("C-M-y" . counsel-yank-pop)
   :config
@@ -207,33 +209,33 @@
   (assq-delete-all 'counsel-M-x ivy-initial-inputs-alist)
   (global-set-key (kbd "C-c C-c M-x") 'execute-extended-command)) ;;normal M-x.)
 
-(use-package ace-window :quelpa
+(use-package ace-window :ensure
   :bind ("M-p" . ace-window))
 
-(use-package undo-tree :quelpa
+(use-package undo-tree :ensure
   :config
   (global-undo-tree-mode)
   (global-set-key (kbd "M-/") 'undo-tree-visualize))
 
-(use-package hydra :quelpa
+(use-package hydra :ensure
   :config
   ;config is in separate file because it is really big
   (load-file "~/.emacs.d/init-hydra.el"))
 
-(use-package multiple-cursors :quelpa)
+(use-package multiple-cursors :ensure)
 
-(use-package expand-region :quelpa
+(use-package expand-region :ensure
   :bind ("C-=" . er/expand-region))
 
-(use-package company-quickhelp :quelpa
+(use-package company-quickhelp :ensure
   :config
   (company-quickhelp-mode 1)
   (setq company-quickhelp-delay 0.5))
 
-(use-package magit :quelpa
+(use-package magit :ensure
   :bind ("C-x g" . magit-status))
 
-(use-package popwin :quelpa
+(use-package popwin :ensure
   :config
   (popwin-mode 1))
 
@@ -245,13 +247,13 @@
     '(define-key ibuffer-mode-map (kbd "c") 'cat-set-ibuffer))
   (global-set-key (kbd "C-x C-M-C") 'kill-this-cat-kill-terminal))
 
-(use-package dired+ :quelpa
+(use-package dired+ :ensure
   :init
   (setq diredp-hide-details-initially-flag nil)
   :config
   (toggle-diredp-find-file-reuse-dir 1))
 
-(use-package outline-magic :quelpa
+(use-package outline-magic :ensure
   :config
   (define-key outline-minor-mode-map (kbd "M-<tab>") 'outline-cycle))