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

This commit is contained in:
Marcus Kammer 2020-03-31 18:37:23 +02:00
commit bbdfd211bd
3 changed files with 3 additions and 3 deletions

View file

@ -62,7 +62,7 @@
'(nord-comment-brightness 15)
'(nord-region-highlight "snowstorm")
'(nord-uniform-mode-lines t)
'(olivetti-body-width 89)
'(olivetti-body-width 90)
'(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

@ -13,7 +13,7 @@
;; (add-hook 'newsticker-plainview-hooks (lambda () (display-line-numbers-mode -1)))
;; (add-hook 'python-mode-hook (lambda () (display-line-numbers-mode 1)))
(setq my-hooks '(python-mode-hook emacs-lisp-mode-hook))
(setq my-hooks '(python-mode-hook emacs-lisp-mode-hook json-mode-hook))
(while my-hooks (add-hook (car my-hooks)
(lambda ()
(display-line-numbers-mode 1)))

View file

@ -25,7 +25,7 @@
org-babel-python-command "python3"
org-todo-keywords (quote ((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED"))))
(setq org-use-property-inheritance t)
(setq org-use-property-inheritance nil)
(org-clock-persistence-insinuate)
(org-display-inline-images)