Fix everything broken by upgrading use-package

init-genesis.org

@@ -540,32 +540,40 @@ http://www.emacswiki.org/emacs/ZapToISearch
 * Spelling
 
 #+begin_src emacs-lisp
-  (require 'ispell)
-
-  (when (executable-find ispell-program-name)
-    (if (fboundp 'prog-mode)
-        (add-hook 'prog-mode-hook 'flyspell-prog-mode)
-      (dolist (hook '(lisp-mode-hook
-                      emacs-lisp-mode-hook
-                      scheme-mode-hook
-                      clojure-mode-hook
-                      ruby-mode-hook
-                      yaml-mode
-                      python-mode-hook
-                      shell-mode-hook
-                      php-mode-hook
-                      css-mode-hook
-                      haskell-mode-hook
-                      caml-mode-hook
-                      nxml-mode-hook
-                      crontab-mode-hook
-                      perl-mode-hook
-                      tcl-mode-hook
-                      javascript-mode-hook))
-        (add-hook hook 'flyspell-prog-mode)))
-
-    (after-load 'flyspell
-      (add-to-list 'flyspell-prog-text-faces 'nxml-text-face)))
+  (use-package ispell
+    :init
+    (setq ispell-program-name "/usr/local/bin/aspell"))
+
+  (use-package flyspell
+    :if (executable-find ispell-program-name)
+    :config
+    (progn
+      (setq ispell-extra-args '("--sug-mode=ultra"
+                                "--lang=uk"
+                                "--run-together"
+                                "--run-together-limit=5"
+                                "--run-together-min=2"))
+      (add-to-list 'flyspell-prog-text-faces 'nxml-text-face)
+      (if (fboundp 'prog-mode)
+          (add-hook 'prog-mode-hook 'flyspell-prog-mode)
+        (dolist (hook '(lisp-mode-hook
+                        emacs-lisp-mode-hook
+                        scheme-mode-hook
+                        clojure-mode-hook
+                        ruby-mode-hook
+                        yaml-mode
+                        python-mode-hook
+                        shell-mode-hook
+                        php-mode-hook
+                        css-mode-hook
+                        haskell-mode-hook
+                        caml-mode-hook
+                        nxml-mode-hook
+                        crontab-mode-hook
+                        perl-mode-hook
+                        tcl-mode-hook
+                        javascript-mode-hook))
+          (add-hook hook 'flyspell-prog-mode)))))
 #+end_src
 
 * goto-address

init-languages.org

@@ -30,7 +30,7 @@ encounter, and configures them for effective use.
     (progn
       (use-package cljsbuild-mode)
       (use-package elein)
-      (use-package typed-clojure-mode :diminish typed-clojure)
+      (use-package typed-clojure-mode)
 
       (define-clojure-indent
         (defroutes 'defun)
@@ -181,7 +181,7 @@ Use conf-mode for [[https://github.com/ddollar/foreman][Foreman]] Procfiles.
 Better support for Dot diagrams.
 
 #+begin_src emacs-lisp
-  (use-package graphviz-dot
+  (use-package graphviz-dot-mode
     :init
     (setq graphviz-dot-indent-width 2))
 #+end_src

init-packages.org

@@ -66,8 +66,7 @@ using a simple API.
 #+begin_src emacs-lisp
   (use-package company
     :diminish company-mode
-    :idle
-    (global-company-mode 1)
+    :init (global-company-mode 1)
 
     :config
     (progn
@@ -124,7 +123,7 @@ https://github.com/Valloric/ycmd
       (guide-key/add-local-guide-key-sequence "%")
 
       (use-package dired+
-        :init (global-dired-hide-details-mode -1))))
+        :config (global-dired-hide-details-mode -1))))
 #+end_src
 
 Some interesting options available to GNU ls:
@@ -389,7 +388,7 @@ Powered by [[http://www.gnu.org/software/global/][GNU Global]].
 
 #+begin_src emacs-lisp
   (use-package ido
-    :idle
+    :init
     (progn
       (setq
        ido-auto-merge-work-directories-length 0
@@ -542,6 +541,7 @@ Diminish isn't supported, so we have to use the slightly less powerful
     :init
     (progn
       (setq
+       sml/no-confirm-load-theme t
        sml/theme 'respectful
        sml/shorten-modes t
        sml/hidden-modes '(" EvilOrg"
@@ -552,9 +552,11 @@ Diminish isn't supported, so we have to use the slightly less powerful
                           " Undo-Tree"
                           " yas"
                           " WSC"))
+      (sml/setup))
+    :config
+    (progn
       (add-to-list 'sml/replacer-regexp-list '("^~/Dropbox" ":Box:") t)
-      (add-to-list 'sml/replacer-regexp-list '("^~/Code" ":C:") t)
-      (sml/setup)))
+      (add-to-list 'sml/replacer-regexp-list '("^~/Code" ":C:") t)))
 #+end_src
 
 * SmartParens
@@ -636,7 +638,6 @@ Can be [[https://github.com/ggreer/the_silver_searcher#installation][installed]]
 
 #+begin_src emacs-lisp
   (use-package undo-tree
-    :diminish undo-tree
     :init
     (global-undo-tree-mode))
 #+end_src
@@ -685,7 +686,7 @@ your search results.
 
 #+begin_src emacs-lisp
   (use-package yasnippet
-    :idle
+    :init
     (yas-global-mode 1)
 
     :config

init-ubiquitous.org

@@ -34,7 +34,8 @@ pretend they're built into Emacs.
 per package.
 
 #+begin_src emacs-lisp
-  (require 'use-package)
+  (eval-when-compile
+    (require 'use-package))
 #+end_src
 
 * diminish
@@ -45,6 +46,11 @@ minor mode indicators.
 #+begin_src emacs-lisp
   (require 'diminish)
 #+end_src
+* bind-key
+
+#+begin_src emacs-lisp
+  (require 'bind-key)
+#+end_src
 
 * exec-path-from-shell
 

init-version-control.org

@@ -43,16 +43,7 @@
       (use-package git-rebase-mode)
       (use-package gitignore-mode)
       (use-package gitconfig-mode)
-
-      (use-package magit-gh-pulls
-        ;; :config
-        ;; (add-hook 'magit-mode-hook 'turn-on-magit-gh-pulls)
-        ))
-
-    :idle
-    (progn
-      (use-package magit-svn
-        :diminish magit-svn-mode)
+      (use-package magit-svn :diminish magit-svn-mode)
       (add-hook 'magit-mode-hook 'turn-on-magit-svn)))
 #+end_src