diff --git a/layers/+lang/nim/extensions.el b/layers/+lang/nim/extensions.el
deleted file mode 100644
index 4c62622a4..000000000
--- a/layers/+lang/nim/extensions.el
+++ /dev/null
@@ -1,11 +0,0 @@
-(setq nim-pre-extensions
-      '())
-
-(setq nim-post-extensions
-      ;; taken from https://github.com/ALSchwalm/flycheck-nim
-      '(flycheck-nim))
-
-(defun nim/init-flycheck-nim ()
-  (spacemacs/add-flycheck-hook 'nim-mode)
-  (use-package flycheck-nim
-    :if (configuration-layer/layer-usedp 'syntax-checking)))
diff --git a/layers/+lang/nim/extensions/flycheck-nim/flycheck-nim.el b/layers/+lang/nim/local/flycheck-nim/flycheck-nim.el
similarity index 100%
rename from layers/+lang/nim/extensions/flycheck-nim/flycheck-nim.el
rename to layers/+lang/nim/local/flycheck-nim/flycheck-nim.el
diff --git a/layers/+lang/nim/packages.el b/layers/+lang/nim/packages.el
index ede3e846b..036c129e3 100644
--- a/layers/+lang/nim/packages.el
+++ b/layers/+lang/nim/packages.el
@@ -1,26 +1,29 @@
 (setq nim-packages
       '(company
+        company-nim
         flycheck
+        (flycheck-nim :location local)
         nim-mode))
 
+(defun nim/post-init-company ()
+  (spacemacs|add-company-hook nim-mode))
+
+(defun nim/post-init-flycheck ()
+  (spacemacs/add-flycheck-hook 'nim-mode))
+
+(defun nim/init-flycheck-nim ()
+  (use-package flycheck-nim
+    :if (configuration-layer/package-usedp 'flycheck)))
+
 (defun nim/init-nim-mode ()
   (use-package nim-mode
     :defer t
+    :init (when (configuration-layer/package-usedp 'company)
+            (push 'company-nim company-backends-nim-mode))
     :config
     (progn
       (defun spacemacs/nim-compile-run ()
         (interactive)
         (shell-command "nim compile --run main.nim"))
-
       (evil-leader/set-key-for-mode 'nim-mode
         "mcr" 'spacemacs/nim-compile-run))))
-
-(when (configuration-layer/layer-usedp 'auto-completion)
-  (defun nim/post-init-company ()
-    (spacemacs|add-company-hook nim-mode))
-
-  (defun nim/init-company-nim ()
-    (use-package company-nim
-      :defer t
-      :init
-      (push 'company-nim company-backends-nim-mode))))