From 43707ac278610526acbde0d42c1738cc66d030be Mon Sep 17 00:00:00 2001
From: Jacopo De Simoi <wilderkde@gmail.com>
Date: Thu, 22 Mar 2018 23:59:50 -0400
Subject: [PATCH] Bubble up Calendar stuff

and fix a typo as well
---
 global.org       | 14 +++++++++++---
 init/init-org.el |  4 ----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/global.org b/global.org
index 9e9a0eb..2bb6fbe 100644
--- a/global.org
+++ b/global.org
@@ -327,6 +327,17 @@
    #+BEGIN_SRC emacs-lisp
      (setq compilation-ask-about-save nil)
    #+END_SRC
+** Calendar
+   #+BEGIN_SRC emacs-lisp
+   (add-hook 'calendar-load-hook
+     (lambda ()
+     (calendar-set-date-style 'european)))
+   ;; first day of the week is monday instead of sunday:
+   (setq calendar-week-start-day 1)
+   (setq calendar-location-name "Toronto, ON Canada")
+   (setq calendar-latitude 43.7)
+   (setq calendar-longitude -79.4)
+   #+END_SRC
 ** Use system proxy
 #+BEGIN_SRC emacs-lisp
      ;; Use system proxy
@@ -468,9 +479,6 @@
   #+END_SRC
 ** Leftovers
 #+BEGIN_SRC emacs-lisp
-    (setq european-calendar-style 't)
-    ;; first day of the week is monday instead of sunday:
-    (setq calendar--week--start--day 1)
 
     ;; * toorg
     (require 'highlight-sexps)
diff --git a/init/init-org.el b/init/init-org.el
index a495362..2bdfd8f 100644
--- a/init/init-org.el
+++ b/init/init-org.el
@@ -62,10 +62,6 @@
                (tags-todo "5m")
 	       (tags-todo "20m")))))
 
-(setq calendar-latitude 43.7)
-(setq calendar-longitude -79.4)
-(setq calendar-location-name "Toronto, ON Canada")
-
 ;; some super-clever stuff
 ;; [https://emacs.stackexchange.com/questions/39032/tangle-the-same-src-block-to-different-files]
 (defun org-babel-tangle-collect-blocks-handle-tangle-list (&optional language tangle-file)