marcuskammer/emacs.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Marcus Kammer 2019-10-15 10:02:53 +02:00
commit 350be47f27
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
init.el
View file

@ -38,7 +38,7 @@ There are two things you can do about this warning:
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(variable-pitch ((t (:family "Roboto Condensed"))))) '(variable-pitch ((t (:family "Noto Sans")))))
(custom-set-variables (custom-set-variables
;; custom-set-variables was added by Custom. ;; custom-set-variables was added by Custom.
@ -48,7 +48,7 @@ There are two things you can do about this warning:
'(auto-save-default nil) '(auto-save-default nil)
'(backup-directory-alist (quote (("" . "~/.emacs.d/_backup_files")))) '(backup-directory-alist (quote (("" . "~/.emacs.d/_backup_files"))))
'(blink-cursor-mode nil) '(blink-cursor-mode nil)
'(cal-html-directory "~/Documents/Diary") '(cal-html-directory "~/Documents/Diary" t)
'(calendar-date-style (quote iso)) '(calendar-date-style (quote iso))
'(calendar-intermonth-text '(calendar-intermonth-text
(quote (quote
@ -65,7 +65,7 @@ There are two things you can do about this warning:
'(custom-enabled-themes (quote (nord))) '(custom-enabled-themes (quote (nord)))
'(custom-safe-themes '(custom-safe-themes
(quote (quote
("82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))) ("24fc62afe2e5f0609e436aa2427b396adf9a958a8fa660edbaab5fb13c08aae6" "82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default)))
'(default-frame-alist '(default-frame-alist
(quote (quote
((fullscreen . maximized) ((fullscreen . maximized)
@ -165,7 +165,7 @@ There are two things you can do about this warning:
'(package-enable-at-startup t) '(package-enable-at-startup t)
'(package-selected-packages '(package-selected-packages
(quote (quote
(url-http-ntlm syslog-mode org-pomodoro ox-html5slide ox-hugo ox-impress-js ox-ioslide ox-jira ox-json ox-pandoc nov vimish-fold w3 pickle feature-mode elpy elnode ein latex-extra latex-preview-pane docker docker-api docker-cli docker-compose-mode dockerfile-mode python-docstring pytest py-autopep8 pydoc pylint python-info auto-complete-rst sphinx-doc sphinx-frontend sphinx-mode ox-mediawiki ox-minutes ox-nikola cargo racket-mode rust-mode 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))) (arc-dark-theme url-http-ntlm syslog-mode org-pomodoro ox-html5slide ox-hugo ox-impress-js ox-ioslide ox-jira ox-json ox-pandoc nov vimish-fold w3 pickle feature-mode elpy elnode ein latex-extra latex-preview-pane docker docker-api docker-cli docker-compose-mode dockerfile-mode python-docstring pytest py-autopep8 pydoc pylint python-info auto-complete-rst sphinx-doc sphinx-frontend sphinx-mode ox-mediawiki ox-minutes ox-nikola cargo racket-mode rust-mode 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 "python3" t)
'(request-log-level (quote debug)) '(request-log-level (quote debug))
'(request-message-level (quote debug)) '(request-message-level (quote debug))
@ -220,11 +220,18 @@ There are two things you can do about this warning:
(cd "~/opt") (cd "~/opt")
(when (display-graphic-p) (when (display-graphic-p)
(add-to-list 'default-frame-alist '(undecorated . nil)) (add-to-list 'default-frame-alist '(undecorated . nil))
(add-to-list 'default-frame-alist '(font . "Iosevka Term-11")) (add-to-list 'default-frame-alist '(font . "Iosevka Term-11")))
(when (string= (system-name) "EVG01788WS") (when (string= (system-name) "EVG02667NB")
(add-to-list 'default-frame-alist '(fullscreen . maximized)) (add-to-list 'default-frame-alist '(fullscreen . maximized))
(add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo"))) (add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo"))
(when (string= (system-name) "XPS-8930")))) (unless (file-directory-p (expand-file-name "~/Documents"))
(let ((docs-path (getenv "DOCS_PATH")))
(setq org-agenda-files `(,(concat docs-path "\\Journal")))
(setq org-default-notes-file (concat docs-path "\\Journal\\notes.org"))
(setq cal-html-directory (concat docs-path "\\Diary"))
(setq diary-file (concat docs-path "\\Diary\\diary"))
(setq timeclock-file (concat docs-path "\\Diary\\timelog")))))
(when (string= (system-name) "XPS-8930")))
(when (eq system-type 'gnu/linux) (when (eq system-type 'gnu/linux)
(setq slime-lisp-implementations '((sbcl ("/usr/bin/sbcl")))) (setq slime-lisp-implementations '((sbcl ("/usr/bin/sbcl"))))