Merge branch 'main' of gitlab.com:marcuskammer/emacs.d into main

bundle/custom_win32_EVG02667NB.el

@@ -7,6 +7,7 @@
  '(ansi-color-faces-vector
    [default default default italic underline success warning error])
  '(backup-directory-alist (quote (("." . "~/.backup_filez"))))
+ '(calendar-christian-all-holidays-flag t)
  '(calendar-date-style (quote iso))
  '(calendar-view-diary-initially-flag t)
  '(calendar-week-start-day 1)
@@ -23,7 +24,8 @@
       (alpha . 100)
       (fullscreen . maximized))))
  '(delete-by-moving-to-trash t)
- '(diary-file "d:/Syncplicity/Marcus.Kammer/documents/Diary/diary")
+ '(diary-file
+   "d:/UserData/marcus.kammer/OneDrive - Siemens AG/Diary/diary")
  '(display-line-numbers-grow-only t)
  '(elpy-modules
    (quote
@@ -34,7 +36,8 @@
  '(horizontal-scroll-bar-mode nil)
  '(indent-tabs-mode nil)
  '(inhibit-startup-buffer-menu t)
- '(initial-buffer-choice "d:/syncplicity/Marcus.Kammer/documents/Journal/notes.org")
+ '(initial-buffer-choice
+   "d:/UserData/marcus.kammer/OneDrive - Siemens AG/documents/Journal/notes.org")
  '(initial-frame-alist nil)
  '(ispell-program-name "aspell")
  '(line-spacing nil)
@@ -56,7 +59,9 @@
  '(olivetti-lighter " Olv")
  '(olivetti-minimum-body-width 80)
  '(olivetti-mode-hook nil t)
- '(org-agenda-files (quote ("d:/syncplicity/Marcus.Kammer/documents/Journal/")))
+ '(org-agenda-files
+   (quote
+    ("d:/UserData/marcus.kammer/OneDrive - Siemens AG/documents/Journal/")))
  '(org-agenda-include-diary t)
  '(org-babel-load-languages
    (quote
@@ -72,7 +77,7 @@
      (plantuml . t)
      (dot . t))))
  '(org-clock-out-remove-zero-time-clocks t)
- '(org-default-notes-file "d:/syncplicity/Marcus.Kammer/documents/Journal/notes.org")
+ '(org-default-notes-file "d:/UserData/marcus.kammer/OneDrive - Siemens AG/documents/Journal/notes.org")
  '(org-duration-format (quote h:mm))
  '(org-export-with-sub-superscripts nil)
  '(org-html-table-caption-above nil)

init.el

@@ -17,9 +17,9 @@
 (add-hook 'diary-mark-entries-hook 'diary-mark-included-diary-files)
 (defun me/org-mode ()
   "My custom configuration for 'org-mode'."
-  (olivetti-mode)
+  ;(olivetti-mode)
   (olivetti-set-width 82))
-; (add-hook 'nov-mode-hook 'me/org-mode)
+(add-hook 'nov-mode-hook 'me/org-mode)
 (add-hook 'org-mode-hook 'turn-on-auto-fill)
 (add-hook 'rst-mode-hook 'turn-on-orgstruct)
 (add-hook 'newsticker-mode-hook 'imenu-add-menubar-index)