 
 (req-package-finish) ; Start loading packages in right order
 
-
 ;; require `secrets' but don't trigger error if not found
 (if (daemonp)
     (add-hook 'window-setup-hook
-              (λ (require 'secrets "secrets.el.gpg" t)))
-  (require 'secrets "secrets.el.gpg" t))
+              (λ (message ">> Daemon mode")
+                ;; It is mandatory to load linum AFTER the frames are set up
+                ;; Else, I get "*ERROR*: Invalid face: linum"
+                (require 'setup-linum)
+                (require 'secrets "secrets.el.gpg" t)))
+  (progn
+    (message ">> Non daemon mode")
+    (require 'setup-linum)
+    (require 'secrets "secrets.el.gpg" t)))
 
 (require 'setup-big-fringe)
 

;; Time-stamp: <2015-02-09 14:36:51 kmodi>
;; Author: Kaushal Modi

;; Record the start time

(req-package setup-ibuffer)
(req-package setup-ido)
(req-package setup-iregister)
(when (executable-find "git")
  (req-package setup-magit))
(req-package setup-manage-minor-mode)
