Merge branch 'master' of gitlab.com:marcus-kammer/emacs.d

This commit is contained in:
Marcus Kammer 2019-08-08 20:45:09 +02:00
commit b111f75e6b

View file

@ -40,7 +40,7 @@ There are two things you can do about this warning:
'(custom-safe-themes
(quote
("4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default)))
'(delete-selection-mode nil)
'(delete-selection-mode t)
'(diary-file "~/Documents/Diary/diary")
'(display-battery-mode nil)
'(display-line-numbers (quote relative))
@ -95,7 +95,7 @@ There are two things you can do about this warning:
'(package-selected-packages
(quote
(latex-extra latex-preview-pane docker docker-api docker-cli docker-compose-mode dockerfile-mode ox-mediawiki ox-minutes ox-nikola cargo racket-mode rust-mode w3m slime gherkin-mode gitlab gitlab-ci-mode org-jira powershell helm gitconfig-mode gitignore-mode ox-rst typescript-mode ## skewer-mode ob-http ob-ipython ob-restclient linum-relative markdown-mode nord-theme restclient request restclient-test yaml-mode magit)))
'(python-shell-interpreter "python3" t)
'(python-shell-interpreter "ipython" t)
'(request-log-level (quote debug))
'(request-message-level (quote debug))
'(require-final-newline t)
@ -154,7 +154,7 @@ There are two things you can do about this warning:
(add-to-list 'default-frame-alist '(width . 80))))
(when (eq system-type 'windows-nt)
(setq python-shell-interpreter "python")
(cd "~/opt")
;; (setq-default line-spacing 5)
(add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo"))
;; (require 'evo-feeds)