4 files changed, 14 insertions, 7 deletions

diff --git a/lisp/init-go-mode.el b/lisp/init-go-mode.el
index 9e6b70b..88fd61b 100644
--- a/lisp/init-go-mode.el
+++ b/lisp/init-go-mode.el
@@ -42,12 +42,13 @@ items follow a style that is consistent with other prog-modes."
               (setq-local fill-column 120)
               ;; use flat imenu index
               (setq-local imenu-create-index-function
-                          #'go-mode-create-flat-imenu-index)))
+                          #'go-mode-create-flat-imenu-index))))
 
-  ;; install go-rename if gorename is found in PATH
-  (use-package go-rename
-    :if (executable-find "gorename")
-    :bind (:map go-mode-map
-                ("C-c r" . go-rename))))
+;; install go-rename if gorename is found in PATH
+(use-package go-rename
+  :after go-mode
+  :if (executable-find "gorename")
+  :bind (:map go-mode-map
+              ("C-c r" . go-rename)))
 
 (provide 'init-go-mode)
diff --git a/lisp/init-ibuffer.el b/lisp/init-ibuffer.el
index fbc2b8d..67aade4 100644
--- a/lisp/init-ibuffer.el
+++ b/lisp/init-ibuffer.el
@@ -22,6 +22,7 @@
   ;; group ibuffer by projectile project
   (add-hook 'ibuffer-hook 'ibuffer-projectile-set-filter-groups))
 
-(use-package ibuffer-projectile)
+(use-package ibuffer-projectile
+  :after (ibuffer projectile))
 
 (provide 'init-ibuffer)
diff --git a/lisp/init-ido.el b/lisp/init-ido.el
index b835515..a47fbce 100644
--- a/lisp/init-ido.el
+++ b/lisp/init-ido.el
@@ -18,6 +18,7 @@
 
 ;; flx-ido
 (use-package flx-ido
+  :after ido
   :init
   ;; disable ido faces to see flx highlights.
   (setq ido-use-faces nil
@@ -28,11 +29,13 @@
 
 ;; ido-grid-mode
 (use-package ido-grid-mode
+  :after ido
   :config
   (ido-grid-mode 1))
 
 ;; ido-completing-read+
 (use-package ido-completing-read+
+  :after ido
   :init
   ;; automatically update blacklist when package is updated
   (setq ido-cr+-auto-update-blacklist t)
@@ -42,6 +45,7 @@
 
 ;; smex
 (use-package smex
+  :after ido
   :init
   ;; do not update cache automatically on every invocation
   (setq smex-auto-update nil)
diff --git a/lisp/init-rust-mode.el b/lisp/init-rust-mode.el
index 534265d..333fe60 100644
--- a/lisp/init-rust-mode.el
+++ b/lisp/init-rust-mode.el
@@ -8,6 +8,7 @@
 
 ;; configure flycheck to support cargo project layout
 (use-package flycheck-rust
+  :after (flycheck rust-mode)
   :config
   (add-hook 'flycheck-mode-hook #'flycheck-rust-setup))