diff --git a/core/core-flycheck.el b/core/core-flycheck.el
index 33d6ce5b6..6b82e5001 100644
--- a/core/core-flycheck.el
+++ b/core/core-flycheck.el
@@ -9,16 +9,6 @@
         ;; Removed checks on idle/change for snappiness
         flycheck-check-syntax-automatically '(save mode-enabled idle-change)
         flycheck-disabled-checkers '(emacs-lisp-checkdoc make))
-
-  (add-hook! (ruby-mode
-              python-mode
-              go-mode
-              php-mode
-              lua-mode
-              shell-mode
-              scss-mode
-              c++-mode
-              c-mode) 'flycheck-mode)
   :config
   (add-unreal-buffer! "^\\*Flycheck.*\\*$")
 
diff --git a/modules/module-cc.el b/modules/module-cc.el
index a42da3719..c1557a4af 100644
--- a/modules/module-cc.el
+++ b/modules/module-cc.el
@@ -25,6 +25,7 @@
   :init
   (associate! c++-mode  :match "\\.h$")
   (associate! objc-mode :match "\\.mm$")
+  (add-hook! (c-mode c++-mode) 'flycheck-mode)
   :config
   (setq c-basic-offset 4
         c-tab-always-indent nil
diff --git a/modules/module-go.el b/modules/module-go.el
index ece4735df..d8b43862b 100644
--- a/modules/module-go.el
+++ b/modules/module-go.el
@@ -3,7 +3,8 @@
 (use-package go-mode
   :mode "\\.go$"
   :interpreter "go"
-  :init (add-hook! go-mode 'emr-initialize)
+  :init
+  (add-hook! go-mode '(emr-initialize flycheck-mode))
   :config
   (bind! :map go-mode-map
          :n "gd" 'godef-jump
diff --git a/modules/module-lua.el b/modules/module-lua.el
index 46085eb65..4cc296e35 100644
--- a/modules/module-lua.el
+++ b/modules/module-lua.el
@@ -7,9 +7,8 @@
   (setq-default lua-indent-level tab-width)
   ;; (after! company-dict
   ;;   (add-to-list 'company-dict-minor-mode-alist 'love-mode))
-  (add-hook! lua-mode
-    (narf|enable-tab-width-2)
-    (setq lua-indent-level 2)))
+  (add-hook! lua-mode '(narf|enable-tab-width-2 flycheck-mode))
+  (add-hook! lua-mode (setq lua-indent-level 2)))
 
 (define-minor-mode love-mode
   "Buffer local minor mode for Love2D"
diff --git a/modules/module-php.el b/modules/module-php.el
index aa5d7eab4..d3accfe32 100644
--- a/modules/module-php.el
+++ b/modules/module-php.el
@@ -3,6 +3,7 @@
 (use-package php-mode
   :mode "\\.\\(php\\|inc\\)$"
   :init
+  (add-hook! php-mode 'flycheck-mode)
   (setq php-template-compatibility nil
         php-extras-eldoc-functions-file (concat narf-temp-dir "php-extras-eldoc-functions"))
   :config
diff --git a/modules/module-python.el b/modules/module-python.el
index d709d1ccb..77dcbff36 100644
--- a/modules/module-python.el
+++ b/modules/module-python.el
@@ -5,7 +5,7 @@
   :interpreter ("python"   . python-mode)
   :commands    python-mode
   :init
-  (add-hook! python-mode '(narf|enable-tab-width-4 emr-initialize))
+  (add-hook! python-mode '(narf|enable-tab-width-4 emr-initialize flycheck-mode))
   (setq python-indent-offset 4
         python-environment-directory narf-temp-dir
         python-shell-interpreter "ipython")
diff --git a/modules/module-ruby.el b/modules/module-ruby.el
index c8bd29c0d..e9c4a24ae 100644
--- a/modules/module-ruby.el
+++ b/modules/module-ruby.el
@@ -8,7 +8,7 @@
          "/\\(Gem\\|Cap\\|Vagrant\\|Rake\\)file$")
   :interpreter "ruby"
   :init
-  (add-hook! ruby-mode 'narf|enable-tab-width-2)
+  (add-hook! ruby-mode '(narf|enable-tab-width-2 flycheck-mode))
   (build-for! ruby-mode "rake %s" "Rakefile")
   :config
   ;; Formatting
diff --git a/modules/module-sass.el b/modules/module-sass.el
index bf61dcdf2..9a4151531 100644
--- a/modules/module-sass.el
+++ b/modules/module-sass.el
@@ -8,7 +8,7 @@
 (use-package scss-mode
   :mode "\\.scss$"
   :init
-  (add-hook! scss-mode '(narf|enable-tab-width-2 hs-minor-mode))
+  (add-hook! scss-mode '(narf|enable-tab-width-2 hs-minor-mode flycheck-mode))
   (setq-default css-indent-offset 2)
   (setq scss-compile-at-save nil)
   :config