Merge branch 'cleanup-dot-emacs-dir' of https://gitlab.com/marcuskammer/emacs.d into cleanup-dot-emacs-dir

bundle/custom_gnu.el

@@ -14,7 +14,7 @@
  '(default-frame-alist
     (quote
      ((undecorated . t)
-      (font . "Fira Code-11")
+      (font . "Fira Code-13")
       (fullscreen . maximized)
       (alpha . 100))))
  '(delete-selection-mode nil)

init.el

@@ -163,35 +163,36 @@ There are two things you can do about this warning:
 (add-hook 'diary-display-hook 'fancy-diary-display)
 (add-hook 'today-visible-calendar-hook 'calendar-mark-today)
 (add-hook 'write-file-hooks 'delete-trailing-whitespace)
+
 (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)
 (add-to-list 'auto-mode-alist '("\\.tmpl\\'" . web-mode))
 
 ;; DIARY
-(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
-       (propertize
-	(format "%2d"
-		(car
-		 (calendar-iso-from-absolute
-		  (calendar-absolute-from-gregorian
-		   (list month day year)))))
-	(quote font-lock-face)
-	(quote font-lock-function-name-face))))
-(when (string= (system-name) "EVG02667NB")
-  (unless (file-directory-p (expand-file-name "~/Documents"))
-    (let ((docs-path (getenv "DOCS_PATH")))
-      (setq cal-html-directory (concat docs-path "\\Diary")
-	    diary-file (concat docs-path "\\Diary\\diary")
-	    timeclock-file (concat docs-path "\\Diary\\timelog")))))
-(provide 'calendar-settings)
+  (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
+	 (propertize
+	  (format "%2d"
+		  (car
+		   (calendar-iso-from-absolute
+		    (calendar-absolute-from-gregorian
+		     (list month day year)))))
+	  (quote font-lock-face)
+	  (quote font-lock-function-name-face))))
+  (when (string= (system-name) "EVG02667NB")
+    (unless (file-directory-p (expand-file-name "~/Documents"))
+      (let ((docs-path (getenv "DOCS_PATH")))
+	(setq cal-html-directory (concat docs-path "\\Diary")
+	      diary-file (concat docs-path "\\Diary\\diary")
+	      timeclock-file (concat docs-path "\\Diary\\timelog")))))
+  (provide 'calendar-settings)
 
 (put 'narrow-to-region 'disabled nil)
 (put 'narrow-to-page 'disabled nil)
@@ -207,3 +208,11 @@ There are two things you can do about this warning:
 
 (when (eq system-type 'windows-nt)
   (win-set-sbcl))
+
+(defun mk-write-mode-enable ()
+  (setq olivetti-body-width 73)
+  (setq mode-line-format nil)
+  (olivetti-mode))
+(defun mk-write-mode-toggle ()
+  (defvar mode-line-format-current
+    (symbol-value 'mode-line-format)))