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

This commit is contained in:
Marcus Kammer 2019-08-01 16:19:57 +02:00
commit 1710e4f43c

15
init.el
View file

@ -72,11 +72,11 @@ There are two things you can do about this warning:
'(newsticker-url-list-defaults
(quote
(("Emacs Wiki" "https://www.emacswiki.org/emacs?action=rss" nil 3600)
("openSuse News" "https://news.opensuse.org/feed")
("Linuxjournal" "https://www.linuxjournal.com/node/feed")
("Phoronix" "https://www.phoronix.com/rss.php")
("Ubuntu" "https://blog.ubuntu.com/feed")
("Python PEP" "https://www.python.org/dev/peps/peps.rss/")
("openSuse News" "https://news.opensuse.org/feed"))))
("Python PEP" "https://www.python.org/dev/peps/peps.rss/"))))
'(org-agenda-files (quote ("~/Documents/Journal")))
'(org-babel-load-languages
(quote
@ -86,11 +86,12 @@ There are two things you can do about this warning:
(sqlite . t)
(lisp . t))))
'(org-confirm-babel-evaluate nil)
'(org-clock-persist t)
'(org-default-notes-file "~/Documents/Journal/notes.org")
'(package-enable-at-startup t)
'(package-selected-packages
(quote
(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)))
(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")
'(require-final-newline t)
'(size-indication-mode nil)
@ -152,7 +153,7 @@ There are two things you can do about this warning:
(when (eq system-type 'windows-nt)
;; (setq-default line-spacing 5)
(add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo"))
(require 'evo-feeds)
;; (require 'evo-feeds)
(when (display-graphic-p)
(add-to-list 'default-frame-alist '(font . "Consolas-11"))
(add-to-list 'default-frame-alist '(height . 50))
@ -172,6 +173,11 @@ There are two things you can do about this warning:
(interactive)
(clipboard-kill-ring-save (point-min) (point-max)))
(defun format-whole-buffer ()
"Copy entire buffer to clipboard"
(interactive)
(fill-paragraph (point-min) (point-max)))
(put 'upcase-region 'disabled nil)
(setq view-diary-entries-initially t
mark-diary-entries-in-calendar t
@ -208,3 +214,4 @@ There are two things you can do about this warning:
(setq slime-contribs '(slime-fancy))
(setq request-log-level 'debug)
(setq request-message-level 'debug)
(org-clock-persistence-insinuate)