1 files changed, 32 insertions, 2 deletions

diff --git a/.emacs.pure b/.emacs.pure
index 1f703c7..a4d0a17 100644
--- a/.emacs.pure
+++ b/.emacs.pure
@@ -55,6 +55,35 @@
 ;; vim-Scroll 
 (setq scroll-conservatively 1)
 
+;; European datatime format
+(setq calendar-date-display-form
+      '((if dayname (concat dayname ", ")) day " " monthname " " year))
+(setq calendar-time-display-form
+      '(24-hours ":" minutes (if time-zone " (") time-zone (if time-zone ")")))
+
+;; week starts on Monday
+(setq calendar-week-start-day 1)
+(setq org-agenda-start-on-weekday 1)
+
+;; display week numbers
+(setq calendar-intermonth-text
+      '(propertize
+        (format "%2d"
+                (car
+                 (calendar-iso-from-absolute
+                  (calendar-absolute-from-gregorian (list month day year)))))
+        'font-lock-face 'font-lock-warning-face))
+
+(setq calendar-intermonth-header
+      (propertize "Wnr"                  ; or e.g. "KW" in Germany
+                  'font-lock-face 'font-lock-keyword-face))
+
+
+;; sunrise / sunset
+;; (setq calendar-latitude 59.98765)
+;; (setq calendar-longitude 10.98765)
+;; (setq calendar-location-name "Oslo")
+
 ;; Various
 (setq auto-save-default nil)
 (setq make-backup-files nil)
@@ -76,8 +105,9 @@
 ;; Programming section
 
 ;; Indentation
-(setq-default c-basic-offset 4 tab-width 4 indent-tabs-mode nil js-indent-level 4 sgml-basic-offset 4)
-;;(setq-default c-basic-offset 4 tab-width 4 indent-tabs-mode nil)
+;;(setq-default c-basic-offset 4 tab-width 4 indent-tabs-mode nil js-indent-level 4 sgml-basic-offset 4)
+(setq-default c-basic-offset 4 tab-width 4 indent-tabs-mode nil)
+;;(setq js-indent-level 2)
 ;;(setq-default c-basic-offset 4 tab-width 4)
 
 ;; Default coding style