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

This commit is contained in:
Marcus Kammer 2020-07-15 17:34:07 +02:00
commit 1a8b711b8e
2 changed files with 10 additions and 2 deletions

View file

@ -3,8 +3,10 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(Info-additional-directory-list (quote ("~/Info")))
'(ansi-color-faces-vector
[default default default italic underline success warning error])
'(backup-directory-alist (quote (("." . "~/.backup_filez"))))
'(custom-enabled-themes (quote (sanityinc-tomorrow-day)))
'(custom-safe-themes
(quote
@ -39,10 +41,10 @@
"-%-")))
'(nov-unzip-program
"C:\\Users\\Marcus.Kammer\\AppData\\Local\\Programs\\unzip-5.51-1-bin\\bin\\unzip.exe")
'(olivetti-body-width 90)
'(olivetti-body-width 73)
'(olivetti-lighter " Olv")
'(olivetti-minimum-body-width 80)
'(olivetti-mode-hook nil)
'(olivetti-mode-hook nil t)
'(org-agenda-files (quote ("d:/syncplicity/Marcus.Kammer/documents/Journal/")))
'(org-babel-load-languages
(quote

View file

@ -33,6 +33,7 @@ There are two things you can do about this warning:
(add-to-list 'load-path (expand-file-name "~/AppData/Roaming/__secrets"))
(cd "~/opt")
(when (string= (system-name) "EVG02667NB")
(add-to-list 'Info-default-directory-list "~/Info")
(setq custom-file "~/.emacs.d/bundle/custom_win32_EVG02667NB.el"))
(when (string= (system-name) "XPS-8930")))
@ -86,6 +87,11 @@ There are two things you can do about this warning:
:config
(setq nov-text-width 80))
(use-package projectile
:ensure t
:init
(projectile-mode +1))
(use-package elpy
:ensure t
:init