   (spacemacs/set-leader-keys-for-major-mode 'org-mode "cd" 'org-clock-display)
   (spacemacs/set-leader-keys-for-major-mode 'org-mode "cr" 'org-clock-report)
 
-  ; column view config
+
+  ;;; Column view config
   (spacemacs/set-leader-keys-for-major-mode 'org-mode "q" 'org-columns)
 
-  (setq org-log-done "note"
-        org-log-reschedule "note")
-
-  (with-eval-after-load 'org (setq org-agenda-files
-                                   '("~/org/")))
-
-  ;; Capture templates
+
+  ;;; Capture templates
   (global-set-key (kbd "<f6>") 'org-capture)
 
   (setq org-refile-targets '((org-agenda-files . (:maxlevel . 6))))

  (custom-set-faces
   '(org-scheduled-today ((t (:foreground "DodgerBlue2" :height 1.0)))))

  (setq org-log-into-drawer t)
  (spacemacs/set-leader-keys-for-major-mode 'org-mode "z" 'org-add-note)

  ; timer related config
  (spacemacs/declare-prefix-for-mode 'org-mode "mo" "timers")
  (spacemacs/set-leader-keys-for-major-mode 'org-mode "op" 'org-timer-pause-or-continue)
  (spacemacs/set-leader-keys-for-major-mode 'org-mode "oc" 'org-timer-set-timer)
  (spacemacs/set-leader-keys-for-major-mode 'org-mode "ot" 'org-timer-start)
  (spacemacs/set-leader-keys-for-major-mode 'org-mode "ox" 'org-timer-stop)

  ; clocking related config
  (defun my-org-clock-select-task ()
    (interactive)
    (org-clock-select-task))

          ("j" "Journal" entry (file+olp+datetree "~/org/journal.org")
           "* %<%H:%M>\n   %?")))


  ;; ============================== CUSTOM FILE HANDLING ==============================

  ;; Lastly, load custom-file (but only if the file exists).
  (when (file-exists-p custom-file)
        (load-file custom-file))

  (message "User init finished!")
)

