get rid of duplication of :ensures

(setq use-package-always-ensure t)
This commit is contained in:
Ivan Malison 2015-08-18 00:22:57 -07:00
parent 3b9c028845
commit 55d205d762

View File

@ -80,12 +80,11 @@
(eval-when-compile (require 'use-package)) (eval-when-compile (require 'use-package))
(require 'diminish) (require 'diminish)
(require 'bind-key) (require 'bind-key)
(setq use-package-always-ensure t)
(use-package bug-hunter (use-package bug-hunter)
:ensure t)
(use-package benchmark-init (use-package benchmark-init
:ensure t
;; this variable has to be set in custom-before.el ;; this variable has to be set in custom-before.el
:if (and (boundp 'do-benchmark) do-benchmark)) :if (and (boundp 'do-benchmark) do-benchmark))
@ -495,11 +494,9 @@ The current directory is assumed to be the project's root otherwise."
;; Set path from shell. ;; Set path from shell.
(use-package exec-path-from-shell (use-package exec-path-from-shell
:ensure t
:config (exec-path-from-shell-initialize)) :config (exec-path-from-shell-initialize))
(use-package yasnippet (use-package yasnippet
:ensure t
:defer 5 :defer 5
:commands (yas-global-mode) :commands (yas-global-mode)
:config :config
@ -517,7 +514,6 @@ The current directory is assumed to be the project's root otherwise."
(setq tramp-default-method "ssh")) (setq tramp-default-method "ssh"))
(use-package shackle (use-package shackle
:ensure t
:config :config
(progn (progn
(diminish 'shackle-mode) (diminish 'shackle-mode)
@ -536,7 +532,6 @@ The current directory is assumed to be the project's root otherwise."
(use-package discover-my-major :ensure t) (use-package discover-my-major :ensure t)
(use-package which-key (use-package which-key
:ensure t
:config :config
(progn (progn
(setq which-key-idle-delay .15) (setq which-key-idle-delay .15)
@ -549,32 +544,27 @@ The current directory is assumed to be the project's root otherwise."
(imalison:prefix-alternative imalison:avy avy-goto-word-1 avy-goto-char) (imalison:prefix-alternative imalison:avy avy-goto-word-1 avy-goto-char)
(use-package avy (use-package avy
:ensure t
:bind (("C-j" . imalison:avy) :bind (("C-j" . imalison:avy)
("M-g l" . avy-goto-line) ("M-g l" . avy-goto-line)
("C-'" . avy-goto-char-2))) ("C-'" . avy-goto-char-2)))
(imalison:prefix-alternative imalison:ace-window ace-select-window ace-swap-window) (imalison:prefix-alternative imalison:ace-window ace-select-window ace-swap-window)
(use-package ace-window (use-package ace-window
:ensure t
:config (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l)) :config (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l))
:bind ("C-c w" . imalison:ace-window)) :bind ("C-c w" . imalison:ace-window))
(use-package flycheck (use-package flycheck
:ensure t
:config :config
(progn (global-flycheck-mode)) (progn (global-flycheck-mode))
:diminish flycheck-mode) :diminish flycheck-mode)
(use-package haskell-mode (use-package haskell-mode
:ensure t
:commands haskell-mode :commands haskell-mode
:config :config
(progn (progn
(add-hook 'haskell-mode-hook 'turn-on-haskell-indent))) (add-hook 'haskell-mode-hook 'turn-on-haskell-indent)))
(use-package narrow-indirect (use-package narrow-indirect
:ensure t
:init :init
(progn (progn
(define-key ctl-x-4-map "nd" 'ni-narrow-to-defun-indirect-other-window) (define-key ctl-x-4-map "nd" 'ni-narrow-to-defun-indirect-other-window)
@ -582,15 +572,12 @@ The current directory is assumed to be the project's root otherwise."
(define-key ctl-x-4-map "np" 'ni-narrow-to-page-indirect-other-window))) (define-key ctl-x-4-map "np" 'ni-narrow-to-page-indirect-other-window)))
(use-package editorconfig (use-package editorconfig
:ensure t
:demand t) :demand t)
(use-package dtrt-indent (use-package dtrt-indent
:ensure t
:init (add-hook 'prog-mode-hook 'dtrt-indent-mode)) :init (add-hook 'prog-mode-hook 'dtrt-indent-mode))
(use-package rainbow-delimiters (use-package rainbow-delimiters
:ensure t
:commands rainbow-delimiters-mode :commands rainbow-delimiters-mode
:init :init
(progn (progn
@ -601,7 +588,6 @@ The current directory is assumed to be the project's root otherwise."
(use-package gitolite-clone :ensure t) (use-package gitolite-clone :ensure t)
(use-package magit (use-package magit
:ensure t
:commands magit-status :commands magit-status
:bind (("C-x g" . magit-status)) :bind (("C-x g" . magit-status))
:init :init
@ -611,13 +597,11 @@ The current directory is assumed to be the project's root otherwise."
(use-package magit-filenotify (use-package magit-filenotify
;; Seems like OSX does not support filenotify. ;; Seems like OSX does not support filenotify.
:disabled t :disabled t
:ensure t
:if (emacs24_4-p) :if (emacs24_4-p)
:config :config
:init (add-hook 'magit-status-mode-hook 'magit-filenotify-mode)))) :init (add-hook 'magit-status-mode-hook 'magit-filenotify-mode))))
(use-package company (use-package company
:ensure t
:commands company-mode :commands company-mode
:bind (("C-\\" . company-complete)) :bind (("C-\\" . company-complete))
:config :config
@ -629,7 +613,6 @@ The current directory is assumed to be the project's root otherwise."
(add-hook 'prog-mode-hook (lambda () (company-mode t)))) (add-hook 'prog-mode-hook (lambda () (company-mode t))))
(use-package expand-region (use-package expand-region
:ensure t
:commands er/expand-region :commands er/expand-region
:config (setq expand-region-contract-fast-key "j") :config (setq expand-region-contract-fast-key "j")
:bind (("C-c k" . er/expand-region))) :bind (("C-c k" . er/expand-region)))
@ -638,11 +621,9 @@ The current directory is assumed to be the project's root otherwise."
:config :config
(progn (progn
(use-package phi-search-mc (use-package phi-search-mc
:ensure t
:config :config
(phi-search-mc/setup-keys)) (phi-search-mc/setup-keys))
(use-package mc-extras (use-package mc-extras
:ensure t
:config :config
(define-key mc/keymap (kbd "C-. =") 'mc/compare-chars))) (define-key mc/keymap (kbd "C-. =") 'mc/compare-chars)))
:bind :bind
@ -656,7 +637,6 @@ The current directory is assumed to be the project's root otherwise."
(use-package undo-tree (use-package undo-tree
:disabled t ;; this has been getting pretty annoying :disabled t ;; this has been getting pretty annoying
:ensure t
:bind (("C--" . undo-redo) :bind (("C--" . undo-redo)
("C-c u" . undo-tree-visualize) ("C-c u" . undo-tree-visualize)
("C-c r" . undo-tree-redo)) ("C-c r" . undo-tree-redo))
@ -669,12 +649,10 @@ The current directory is assumed to be the project's root otherwise."
(setq undo-tree-visualizer-timestamps t))) (setq undo-tree-visualizer-timestamps t)))
(use-package string-inflection (use-package string-inflection
:ensure t
:commands string-inflection-toggle :commands string-inflection-toggle
:bind ("C-c l" . string-inflection-toggle)) :bind ("C-c l" . string-inflection-toggle))
(use-package load-dir (use-package load-dir
:ensure t
:config :config
(progn (progn
(add-to-list 'load-dirs "~/.emacs.d/load.d") (add-to-list 'load-dirs "~/.emacs.d/load.d")
@ -689,15 +667,12 @@ The current directory is assumed to be the project's root otherwise."
(setq recentf-max-menu-items 500))) (setq recentf-max-menu-items 500)))
(use-package zop-to-char (use-package zop-to-char
:ensure t
:bind ("M-z" . zop-to-char)) :bind ("M-z" . zop-to-char))
(use-package restclient (use-package restclient
:ensure t
:mode (("\\.restclient\\'" . restclient-mode))) :mode (("\\.restclient\\'" . restclient-mode)))
(use-package comment-dwim-2 (use-package comment-dwim-2
:ensure t
:bind ("M-;" . comment-dwim-2)) :bind ("M-;" . comment-dwim-2))
;; ============================================================================= ;; =============================================================================
@ -705,11 +680,9 @@ The current directory is assumed to be the project's root otherwise."
;; ============================================================================= ;; =============================================================================
(use-package helm-spotify (use-package helm-spotify
:ensure t
:commands helm-spotify) :commands helm-spotify)
(use-package edit-server (use-package edit-server
:ensure t
:commands edit-server-start :commands edit-server-start
:defer 1 :defer 1
:config :config
@ -718,7 +691,6 @@ The current directory is assumed to be the project's root otherwise."
(setq edit-server-new-frame nil))) (setq edit-server-new-frame nil)))
(use-package jabber (use-package jabber
:ensure t
:commands jabber-connect :commands jabber-connect
:config :config
(progn (progn
@ -951,14 +923,12 @@ the same tree node, and the headline of the tree node in the Org-mode file."
(org-notify-start 10))) (org-notify-start 10)))
(use-package org-bullets (use-package org-bullets
:ensure t
:config :config
(progn (progn
(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))) (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))))
(use-package org-ehtml (use-package org-ehtml
:disabled t :disabled t
:ensure t
:config :config
(progn (progn
(setq org-ehtml-docroot (expand-file-name "~/Dropbox/org")) (setq org-ehtml-docroot (expand-file-name "~/Dropbox/org"))
@ -1140,7 +1110,6 @@ the same tree node, and the headline of the tree node in the Org-mode file."
(use-package clocker :ensure t) (use-package clocker :ensure t)
(use-package org-projectile (use-package org-projectile
:ensure t
:demand t :demand t
:bind (("C-c n p" . imalison:helm-org-todo)) :bind (("C-c n p" . imalison:helm-org-todo))
:config :config
@ -1161,23 +1130,19 @@ the same tree node, and the headline of the tree node in the Org-mode file."
:buffer "*helm org capture templates*")))) :buffer "*helm org capture templates*"))))
(use-package deft (use-package deft
:ensure t
:config :config
(progn (progn
(setq deft-extensions '("org")) (setq deft-extensions '("org"))
(setq deft-directory "~/Dropbox (Personal)/org/notes"))) (setq deft-directory "~/Dropbox (Personal)/org/notes")))
(use-package epg (use-package epg
:ensure t
:config :config
(epa-file-enable)) (epa-file-enable))
(use-package twittering-mode (use-package twittering-mode
:ensure t
:commands twittering-mode) :commands twittering-mode)
(use-package erc (use-package erc
:ensure t
:commands erc :commands erc
:config :config
(progn (progn
@ -1286,7 +1251,6 @@ marking if it still had that."
(use-package gmail-message-mode :ensure t) (use-package gmail-message-mode :ensure t)
(use-package alert (use-package alert
:ensure t
:config :config
(progn (progn
(defun alert-notifier-notify (info) (defun alert-notifier-notify (info)
@ -1308,7 +1272,6 @@ marking if it still had that."
(setq alert-default-style 'notifier))) (setq alert-default-style 'notifier)))
(use-package sauron (use-package sauron
:ensure t
:defer 5 :defer 5
:commands (sauron-start sauron-start-hidden) :commands (sauron-start sauron-start-hidden)
:init :init
@ -1354,7 +1317,6 @@ marking if it still had that."
(use-package libmpdee :ensure t) (use-package libmpdee :ensure t)
(use-package flyspell (use-package flyspell
:ensure t
:config :config
(progn (progn
(diminish 'flyspell-mode) (diminish 'flyspell-mode)
@ -1421,7 +1383,6 @@ marking if it still had that."
(progn (progn
(helm-mode 1) (helm-mode 1)
(use-package helm-ag (use-package helm-ag
:ensure t
:bind ("C-c p S" . imalison:set-helm-ag-extra-options) :bind ("C-c p S" . imalison:set-helm-ag-extra-options)
:config :config
(defun imalison:set-helm-ag-extra-options () (defun imalison:set-helm-ag-extra-options ()
@ -1492,12 +1453,10 @@ marking if it still had that."
(diminish 'helm-mode))) (diminish 'helm-mode)))
(use-package helm-swoop (use-package helm-swoop
:ensure t
:bind ("C-S-s" . helm-swoop) :bind ("C-S-s" . helm-swoop)
:commands helm-swoop) :commands helm-swoop)
(use-package perspective (use-package perspective
:ensure t
:demand t :demand t
:config :config
(progn (progn
@ -1543,7 +1502,6 @@ window is active in the perspective."
:bind ("C-c 9" . persp-switch)) :bind ("C-c 9" . persp-switch))
(use-package projectile (use-package projectile
:ensure t
:demand t :demand t
:config :config
(progn (progn
@ -1581,11 +1539,9 @@ window is active in the perspective."
:init :init
(progn (progn
(use-package persp-projectile (use-package persp-projectile
:ensure t
:commands projectile-persp-switch-project))) :commands projectile-persp-switch-project)))
(use-package helm-projectile (use-package helm-projectile
:ensure t
:commands (helm-projectile-on) :commands (helm-projectile-on)
:config :config
(progn (progn
@ -1600,7 +1556,6 @@ window is active in the perspective."
helm-source-projectile-projects))) helm-source-projectile-projects)))
(use-package smex (use-package smex
:ensure t
;; Using helm-M-x instead ;; Using helm-M-x instead
:disabled t :disabled t
:commands smex :commands smex
@ -1608,7 +1563,6 @@ window is active in the perspective."
:bind ("M-x" . smex)) :bind ("M-x" . smex))
(use-package ido (use-package ido
:ensure t
:commands ido-mode :commands ido-mode
:config :config
(progn (progn
@ -1620,7 +1574,6 @@ window is active in the perspective."
(use-package flx :ensure t) (use-package flx :ensure t)
(use-package flx-ido (use-package flx-ido
:commands flx-ido-mode :commands flx-ido-mode
:ensure t
:init (flx-ido-mode 1) :init (flx-ido-mode 1)
:config :config
(progn (progn
@ -1629,11 +1582,9 @@ window is active in the perspective."
(setq gc-cons-threshold 20000000) (setq gc-cons-threshold 20000000)
(setq ido-use-faces nil))) (setq ido-use-faces nil)))
(use-package ido-ubiquitous (use-package ido-ubiquitous
:ensure t
:disabled t :disabled t
:commands (ido-ubiquitous-mode)) :commands (ido-ubiquitous-mode))
(use-package ido-vertical-mode (use-package ido-vertical-mode
:ensure t
:config :config
(progn (progn
(ido-vertical-mode 1) (ido-vertical-mode 1)
@ -1655,7 +1606,6 @@ window is active in the perspective."
:ensure t) :ensure t)
(use-package elisp-slime-nav (use-package elisp-slime-nav
:ensure t
:commands elisp-slime-nav-mode :commands elisp-slime-nav-mode
:config :config
(diminish 'elisp-slime-nav-mode) (diminish 'elisp-slime-nav-mode)
@ -1726,7 +1676,6 @@ window is active in the perspective."
(message "%s" (get-virtual-envs))) (message "%s" (get-virtual-envs)))
(use-package elpy (use-package elpy
:ensure t
:commands elpy-enable :commands elpy-enable
:config :config
(progn (progn
@ -1772,7 +1721,6 @@ window is active in the perspective."
:config :config
(progn (progn
(use-package ensime (use-package ensime
:ensure t
:config :config
(progn (progn
(add-hook 'scala-mode-hook 'ensime-scala-mode-hook) (add-hook 'scala-mode-hook 'ensime-scala-mode-hook)
@ -1794,7 +1742,6 @@ window is active in the perspective."
indent-tabs-mode t))) indent-tabs-mode t)))
(use-package android-mode (use-package android-mode
:ensure t
:config :config
(progn (progn
(setq android-mode-sdk-dir (setq android-mode-sdk-dir
@ -1816,7 +1763,6 @@ window is active in the perspective."
(insert ".only")))) (insert ".only"))))
(use-package js2-mode (use-package js2-mode
:ensure t
:commands (js2-mode) :commands (js2-mode)
:mode "\\.js\\'" :mode "\\.js\\'"
:bind :bind
@ -1856,14 +1802,12 @@ window is active in the perspective."
(add-hook 'js2-mode-hook 'js2-imenu-extras-mode))) (add-hook 'js2-mode-hook 'js2-imenu-extras-mode)))
(use-package js2-refactor (use-package js2-refactor
:ensure t
:config :config
(progn (progn
(js2r-add-keybindings-with-prefix "C-c C-m") (js2r-add-keybindings-with-prefix "C-c C-m")
(add-hook 'js2-mode-hook #'js2-refactor-mode))) (add-hook 'js2-mode-hook #'js2-refactor-mode)))
(use-package skewer-mode (use-package skewer-mode
:ensure t
:commands skewer-mode :commands skewer-mode
:config :config
(progn (progn
@ -1872,7 +1816,6 @@ window is active in the perspective."
(use-package tern (use-package tern
:commands tern-mode :commands tern-mode
:ensure t
:config :config
(use-package company-tern (use-package company-tern
:config (add-to-list 'company-backends 'company-tern))) :config (add-to-list 'company-backends 'company-tern)))
@ -1882,7 +1825,6 @@ window is active in the perspective."
(delete-process "tern")) (delete-process "tern"))
(use-package json-mode (use-package json-mode
:ensure t
:mode "\\.json\\'" :mode "\\.json\\'"
:init :init
(add-hook 'json-mode-hook (add-hook 'json-mode-hook
@ -1891,7 +1833,6 @@ window is active in the perspective."
(setq js-indent-level 4)))) (setq js-indent-level 4))))
(use-package jsx-mode (use-package jsx-mode
:ensure t
:mode "\\.jsx\\'") :mode "\\.jsx\\'")
(eval-after-load 'css-mode (eval-after-load 'css-mode
@ -1902,7 +1843,6 @@ window is active in the perspective."
;; ============================================================================= ;; =============================================================================
(use-package robe (use-package robe
:ensure t
:commands robe-mode :commands robe-mode
:init :init
(progn (add-hook 'ruby-mode-hook (progn (add-hook 'ruby-mode-hook
@ -1920,7 +1860,6 @@ window is active in the perspective."
indent-tabs-mode t) indent-tabs-mode t)
(use-package helm-gtags (use-package helm-gtags
:ensure t
:disabled t :disabled t
:config (custom-set-variables :config (custom-set-variables
'(helm-gtags-path-style 'relative) '(helm-gtags-path-style 'relative)
@ -1989,23 +1928,18 @@ window is active in the perspective."
;; ============================================================================= ;; =============================================================================
(use-package go-mode (use-package go-mode
:ensure t
:mode (("\\.go\\'" . go-mode))) :mode (("\\.go\\'" . go-mode)))
(use-package rust-mode :ensure t (use-package rust-mode :mode (("\\.rs\\'" . rust-mode)))
:mode (("\\.rs\\'" . rust-mode)))
(use-package yaml-mode :ensure t (use-package yaml-mode :mode (("\\.yaml\\'" . yaml-mode)
:mode (("\\.yaml\\'" . yaml-mode)
("\\.yml\\'" . yaml-mode))) ("\\.yml\\'" . yaml-mode)))
(use-package sgml-mode (use-package sgml-mode
:ensure t
:commands sgml-mode :commands sgml-mode
:bind ("C-c b" . web-beautify-html)) :bind ("C-c b" . web-beautify-html))
(use-package gitconfig-mode (use-package gitconfig-mode
:ensure t
:mode "\\.?gitconfig\\'") :mode "\\.?gitconfig\\'")
(use-package evil :ensure t :commands (evil-mode)) (use-package evil :ensure t :commands (evil-mode))
@ -2085,7 +2019,6 @@ window is active in the perspective."
(defvar imalison:dark-theme 'material) (defvar imalison:dark-theme 'material)
(use-package theme-changer (use-package theme-changer
:ensure t
:config :config
(progn (progn
(destructuring-bind (latitude longitude) (destructuring-bind (latitude longitude)