6 files changed, 32 insertions, 32 deletions
diff --git a/modules/init-emmet-mode.el b/modules/init-emmet-mode.el
index 565266b..faa4779 100644
--- a/modules/init-emmet-mode.el
+++ b/modules/init-emmet-mode.el
@@ -6,10 +6,10 @@
 ;; emmet-mode
 (use-package emmet-mode
   ;; Enable for only languages
-  :init
-  (add-hook 'sgml-mode-hook 'emmet-mode) ;; Auto-start on any markup modes
-  (add-hook 'web-mode-hook  'emmet-mode) ;; enable Emmet on web-mode
-  (add-hook 'css-mode-hook  'emmet-mode) ;; enable Emmet's css abbreviation.
+  :hook
+  (sgml-mode . emmet-mode) ;; Auto-start on any markup modes
+  (web-mode  . emmet-mode) ;; enable Emmet on web-mode
+  (css-mode  . emmet-mode) ;; enable Emmet's css abbreviation.
 )
 
 (provide 'init-emmet-mode)
diff --git a/modules/init-flycheck.el b/modules/init-flycheck.el
index e4d383e..c85328d 100644
--- a/modules/init-flycheck.el
+++ b/modules/init-flycheck.el
@@ -3,17 +3,7 @@
 ;;
 
 ;;; Code:
-
 (use-package flycheck
-  ;; Enable for only languages
-  :init
-  ;; (add-hook 'after-init-hook 'global-flycheck-mode)
-  (add-hook 'c++-mode-hook 'flycheck-mode)
-  ;; (add-hook 'emacs-lisp-mode-hook 'flycheck-mode)
-  (add-hook 'html-mode-hook 'flycheck-mode)
-  (add-hook 'js-mode-hook 'flycheck-mode)
-  (add-hook 'web-mode-hook 'flycheck-mode)
-  (add-hook 'sh-mode-hook 'flycheck-mode)
   :config
   ;; support web-mode with PHP
   (flycheck-define-checker mix-php
@@ -27,7 +17,14 @@
     :modes (php-mode php+-mode web-mode))
 
   (add-to-list 'flycheck-checkers 'mix-php)
-  )
+  ;; Enable for only languages
+  :hook
+  (c++-mode  . flycheck-mode)
+  ;; (emacs-lisp-mode flycheck-mode)
+  (html-mode . flycheck-mode)
+  (js-mode   . flycheck-mode)
+  (web-mode  . flycheck-mode)
+  (sh-mode   . flycheck-mode))
 
 (provide 'init-flycheck)
 
diff --git a/modules/init-git.el b/modules/init-git.el
index 35a37ff..5d7e96f 100644
--- a/modules/init-git.el
+++ b/modules/init-git.el
@@ -69,7 +69,8 @@
   :ensure t
   :mode ("/\\.?git/?config$"
          "/\\.gitmodules$")
-  :init (add-hook 'gitconfig-mode-hook 'flyspell-mode))
+  :hook
+  (gitconfig-mode . flyspell-mode))
 
 (use-package gitignore-mode
   :ensure t
diff --git a/modules/init-nlinum.el b/modules/init-nlinum.el
index 465ff03..2bdb25c 100644
--- a/modules/init-nlinum.el
+++ b/modules/init-nlinum.el
@@ -17,14 +17,16 @@
   :config
   (linum-mode 1)
   :hook
-  (apache-mode . linum-mode)
-  (elisp-mode . linum-mode)
-  (html-mode . linum-mode)
-  (js-mode . linum-mode)
+  (apache-mode   . linum-mode)
+  (elisp-mode    . linum-mode)
+  (html-mode     . linum-mode)
+  (js-mode       . linum-mode)
+  (less-mode     . linum-mode)
   (markdown-mode . linum-mode)
-  (nginx-mode . linum-mode)
-  (php-mode . linum-mode)
-  (web-mode . linum-mode))
+  (nginx-mode    . linum-mode)
+  (php-mode      . linum-mode)
+  (sass-mode     . linum-mode)
+  (web-mode      . linum-mode))
 
 (use-package hl-line)
 
diff --git a/modules/init-php.el b/modules/init-php.el
index b81e5b8..ac12eec 100644
--- a/modules/init-php.el
+++ b/modules/init-php.el
@@ -6,8 +6,8 @@
 (use-package php-refactor-mode
   :after (php-mode)
   :mode ("\\.php\\'" . php-mode)
-  :config
-  (add-hook 'php-mode-hook 'php-refactor-mode))
+  :hook
+  (php-mode . php-refactor-mode))
 
 (use-package php-mode
   :ensure t)
diff --git a/modules/init-rainbow.el b/modules/init-rainbow.el
index 52db71e..fbad509 100644
--- a/modules/init-rainbow.el
+++ b/modules/init-rainbow.el
@@ -5,13 +5,13 @@
 ;;; Code:
 ;; rainbow-mode
 (use-package rainbow-mode
-  :init
-  (add-hook 'css-mode-hook 'rainbow-mode)
-  (add-hook 'sass-mode-hook 'rainbow-mode)
-  (add-hook 'scss-mode-hook 'rainbow-mode)
-  (add-hook 'less-mode-hook 'rainbow-mode)
-  (add-hook 'web-mode-hook 'rainbow-mode)
-  (add-hook 'html-mode-hook 'rainbow-mode))
+  :hook
+  (css-mode  . rainbow-mode)
+  (sass-mode . rainbow-mode)
+  (scss-mode . rainbow-mode)
+  (less-mode . rainbow-mode)
+  (web-mode  . rainbow-mode)
+  (html-mode . rainbow-mode))
 
 (provide 'init-rainbow)
 ;;; init-rainbow.el ends here