dotfiles/emacs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use melpa instead of quelpa for most things

Browse Source 
I don't really need the bleeding edge most of the time
This commit is contained in:
Adam Goldsmith 2016-09-19 23:52:15 -04:00
parent 37ceab5474
commit 896455c441
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.emacs.d/init.el
View File

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