From b08909feeecdc17eac12730c0ba4918bb1d27010 Mon Sep 17 00:00:00 2001
From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com>
Date: Sun, 17 Nov 2019 10:38:17 +0100
Subject: [PATCH] Move org and calendar settings out of custom

---
 bundle/calendar-settings.el | 12 ++++++------
 bundle/custom.el            | 28 ----------------------------
 bundle/org-mode-settings.el | 17 +++++++++++++++++
 init.el                     |  1 +
 4 files changed, 24 insertions(+), 34 deletions(-)
 create mode 100644 bundle/org-mode-settings.el

diff --git a/bundle/calendar-settings.el b/bundle/calendar-settings.el
index c55dea4e..ede2a057 100644
--- a/bundle/calendar-settings.el
+++ b/bundle/calendar-settings.el
@@ -1,9 +1,9 @@
-(setq cal-html-directory "~/Documents/Diary")
-(setq view-diary-entries-initially t)
-(setq mark-diary-entries-in-calendar t)
-(setq number-of-diary-entries 7)
-(setq calendar-date-style (quote iso))
-(setq calendar-week-start-day 1)
+(setq cal-html-directory "~/Documents/Diary"
+      view-diary-entries-initially t
+      mark-diary-entries-in-calendar t
+      number-of-diary-entries 7
+      calendar-date-style (quote iso)
+      calendar-week-start-day 1)
 
 (setq calendar-intermonth-text
       (quote
diff --git a/bundle/custom.el b/bundle/custom.el
index b6e8407f..757a0088 100644
--- a/bundle/custom.el
+++ b/bundle/custom.el
@@ -87,34 +87,6 @@
  '(nord-comment-brightness 15)
  '(nord-region-highlight "snowstorm")
  '(nord-uniform-mode-lines t)
- '(org-agenda-dim-blocked-tasks nil)
- '(org-agenda-files (quote ("~/Documents/Journal")))
- '(org-agenda-inhibit-startup nil)
- '(org-agenda-use-tag-inheritance nil)
- '(org-babel-load-languages
-   (quote
-    ((js . t)
-     (emacs-lisp . t)
-     (python . t)
-     (sqlite . t)
-     (lisp . t)
-     (shell . t)
-     (css . t)
-     (calc . t))))
- '(org-babel-shell-names
-   (quote
-    ("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh")))
- '(org-clock-persist t)
- '(org-confirm-babel-evaluate nil)
- '(org-default-notes-file "~/Documents/Journal/notes.org")
- '(org-html-doctype "html5")
- '(org-html-html5-fancy t)
- '(org-log-done (quote time))
- '(org-startup-folded nil)
- '(org-startup-truncated nil)
- '(org-todo-keywords
-   (quote
-    ((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED"))))
  '(package-enable-at-startup t)
  '(package-selected-packages
    (quote
diff --git a/bundle/org-mode-settings.el b/bundle/org-mode-settings.el
new file mode 100644
index 00000000..c7a89253
--- /dev/null
+++ b/bundle/org-mode-settings.el
@@ -0,0 +1,17 @@
+(setq org-agenda-dim-blocked-tasks nil
+      org-agenda-files (quote ("~/Documents/Journal"))
+      org-agenda-inhibit-startup nil
+      org-agenda-use-tag-inheritance nil
+      org-babel-load-languages (quote ((js . t) (emacs-lisp . t) (python . t) (sqlite . t) (lisp . t) (shell . t) (css . t) (calc . t)))
+      org-babel-shell-names (quote ("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh"))
+      org-clock-persist t
+      org-confirm-babel-evaluate nil
+      org-default-notes-file "~/Documents/Journal/notes.org"
+      org-html-doctype "html5"
+      org-html-html5-fancy t
+      org-log-done (quote time)
+      org-startup-folded nil
+      org-startup-truncated nil
+      org-todo-keywords (quote ((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED"))))
+
+(provide 'org-mode-settings)
diff --git a/init.el b/init.el
index 71116cf4..5eb03fec 100755
--- a/init.el
+++ b/init.el
@@ -38,6 +38,7 @@ There are two things you can do about this warning:
 (require 'display)
 (require 'hooks)
 (require 'calendar-settings)
+(require 'org-mode-settings)
 
 ;; start a server, unless one is already running
 (when (require 'server nil t)