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

This commit is contained in:
Marcus Kammer 2020-08-31 18:24:14 +02:00
commit 341cb389f3
3 changed files with 17 additions and 2 deletions

View file

@ -7,6 +7,9 @@
'(ansi-color-faces-vector
[default default default italic underline success warning error])
'(backup-directory-alist (quote (("." . "~/.backup_filez"))))
'(calendar-date-style (quote iso))
'(calendar-view-diary-initially-flag t)
'(calendar-week-start-day 1)
'(custom-enabled-themes (quote (nord)))
'(custom-safe-themes
(quote
@ -20,6 +23,7 @@
(alpha . 100)
(fullscreen . maximized))))
'(delete-by-moving-to-trash t)
'(diary-file "d:/Syncplicity/Marcus.Kammer/documents/Diary/diary")
'(display-line-numbers-grow-only t)
'(elpy-modules
(quote
@ -32,6 +36,7 @@
'(inhibit-startup-buffer-menu t)
'(initial-buffer-choice "d:/syncplicity/Marcus.Kammer/documents/Journal/notes.org")
'(initial-frame-alist nil)
'(ispell-program-name "aspell")
'(line-spacing nil)
'(ls-lisp-dirs-first t)
'(menu-bar-mode nil)
@ -43,6 +48,7 @@
(global-mode-string
("--" global-mode-string))
"-%-")))
'(nov-text-width nil)
'(nov-unzip-program
"C:\\Users\\Marcus.Kammer\\AppData\\Local\\Programs\\unzip-5.51-1-bin\\bin\\unzip.exe")
'(nov-variable-pitch nil)
@ -51,6 +57,7 @@
'(olivetti-minimum-body-width 80)
'(olivetti-mode-hook nil t)
'(org-agenda-files (quote ("d:/syncplicity/Marcus.Kammer/documents/Journal/")))
'(org-agenda-include-diary t)
'(org-babel-load-languages
(quote
((js . t)
@ -67,6 +74,11 @@
'(org-clock-out-remove-zero-time-clocks t)
'(org-default-notes-file "d:/syncplicity/Marcus.Kammer/documents/Journal/notes.org")
'(org-duration-format (quote h:mm))
'(org-export-with-sub-superscripts nil)
'(org-html-table-caption-above nil)
'(org-html-table-default-attributes
(quote
(:border "2" :cellspacing "0" :cellpadding "6" :rules "groups" :frame "hsides" :width "100%")))
'(org-modules
(quote
(ol-bbdb ol-bibtex ol-docview ol-eww ol-gnus ol-info ol-irc ol-mhe ol-rmail org-tempo ol-w3m)))

View file

@ -1,5 +1,6 @@
;; Auto-generated file; don't edit
((:url "https://www.tagesschau.de/" :title "Aktuelle Nachrichten - Inland Ausland Wirtschaft Kultur Sport - ARD Tagesschau | tagesschau.de" :time "Sun Aug 9 10:08:09 2020")
((:url "https://orgmode.org/orgcard.txt" :title "" :time "Tue Aug 18 09:26:35 2020")
(:url "https://www.tagesschau.de/" :title "Aktuelle Nachrichten - Inland Ausland Wirtschaft Kultur Sport - ARD Tagesschau | tagesschau.de" :time "Sun Aug 9 10:08:09 2020")
(:url "https://www.emacswiki.org/" :title "EmacsWiki: Site Map" :time "Mon Aug 3 18:53:39 2020")
(:url "https://www.phoronix.com/scan.php?page=home" :title "Linux Hardware Reviews, Open-Source Benchmarks & Linux Performance - Phoronix" :time "Tue Jul 28 12:59:20 2020")
(:url "https://lwn.net/" :title "Welcome to LWN.net [LWN.net]" :time "Tue Jul 28 12:54:51 2020")

View file

@ -13,11 +13,13 @@
(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 'diary-list-entries-hook 'diary-include-other-diary-files)
(add-hook 'diary-mark-entries-hook 'diary-mark-included-diary-files)
(defun me/org-mode ()
"My custom configuration for 'org-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)