From 4fe8a14a3c2e497ec2d0111475cce433fe6dad8f Mon Sep 17 00:00:00 2001
From: Ravi R Kiran <aine.marina@gmail.com>
Date: Tue, 29 May 2018 06:58:11 -0500
Subject: Automatic use of :ensure


diff --git a/init.el b/init.el
index 216f4e6..decb211 100644
--- a/init.el
+++ b/init.el
@@ -60,6 +60,7 @@
 (require 'bind-key)
 (require 'use-package)
 (require 'diminish)
+(setq use-package-always-ensure t)
 
 (defvar ravi/use-helm-instead-of-ido t
   "Prefer helm to ido")
@@ -67,8 +68,8 @@
 (when (file-exists-p (ravi/emacs-file "local.el"))
   (load-file (ravi/emacs-file "local.el")))
 
-(use-package s :ensure t)
-(use-package dash :ensure t)
+(use-package s)
+(use-package dash)
 (require 's)
 (require 'ravi-ergodox-mode)
 (let* ((xinput-string (shell-command-to-string "xinput"))
@@ -98,7 +99,6 @@
       (bind-key "<f12>" 'undo-tree-undo))))
 
 (use-package free-keys
-  :ensure t
   :commands free-keys)
 
 (defun ravi/add-variables-from-dir-locals (varname hack-varname &optional make-it-local)
diff --git a/lisp/ravi-init-appearance.el b/lisp/ravi-init-appearance.el
index 174b852..23e58c6 100644
--- a/lisp/ravi-init-appearance.el
+++ b/lisp/ravi-init-appearance.el
@@ -81,8 +81,7 @@
   :config
   (progn
     (ws-butler-global-mode 1))
-  :diminish ws-butler-mode
-  :ensure t)
+  :diminish ws-butler-mode)
 
 (diminish 'abbrev-mode)
 
@@ -110,18 +109,15 @@ Delete all whitespace on a successive key press."
       (hungry-delete-backward n killflag))))
    ;;(define-key global-map [remap backward-delete-char-untabify] 'jschaf/hungry-delete-backward)
    (define-key global-map [remap backward-delete-char-untabify] 'hungry-delete-backward)
-   )
-  :ensure t)
+   ))
 
 ;; Easier compaction of whitespace
 (use-package shrink-whitespace
-  :bind (("M-SPC" . shrink-whitespace))
-  :ensure t)
+  :bind (("M-SPC" . shrink-whitespace)))
 
 (setq sentence-end-double-space nil)
 (use-package unfill
-  :bind (("M-q" . toggle-fill-unfill))
-  :ensure t)
+  :bind (("M-q" . toggle-fill-unfill)))
 
 (use-package subword
   :config
@@ -138,16 +134,13 @@ Delete all whitespace on a successive key press."
     (defun ravi/turn-on-syntax-subword-mode ()
       (interactive)
       (syntax-subword-mode 1))
-    (add-hook 'prog-mode-hook 'ravi/turn-on-syntax-subword-mode))
-  :ensure t)
+    (add-hook 'prog-mode-hook 'ravi/turn-on-syntax-subword-mode)))
 
 (use-package rectangle-utils
-  :bind (("C-x R" . rectangle-menu))
-  :ensure t)
+  :bind (("C-x R" . rectangle-menu)))
 
 ;; Keep cursor away from edges when scrolling up/down
-(use-package smooth-scrolling
-  :ensure t)
+(use-package smooth-scrolling)
 
 ;; Enable automatic indentation, if possible
 (use-package smart-newline
@@ -155,8 +148,7 @@ Delete all whitespace on a successive key press."
   :init
   (progn
     (bind-key "<return>" 'smart-newline prog-mode-map)
-    (bind-key "<return>" 'smart-newline emacs-lisp-mode-map))
-  :ensure t)
+    (bind-key "<return>" 'smart-newline emacs-lisp-mode-map)))
 
 ;; Case toggling: from Oleg Krehel http://oremacs.com/2014/12/25/ode-to-toggle/
 (defun oremacs/char-upcasep (letter)
@@ -211,14 +203,12 @@ Delete all whitespace on a successive key press."
 (use-package fix-word
   :bind (("M-u" . fix-word-upcase)
          ("M-l" . fix-word-downcase)
-         ("M-c" . fix-word-capitalize))
-  :ensure t)
+         ("M-c" . fix-word-capitalize)))
 
 ;; Zap up to char is more useful than zap-char
 (use-package zop-to-char
   :bind (("M-z" . zop-up-to-char)
-         ("M-Z" . zop-to-char))
-  :ensure t)
+         ("M-Z" . zop-to-char)))
 
 ;; Automatic indentation of yanked text
 (dolist (command '(yank yank-pop))
@@ -242,8 +232,7 @@ Delete all whitespace on a successive key press."
     (delete-region (point) (point-max))))
 
 (use-package comment-dwim-2
-  :bind (("M-;" . comment-dwim-2))
-  :ensure t)
+  :bind (("M-;" . comment-dwim-2)))
 
 ;; To do: change to different keybinding
 (use-package string-inflection
@@ -254,8 +243,7 @@ Delete all whitespace on a successive key press."
       ("c" string-inflection-all-cycle "all")
       ("r" string-inflection-ruby-style-cycle "ruby")
       ("j" string-inflection-java-style-cycle "java")
-      ("<return>" nil)))
-  :ensure t)
+      ("<return>" nil))))
 
 ;; Keep my navigation simple
 (setq line-move-visual nil)
@@ -269,10 +257,7 @@ Delete all whitespace on a successive key press."
     (global-undo-tree-mode)
     (setq undo-tree-auto-save-history t)
     (setq undo-tree-history-directory-alist
-          `(("." . ,(expand-file-name "undotree/" (ravi/emacs-file "past")))))
-    )
-  :ensure t
-  )
+          `(("." . ,(expand-file-name "undotree/" (ravi/emacs-file "past")))))))
 
 ;; Discover emacs
 ;; Since discover.el replaces keymaps wholesale for "C-x r" and "M-s", it overrides
@@ -282,9 +267,7 @@ Delete all whitespace on a successive key press."
   (progn
     (add-hook 'dired-mode-hook 'discover-turn-on-in-dired)
    )
-  :disabled t ;; unstable API and hosing user-provided keybindings
-  :ensure t
-  )
+  :disabled t) ;; unstable API and hosing user-provided keybindings
 
 ;; Help for prefix key-bindings not in discover-mode
 (use-package guide-key
@@ -313,21 +296,16 @@ Delete all whitespace on a successive key press."
       :config
       (progn
         (setq guide-key-tip/enabled t))
-      :ensure t
-      :disabled t ;; popups don't always go away; need to file a bug report
-      )
+      :disabled t) ;; popups don't always go away; need to file a bug report
     )
   :diminish guide-key-mode
-  :disabled t
-  :ensure t
-  )
+  :disabled t)
 
 (use-package which-key
   :config
   (progn
     (which-key-mode))
-  :diminish which-key-mode
-  :ensure t)
+  :diminish which-key-mode)
 
 (bind-key "C-h a" 'apropos)
 
@@ -357,12 +335,10 @@ Delete all whitespace on a successive key press."
   (progn
     (temp-buffer-browse-mode 1))
   :diminish temp-buffer-browse-mode
-  :disabled t                           ; emacs historical issues make this unworkable
-  :ensure t)
+  :disabled t)                           ; emacs historical issues make this unworkable
 
 (use-package import-popwin
-  :bind (("M-I" . import-popwin))
-  :ensure t)
+  :bind (("M-I" . import-popwin)))
 
 (use-package ace-window
   :bind (("M-o" . ace-window)
@@ -421,8 +397,7 @@ Delete all whitespace on a successive key press."
         ("p" joe-scroll-other-window-down "scroll down"))
       (add-to-list 'aw-dispatch-alist '(?w hydra-window-size/body) t)
       (add-to-list 'aw-dispatch-alist '(?o hydra-window-scroll/body) t)
-      (add-to-list 'aw-dispatch-alist '(?\; hydra-window-frame/body) t)))
-  :ensure t)
+      (add-to-list 'aw-dispatch-alist '(?\; hydra-window-frame/body) t))))
 
 (defun ravi/split-window-vertically-and-switch (prefix)
   (interactive "P")
@@ -452,15 +427,13 @@ Delete all whitespace on a successive key press."
     (require 'spaceline-config)
     (spaceline-spacemacs-theme)
     (when ravi/use-helm-instead-of-ido
-      (spaceline-helm-mode)))
-  :ensure t)
+      (spaceline-helm-mode))))
 
 (use-package helpful
   :bind (("C-h f" . helpful-callable)
          ("C-h v" . helpful-variable)
          ("C-h k" . helpful-key)
-         ("C-h C-." . helpful-at-point))
-  :ensure t)
+         ("C-h C-." . helpful-at-point)))
 
 (provide 'ravi-init-appearance)
 ;;; ravi-init-appearance.el ends here
diff --git a/lisp/ravi-init-cpp.el b/lisp/ravi-init-cpp.el
index a0c3c9c..14bc370 100644
--- a/lisp/ravi-init-cpp.el
+++ b/lisp/ravi-init-cpp.el
@@ -35,9 +35,7 @@
 
 (use-package cmake-mode
   :mode (("CMakeLists\\.txt\\'" . cmake-mode)
-         ("\\.cmake\\'"         . cmake-mode))
-  ;:ensure t
-  )
+         ("\\.cmake\\'"         . cmake-mode)))
 
 (defvar get-buffer-compile-command (lambda (file) (cons file 1)))
 (make-variable-buffer-local 'get-buffer-compile-command)
@@ -103,8 +101,7 @@
             ;dummy-h-mode-get-major-mode-by-keywords
             dummy-h-mode-get-major-mode-by-files-directory))
 
-    (setq dummy-h-mode-default-major-mode 'c++-mode))
-  :ensure t)
+    (setq dummy-h-mode-default-major-mode 'c++-mode)))
 
 ;; Bind to f6 later; to do: pretty docstrings
 (defhydra rtags-hydra (:color blue :hint nil)
@@ -561,13 +558,9 @@ this to 3 makes header-protection define KIG_MISC_NEWTYPE_H for a file named
             (progn
               (bind-key "H-<tab>" 'company-rtags c-mode-base-map)
               (setq company-lsp-async t)
-              (setq company-lsp-cache-candidates nil))
-            :ensure t)
-          (use-package lsp-mode :ensure t)
-          (use-package lsp-ui :ensure t)
-          )
-        :ensure t)
-      )
+              (setq company-lsp-cache-candidates nil)))
+          (use-package lsp-mode)
+          (use-package lsp-ui))))
 
     (setq hide-ifdef-initially nil)
 
@@ -584,8 +577,7 @@ this to 3 makes header-protection define KIG_MISC_NEWTYPE_H for a file named
       :config
       (progn
         (when (fboundp 'ravi/multi-compile-local-setup)
-              (ravi/multi-compile-local-setup)))
-      :ensure t)
+              (ravi/multi-compile-local-setup))))
 
     ;; Enable Malinka
     (use-package malinka
@@ -635,9 +627,7 @@ this to 3 makes header-protection define KIG_MISC_NEWTYPE_H for a file named
           (interactive)
           (malinka-mode 1)
           (ravi/find-current-project))
-        (add-hook 'c-mode-common-hook 'ravi/setup-malinka)
-        )
-      :ensure t)
+        (add-hook 'c-mode-common-hook 'ravi/setup-malinka)))
     )
   )
 
diff --git a/lisp/ravi-init-dired.el b/lisp/ravi-init-dired.el
index a82ba6c..ad65f16 100644
--- a/lisp/ravi-init-dired.el
+++ b/lisp/ravi-init-dired.el
@@ -37,7 +37,7 @@
     (add-hook 'dired-mode-hook 'ravi/dired-init-hook)
 
     (use-package image-dired)
-    (use-package dired-aux)
+    (use-package dired-aux :ensure nil)
     (use-package dired-x
       :config
       (defun dired-virtual-revert (&optional _arg _noconfirm)
@@ -50,19 +50,15 @@
           (while (dired-next-subdir 1 t)
             (dired-do-redisplay nil t))
           (when m (dired-goto-file m))
-          (set-buffer-modified-p buffer-modified))))
+          (set-buffer-modified-p buffer-modified)))
+      :ensure nil)
 
     (use-package dired-details
-      :commands dired-details-toggle
-      :ensure t
-      )
+      :commands dired-details-toggle)
     (use-package w32-browser
-      :commands dired-w32-browser
-      :ensure t
-      )
+      :commands dired-w32-browser)
 
     (use-package dired-subtree
-      :ensure t
       :config
       (progn
         (bind-keys :map dired-mode-map
@@ -105,26 +101,20 @@ Also used for highlighting.")
         (dired-rainbow-define executable "#8cc4ff" ("exe" "msi"))
         (dired-rainbow-define compressed "#ad7fa8" ("zip" "bz2" "tgz" "txz" "gz" "xz" "z" "Z" "jar" "war" "ear" "rar" "sar" "xpi" "apk" "xz" "tar"))
         (dired-rainbow-define packaged "#e6a8df" ("deb" "rpm"))
-        (dired-rainbow-define encrypted "LightBlue" ("gpg" "pgp")))
-      :ensure t)
-
+        (dired-rainbow-define encrypted "LightBlue" ("gpg" "pgp"))))
     (add-to-list 'dired-guess-shell-alist-user (list (regexp-opt my-dired-media-files-extensions)
                                                      "vlc"))
 
-    (use-package dired-filter
-      :ensure t
-      )
+    (use-package dired-filter)
 
     (use-package dired-open
       :config
       (progn
         (bind-key "E" 'dired-open-xdg dired-mode-map))
-      :ensure t)
+      )
 
     (use-package dired-avfs
-      :ensure t
-      :disabled t                           ; avfs not in Fedora repositories yet
-      )
+      :disabled t)                           ; avfs not in Fedora repositories yet
 
     (require 'dash)
     (--each '(dired-do-rename
@@ -142,8 +132,8 @@ Also used for highlighting.")
       (guide-key/add-local-guide-key-sequence "C-t")
       )
     ;; (add-hook 'dired-mode-hook 'ravi/dired-guide-key-hook)
-
-    ))
+    )
+  :ensure nil)
 
 (provide 'ravi-init-dired)
 ;;; ravi-init-dired.el ends here
diff --git a/lisp/ravi-init-files.el b/lisp/ravi-init-files.el
index db54707..b0fd4bd 100644
--- a/lisp/ravi-init-files.el
+++ b/lisp/ravi-init-files.el
@@ -134,9 +134,7 @@ not exist, it is not added to the filecache."
 (use-package projectile
   :init
   (progn
-    (use-package pkg-info
-      :ensure t
-      )
+    (use-package pkg-info)
     (setq projectile-known-projects-file
           (ravi/emacs-file "past/projectile-bookmarks.eld"))
     )
@@ -154,12 +152,9 @@ not exist, it is not added to the filecache."
             :config
             (progn
               (helm-projectile-on)
-              (bind-key "M-s M-g" 'helm-projectile-ag))
-            :ensure t))
+              (bind-key "M-s M-g" 'helm-projectile-ag))))
       (bind-key "M-s M-g" 'projectile-ag)))
-  :diminish projectile-mode
-  :ensure t
-  )
+  :diminish projectile-mode)
 
 ;; Use emacsclient as external editor for kmail
 (add-to-list 'auto-mode-alist
diff --git a/lisp/ravi-init-function.el b/lisp/ravi-init-function.el
index 673031a..1681573 100644
--- a/lisp/ravi-init-function.el
+++ b/lisp/ravi-init-function.el
@@ -82,8 +82,7 @@ and file 'filename' will be opened and cursor set on line 'linenumber'"
   :config
   (progn
     (firestarter-mode 1))
-  :diminish firestarter-mode
-  :ensure t)
+  :diminish firestarter-mode)
 
 (defun ravi/find-path-name-relative-to-project-root ()
   "Find path of current buffer file relative to project root"
diff --git a/lisp/ravi-init-helm.el b/lisp/ravi-init-helm.el
index 442e427..b4097d3 100644
--- a/lisp/ravi-init-helm.el
+++ b/lisp/ravi-init-helm.el
@@ -57,26 +57,22 @@
       :commands helm-proc
       :init
       (progn
-        (bind-key "q" 'helm-proc helm-command-map))
-      :ensure t)
+        (bind-key "q" 'helm-proc helm-command-map)))
 
     (use-package helm-git-grep
       :commands (helm-git-grep-from-isearch helm-git-grep-from-helm)
       :init
       (progn
         (bind-key "C-c g" 'helm-git-grep-from-helm helm-map)
-        (bind-key "C-c g" 'helm-git-grep-from-isearch isearch-mode-map))
-      :ensure t)
+        (bind-key "C-c g" 'helm-git-grep-from-isearch isearch-mode-map)))
 
     (use-package helm-ls-git
-      :bind (("C-x v j" . helm-ls-git-ls))
-      :ensure t)
+      :bind (("C-x v j" . helm-ls-git-ls)))
 
     (use-package helm-ag
       :config
       (progn
-        (setq helm-ag-insert-at-point 'symbol))
-      :ensure t)
+        (setq helm-ag-insert-at-point 'symbol)))
 
     (use-package helm-dash
       :commands (helm-dash
@@ -86,18 +82,15 @@
       :init
       (progn
         (bind-key "d" 'helm-dash-at-point helm-command-map)
-        (bind-key "D" 'helm-dash helm-command-map))
-      :ensure t)
+        (bind-key "D" 'helm-dash helm-command-map)))
 
     (use-package helm-xref
       :commands helm-xref-show-refs
       :init
       (progn
-        (setq xref-show-xrefs-function 'helm-xref-show-xrefs))
-      :ensure t))
+        (setq xref-show-xrefs-function 'helm-xref-show-xrefs))))
   :if ravi/use-helm-instead-of-ido
-  :diminish helm-mode
-  :ensure t)
+  :diminish helm-mode)
 
 (use-package helm-swoop
   :bind (("M-i" . helm-swoop))
@@ -118,8 +111,7 @@
 
     ;; Split direcion. 'split-window-vertically or 'split-window-horizontally
     ;; (setq helm-swoop-split-direction 'split-window-vertically)
-    )
-  :ensure t)
+    ))
 
 (provide 'ravi-init-helm)
 ;;; ravi-init-helm.el ends here
diff --git a/lisp/ravi-init-ido.el b/lisp/ravi-init-ido.el
index 0997bd4..61f9e50 100644
--- a/lisp/ravi-init-ido.el
+++ b/lisp/ravi-init-ido.el
@@ -32,8 +32,7 @@
   (progn
 
     (use-package ibuffer-vc
-      :commands ibuffer-vc-set-filter-groups-by-vc-root
-      :ensure t)
+      :commands ibuffer-vc-set-filter-groups-by-vc-root)
 
     ;; Switching to ibuffer puts the cursor on the most recent past buffer
     (defadvice ibuffer (around ibuffer-point-to-most-recent-but-one activate) ()
@@ -70,7 +69,7 @@
   ;; :config
   ;; (progn
   ;;   (bind-key "M-<f1>" 'ido-switch-buffer))
-  :ensure t)
+  )
 
 ;;;_ , ido
 
@@ -88,34 +87,25 @@
   (progn
     (use-package ido-hacks
       :config
-      (ido-hacks-mode 1)
-      :ensure t
-      )
+      (ido-hacks-mode 1))
 
     (use-package flx-ido
        :config
        (progn
-         (use-package flx
-            :ensure t)
+         (use-package flx)
          (flx-ido-mode 1)
-         )
-       :ensure t
-       )
+         ))
     (setq ido-use-filename-at-point 'guess)
     (setq ido-use-virtual-buffers t)
     (setq ido-create-new-buffer 'always)
 
     (use-package ido-ubiquitous
        :config
-       (ido-ubiquitous-mode t)
-       :ensure t
-       )
+       (ido-ubiquitous-mode t))
 
     (use-package ido-vertical-mode
       :config
-      (ido-vertical-mode 1)
-      :ensure t
-      )
+      (ido-vertical-mode 1))
 
     (defun ido-smart-select-text ()
       "Select the current completed item.  Do NOT descend into directories."
@@ -168,9 +158,7 @@
 (use-package smex
   :init
   (global-set-key [remap execute-extended-command] 'smex)
-  :if (not ravi/use-helm-instead-of-ido)
-  :ensure t
-  )
+  :if (not ravi/use-helm-instead-of-ido))
 
 (provide 'ravi-init-ido)
 ;;; ravi-init-ido.el ends here
diff --git a/lisp/ravi-init-insertion.el b/lisp/ravi-init-insertion.el
index 4c761b3..40f2b05 100644
--- a/lisp/ravi-init-insertion.el
+++ b/lisp/ravi-init-insertion.el
@@ -51,9 +51,7 @@
              ("<f4>" . aya-expand))
       :ensure t)
     )
-  :ensure t
-  :diminish yas-minor-mode
-  )
+  :diminish yas-minor-mode)
 
 ;; Default completion (some day via "M-/")
 (require 'hippie-exp)
@@ -113,9 +111,7 @@
                  (path-list-with-spaces (and combined-list (split-string combined-list "\n" t)))
                  (path-list (and path-list-with-spaces (mapcar 's-trim-left path-list-with-spaces))))
             path-list))
-        (mapc (lambda (dir) (add-to-list 'company-c-headers-path-system dir)) (ravi/get-default-include-paths))
-        )
-      :ensure t)
+        (mapc (lambda (dir) (add-to-list 'company-c-headers-path-system dir)) (ravi/get-default-include-paths))))
 
     ;; To do: enable when moving to emacs 26+
     ;; (use-package company-box :hook (company-mode . company-box-mode) :ensure t)
@@ -126,8 +122,7 @@
         (company-quickhelp-mode 1)
         ;; Enable company-quickhelp only when company-mode is active
         ;; (unbind-key "M-h" company-quickhelp-mode-map)
-        (bind-key "M-h" 'company-quickhelp-manual-begin company-active-map))
-      :ensure t)
+        (bind-key "M-h" 'company-quickhelp-manual-begin company-active-map)))
 
     (use-package company-statistics
       :init
@@ -135,8 +130,7 @@
                                                       (ravi/emacs-file "past")))
       :config
       (progn
-        (company-statistics-mode))
-      :ensure t)
+        (company-statistics-mode)))
 
     ;; Get rid of company-semantic as it interferes with clang-based backends
     (setq company-backends (delete 'company-semantic company-backends))
@@ -151,8 +145,7 @@
     (bind-key "<backtab>" 'ravi/company-to-yasnippet company-active-map)
     (bind-key "<backtab>" 'company-yasnippet))
 
-  :diminish company-mode
-  :ensure t)
+  :diminish company-mode)
 
 (provide 'ravi-init-insertion)
 ;;; ravi-init-insertion.el ends here
diff --git a/lisp/ravi-init-maps.el b/lisp/ravi-init-maps.el
index ae4eac6..6654463 100644
--- a/lisp/ravi-init-maps.el
+++ b/lisp/ravi-init-maps.el
@@ -51,8 +51,7 @@
       ("x" apply-operation-to-number-at-point :exit t)
       ("X" apply-operation-to-number-at-point :exit t)
       ("#" apply-operation-to-number-at-point :exit t)
-      ("%" apply-operation-to-number-at-point :exit t)))
-  :ensure t)
+      ("%" apply-operation-to-number-at-point :exit t))))
 
 (provide 'ravi-init-maps)
 ;;; ravi-init-maps.el ends here
diff --git a/lisp/ravi-init-marks.el b/lisp/ravi-init-marks.el
index 803b2cb..5116910 100644
--- a/lisp/ravi-init-marks.el
+++ b/lisp/ravi-init-marks.el
@@ -70,9 +70,7 @@ This is the same as using \\[set-mark-command] with the prefix argument."
 
 (use-package browse-kill-ring
   :config (browse-kill-ring-default-keybindings)
-  :ensure t
-  :if (not ravi/use-helm-instead-of-ido)
-  )
+  :if (not ravi/use-helm-instead-of-ido))
 
 (provide 'ravi-init-marks)
 ;;; ravi-init-marks.el ends here
diff --git a/lisp/ravi-init-mu.el b/lisp/ravi-init-mu.el
index 2a204cc..288378a 100644
--- a/lisp/ravi-init-mu.el
+++ b/lisp/ravi-init-mu.el
@@ -86,9 +86,8 @@
           ;; To do: set this from ravi/epg-gpg-program
           (add-hook 'async-smtpmail-before-send-hook (lambda () (setq epg-gpg-program "gpg2")))
           (setq send-mail-function 'async-smtpmail-send-it)
-          (setq message-send-mail-function 'async-smtpmail-send-it)
-          )
-        :ensure t)
+          (setq message-send-mail-function 'async-smtpmail-send-it)))
+
 
       ;; Basic mu4e configuration parameters
       (setq mu4e-mu-binary (ravi/emacs-file "site-lisp/mu/mu/mu"))
@@ -140,8 +139,7 @@
         (progn
           (setq mu4e-maildirs-extension-custom-list
                 (-remove (lambda (f) (s-contains? "/[Gmail]" f t)) (mu4e-get-maildirs)))
-          (mu4e-maildirs-extension))
-        :ensure t)
+          (mu4e-maildirs-extension)))
 
       ;; Display desktop notifications
       (use-package mu4e-alert
@@ -149,8 +147,7 @@
         (progn
           (mu4e-alert-set-default-style 'libnotify)
           (mu4e-alert-disable-mode-line-display)
-          (mu4e-alert-enable-notifications))
-        :ensure t)
+          (mu4e-alert-enable-notifications)))
 
       (setq message-citation-line-function 'message-insert-formatted-citation-line)
       (setq message-kill-buffer-on-exit t)
@@ -192,9 +189,7 @@
   (progn
     (use-package elfeed-goodies
       :config
-      (elfeed-goodies/setup)
-      :ensure t)
-  :ensure t)
+      (elfeed-goodies/setup))))
 
 (provide 'ravi-init-mu)
 ;;; ravi-init-mu.el ends here
diff --git a/lisp/ravi-init-navigation.el b/lisp/ravi-init-navigation.el
index 93e778b..a2ed01e 100644
--- a/lisp/ravi-init-navigation.el
+++ b/lisp/ravi-init-navigation.el
@@ -49,10 +49,7 @@
     (defun ravi/without-region-bindings-mode (orig-func &rest args)
       (let* ((ravi/disable-region-bindings-mode t)
              (res (apply orig-func args)))
-        res))
-    )
-  :ensure t
-  )
+        res))))
 
 (use-package avy
   :bind (("M-h" . avy-goto-word-1)
@@ -63,33 +60,25 @@
   (progn
     (setq avy-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l ?r ?u ?t ?y ?w ?o ?e ?i))
     (setq avy-style 'at-full
-          avy-background t))
-  :ensure t)
+          avy-background t)))
 
 (use-package ace-isearch
   :config
   (progn
     (setq ace-isearch-use-ace-jump nil) ; prefer dedicated key for ace-jump
     (global-ace-isearch-mode +1))
-  :disabled t                           ; helm-swoop has a dedicated key now
-  :ensure t)
+  :disabled t)                          ; helm-swoop has a dedicated key now
 
 (use-package jump-char
-  :bind (("M-m" . jump-char-forward))
-  :ensure t
-  )
+  :bind (("M-m" . jump-char-forward)))
 
 (use-package imenu-anywhere
-  :bind ("s-." . imenu-anywhere)
-  :ensure t
-  )
+  :bind ("s-." . imenu-anywhere))
 
 (use-package expand-region
   :config
   (progn
-    (bind-key "C-=" 'er/expand-region))
-  :ensure t
-  )
+    (bind-key "C-=" 'er/expand-region)))
 
 (use-package multiple-cursors
   :bind (("C-S-c C-S-c" . mc/edit-lines)
@@ -104,31 +93,25 @@
     (bind-key "p" 'mc/mark-previous-like-this region-bindings-mode-map)
     (bind-key "n" 'mc/mark-next-like-this region-bindings-mode-map)
     (bind-key "m" 'mc/mark-more-like-this-extended region-bindings-mode-map)
-    )
-  :ensure t
-  )
+    ))
 
 (use-package fold-this
   :commands fold-this
   :config
   (progn
-    (bind-key "t" 'fold-this region-bindings-mode-map))
-  :ensure t
-  )
+    (bind-key "t" 'fold-this region-bindings-mode-map)))
 
 (use-package indirect
   :commands indirect-region
   :config
   (progn
     (bind-key "I" 'indirect-region region-bindings-mode-map))
-  )
+  :ensure nil)
 
 (use-package visual-regexp
   :bind (("C-c r" . vr/replace)
          ("C-c q" . vr/query-replace)
-         ("C-c m" . vr/mc-mark))
-  :ensure t
-  )
+         ("C-c m" . vr/mc-mark)))
 
 (bind-key "<M-f6>" 'ff-find-other-file)
 
@@ -144,10 +127,7 @@
     (add-hook 'emacs-lisp-mode-hook 'smartparens-mode)
     (add-hook 'emacs-lisp-mode-hook 'sp-use-smartparens-bindings)
     (use-package minor-mode-hack :ensure t)
-    (raise-minor-mode-map-alist 'region-bindings-mode)
-    )
-  :ensure t
-  )
+    (raise-minor-mode-map-alist 'region-bindings-mode)))
 
 (use-package corral
   :bind (("M-9" . corral-parentheses-backward)
@@ -159,24 +139,21 @@
          ("M-\"" . corral-double-quotes-backward))
   :config
   (progn
-    (setq corral-preserve-point t))
-  :ensure t)
+    (setq corral-preserve-point t)))
 
 ;; Marking and moving lines
 
 (defun ravi/pull-up-a-line()
   "Pull up the next line"
   (interactive)
-  (join-line -1)
-  )
+  (join-line -1))
 
 (bind-key "M-j" 'ravi/pull-up-a-line)
 
 (use-package move-lines
   :bind (("<S-down>" . move-lines-down)
-         ("<S-up>" . move-lines-up)
-         )
-  )
+         ("<S-up>" . move-lines-up))
+  :ensure nil)
 
 ;; From Kyle Sherman's comment at
 ;; http://emacs-fu.blogspot.com/2010/01/duplicating-lines-and-commenting-them.html
@@ -211,8 +188,7 @@
     (global-key-combo-mode 1)
     (key-combo-define-global (kbd "C-a")
                              `(back-to-indentation move-beginning-of-line
-                                                   key-combo-return)))
-  :ensure t)
+                                                   key-combo-return))))
 
 (defun ravi/Fuco-point-in-comment ()
   "Determine if the point is inside a comment"
@@ -251,22 +227,18 @@
       )
     (add-hook 'prog-mode-hook 'turn-on-whole-line-or-region-mode)
     )
-  :diminish whole-line-or-region-mode
-  :ensure t
-  )
+  :diminish whole-line-or-region-mode)
 
 ;; This must be after enabling whole-line-or-region
 (use-package easy-kill
   :config
   (progn
     (global-set-key [remap kill-ring-save] 'easy-kill)
-    (global-set-key [remap whole-line-or-region-kill-ring-save] 'easy-kill))
-  :ensure t)
+    (global-set-key [remap whole-line-or-region-kill-ring-save] 'easy-kill)))
 
 ;; grep and friends
 
-(use-package wgrep
-  :ensure t)
+(use-package wgrep)
 
 (if (executable-find "ag")
     ;; Prefer the silver-searcher if available
@@ -278,9 +250,7 @@
       (progn
         (setq ag-highlight-search t)
         (setq ag-reuse-buffers t)
-        (use-package wgrep-ag
-          :ensure t))
-      :ensure t)
+        (use-package wgrep-ag)))
   ;; Use grep if ag is not available on the system
   (use-package grep
     :bind (("H-g" . grep))))
@@ -304,9 +274,7 @@
       (highlight-symbol-next)
       (set-temporary-overlay-map ravi/highlight-symbol-overlay-map t))
     )
-  :disabled t                           ; M-s . suffices for my needs
-  :ensure t
-  )
+  :disabled t)                          ; M-s . suffices for my needs
 
 (let ((ad-redefinition-action 'accept))
   (use-package color-moccur
@@ -318,11 +286,7 @@
       (bind-key "M-O" 'isearch-moccur-all isearch-mode-map))
 
     :config
-    (use-package moccur-edit)
-
-    :ensure t
-    )
-  )
+    (use-package moccur-edit)))
 
 ;; Delete via isearch
 (defun zap-to-isearch (rbeg rend)
@@ -402,8 +366,7 @@
       ("s" swoop)
       ("m" swoop-multi "multi")
       ("r" swoop-pcre "pcre")
-      ("b" swoop-back-to-last-position "back")))
-  :ensure t)
+      ("b" swoop-back-to-last-position "back"))))
 
 (bind-key (kbd "y") 'info-display-manual help-map)
 
@@ -412,8 +375,7 @@
   (progn
     (beginend-global-mode)
     (dolist (m beginend-modes)
-      (diminish (cdr m))))
-  :ensure t)
+      (diminish (cdr m)))))
 
 (require 'midnight)
 
diff --git a/lisp/ravi-init-org.el b/lisp/ravi-init-org.el
index 7e7d97b..50a54f4 100644
--- a/lisp/ravi-init-org.el
+++ b/lisp/ravi-init-org.el
@@ -41,10 +41,9 @@
         (setq org-reveal-theme "night")
         (setq org-reveal-transition "linear")
         (setq org-reveal-mathjax t)
-        (setq org-reveal-mathjax-url "./MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"))
-      :ensure t)
-    (use-package ox-rst :ensure t)
-    (use-package ox-impress-js :ensure t)
+        (setq org-reveal-mathjax-url "./MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML")))
+    (use-package ox-rst)
+    (use-package ox-impress-js)
 
     (setq org-src-fontify-natively t)
     (setq org-modules (quote (org-bbdb
@@ -70,8 +69,7 @@
          )
       :config
       (progn
-        (add-to-list 'org-latex-minted-langs '(ipython "python")))
-      :ensure t)
+        (add-to-list 'org-latex-minted-langs '(ipython "python"))))
     )
   )
 
diff --git a/lisp/ravi-init-python.el b/lisp/ravi-init-python.el
index 100b448..6016267 100644
--- a/lisp/ravi-init-python.el
+++ b/lisp/ravi-init-python.el
@@ -87,11 +87,7 @@
       (progn
         (venv-initialize-interactive-shells)
         (venv-initialize-eshell)
-        (setq venv-location (expand-file-name "~/usr/local/venv/"))
-        )
-
-      :ensure t
-      )
+        (setq venv-location (expand-file-name "~/usr/local/venv/"))))
 
     ;; Use jedi.el for code completion plus documentation browsing.
     ;; The main issue is that this requires both python-side and emacs-side
@@ -131,16 +127,12 @@
         (defun ravi/python-jedi-hook-installer ()
           ;; (setq jedi:complete-on-dot t) ; needs auto-complete
           (add-hook 'hack-local-variables-hook 'ravi/jedi-setup nil t))
-        (add-hook 'python-mode-hook 'ravi/python-jedi-hook-installer)
-        )
-      :ensure t
-      )
+        (add-hook 'python-mode-hook 'ravi/python-jedi-hook-installer)))
 
     (use-package company-jedi
       :config
       (progn
-        (add-to-list 'company-backends 'company-jedi))
-      :ensure t)
+        (add-to-list 'company-backends 'company-jedi)))
 
     (use-package sphinx-doc
       :config
@@ -149,8 +141,7 @@
           (sphinx-doc-mode 1))
         (add-hook 'python-mode-hook 'ravi/sphinx-doc-setup)
         )
-      :diminish sphinx-doc-mode
-      :ensure t)
+      :diminish sphinx-doc-mode)
 
     (use-package python-docstring
       :config
@@ -158,15 +149,14 @@
         (defun ravi/python-docstring-mode-setup ()
           (python-docstring-mode 1))
         (add-hook 'python-mode-hook 'ravi/python-docstring-mode-setup))
-      :diminish python-docstring-mode
-      :ensure t)
+      :diminish python-docstring-mode)
 
     (use-package electric-operator
       :config
       (progn
         (add-hook 'python-mode-hook #'electric-operator-mode))
       ;; :diminish electric-operator
-      :ensure t)
+      )
     )
   )
 
diff --git a/lisp/ravi-init-repl.el b/lisp/ravi-init-repl.el
index 3191bb3..b697147 100644
--- a/lisp/ravi-init-repl.el
+++ b/lisp/ravi-init-repl.el
@@ -29,9 +29,8 @@
   :config
   (progn
     (bind-key "<up>" 'comint-previous-matching-input-from-input comint-mode-map)
-    (bind-key "<down>" 'comint-next-matching-input-from-input comint-mode-map)
-    )
-  )
+    (bind-key "<down>" 'comint-next-matching-input-from-input comint-mode-map))
+  :ensure nil)
 
 (use-package octave-mod
   :mode ("\\.m\\'" . octave-mode)
@@ -43,7 +42,7 @@
       (if (get-buffer inferior-octave-buffer)
           (pop-to-buffer (get-buffer inferior-octave-buffer))
         (inferior-octave nil))) )
-  )
+  :ensure nil)
 
 (use-package repl-toggle
   :config
@@ -66,8 +65,7 @@
     (unbind-key "C-c C-z" repl-toggle-mode-map)
     (bind-key "<f5>" 'ravi/repl-toggle-or-compile-dwim repl-toggle-mode-map)
     )
-  :diminish repl-toggle-mode
-  :ensure t)
+  :diminish repl-toggle-mode)
 
 ;; Calc and friends
 (bind-key "H-c" 'calc)
diff --git a/lisp/ravi-init-tex.el b/lisp/ravi-init-tex.el
index 3143192..90f1362 100644
--- a/lisp/ravi-init-tex.el
+++ b/lisp/ravi-init-tex.el
@@ -39,7 +39,8 @@
       (progn
         (use-package reftex
           :defer t
-          :diminish reftex-mode)
+          :diminish reftex-mode
+          :ensure nil)
         ;; fix the "bug" in SP regexp wrap that treats ' as "word"
         (modify-syntax-entry ?' ".")
 
@@ -47,8 +48,8 @@
         (sp-local-pair 'latex-mode "\\begin" "\\end")
         (sp-local-tag 'latex-mode "\\ba" "\\begin{align*}" "\\end{align*}")
 
-        (use-package preview)
-        (use-package font-latex)
+        (use-package preview :ensure nil)
+        (use-package font-latex :ensure nil)
         (fset 'tex-font-lock-subscript 'ignore)
 
         (sp-with-modes '(tex-mode plain-tex-mode latex-mode)
@@ -149,15 +150,13 @@ starting with \\ and followed by a block of text enclosed in {}."
              (setq-local company-backends
                          (append '(company-math-symbols-latex company-latex-commands)
                       company-backends)))
-           (add-hook 'TeX-mode-hook 'ravi/company-math-setup))
-          :ensure t)
+           (add-hook 'TeX-mode-hook 'ravi/company-math-setup)))
 
         (use-package latex-extra
           :config
           (progn
             (add-hook 'LaTeX-mode-hook 'latex-extra-mode))
-          :diminish latex-extra-mode
-          :ensure t)
+          :diminish latex-extra-mode)
 
         (defun my-LaTeX-preview-math ()
           (interactive)
@@ -192,7 +191,8 @@ starting with \\ and followed by a block of text enclosed in {}."
           (message "LaTeX mode init complete."))
         ;; ACUTeX replaces latex-mode-hook with LaTeX-mode-hook
         (add-hook 'LaTeX-mode-hook 'my-LaTeX-mode-init)
-        ))
+        )
+      :ensure nil)
     )
   )
 
diff --git a/lisp/ravi-init-vc.el b/lisp/ravi-init-vc.el
index a87cdb9..e911979 100644
--- a/lisp/ravi-init-vc.el
+++ b/lisp/ravi-init-vc.el
@@ -55,27 +55,22 @@
     (unbind-key "C-x g" magit-file-mode-map)
 
     (use-package magit-svn
-      :config (add-hook 'magit-mode-hook 'magit-svn-mode)
-      :ensure t)
+      :config (add-hook 'magit-mode-hook 'magit-svn-mode))
     )
   :ensure t)
-(use-package gitignore-mode
-  :ensure t)
-(use-package gitconfig-mode
-  :ensure t)
+(use-package gitignore-mode)
+(use-package gitconfig-mode)
 (use-package git-messenger
-  :bind ("C-x v p" . git-messenger:popup-message)
-  :ensure t)
+  :bind ("C-x v p" . git-messenger:popup-message))
 (use-package git-timemachine
-  :bind ("C-x v t" . git-timemachine)
-  :ensure t)
+  :bind ("C-x v t" . git-timemachine))
 (use-package vc-git
-  :bind ("C-x v f" . vc-git-grep))
+  :bind ("C-x v f" . vc-git-grep)
+  :ensure nil)
 
 (use-package diff-hl
   :config
-  (global-diff-hl-mode)
-  :ensure t)
+  (global-diff-hl-mode))
 
 ;; Stolen almost entirely from Fuco (Matus Goljer)
 (use-package ediff
diff --git a/lisp/ravi-init-web.el b/lisp/ravi-init-web.el
index 85446ef..2c7d761 100644
--- a/lisp/ravi-init-web.el
+++ b/lisp/ravi-init-web.el
@@ -34,7 +34,6 @@
   (progn
     (unbind-key "C-j" emmet-mode-keymap)
     (bind-key "M-r" 'emmet-expand-line emmet-mode-keymap))
-  :ensure t
   :diminish emmet-mode)
 
 ;; Javascript
@@ -49,24 +48,20 @@
     (use-package js2-refactor
       :config
       (progn
-        (js2r-add-keybindings-with-prefix "C-c C-m"))
-      :ensure t)
+        (js2r-add-keybindings-with-prefix "C-c C-m")))
 
     (defun ravi/js2-mode-hook ()
       (emmet-mode)
       (setq js2-basic-offset 2)
       (when (functionp 'helm-dash)
         (setq-local helm-dash-docsets '("JavaScript" "jQuery" "jQuery UI"))))
-    (add-hook 'js2-mode-hook 'ravi/js2-mode-hook))
-  :ensure t
-  )
+    (add-hook 'js2-mode-hook 'ravi/js2-mode-hook)))
 
 ;; Interact with the browser
 (use-package skewer-mode
   :config
   (progn
-    (skewer-setup))
-  :ensure t)
+    (skewer-setup)))
 
 ;; HTML with web-mode
 (use-package web-mode
@@ -98,10 +93,7 @@
     (setq web-mode-markup-indent-offset 2)
     (setq web-mode-css-indent-offset 2)
     (setq web-mode-code-indent-offset 2)
-    (setq web-mode-enable-part-face t)
-    )
-
-  :ensure t)
+    (setq web-mode-enable-part-face t)))
 
 (defun ravi/css-mode-extra-hook ()
   (when (functionp 'helm-dash)
-- 
cgit v0.10.1