   ("<f4> n" . deft))
 
 (use-package company
+  :commands global-company-mode
   :init
   (progn
     (setq company-minimum-prefix-length 1)
     (add-hook 'after-init-hook 'global-company-mode))
-  :config
-  (progn
-    ;(use-package helm-company :defer 3)
-    (use-package company-irony
-      :config
-      (progn
-        (add-to-list 'company-backends 'company-irony))))
   :diminish company-mode)
 
 ;; N.B. to use, need to run irony-install-server, which requires libclang-dev
 (use-package irony
+  :commands irony-mode
   :init
   (progn
     (add-hook 'c++-mode-hook 'irony-mode)

          smooth-scroll-strict-margins t)))

(use-package whitespace
  :init
  (progn
    (setq whitespace-line-column 80                      ; highlight columns past 80

    (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options))
  :config
  (progn
    (use-package company-irony
      :config
      (progn
        (add-to-list 'company-backends 'company-irony)))
    (use-package flycheck-irony
      :commands flycheck-irony-setup
      :config
      (progn
        (add-hook 'flycheck-mode-hook #'flycheck-irony-setup))))
