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

This commit is contained in:
Marcus Kammer 2019-09-26 21:47:52 +02:00
commit fbeea10e03

14
init.el
View file

@ -1,3 +1,4 @@
(setq small-font "Iosevka Term-11") (setq small-font "Iosevka Term-11")
(setq big-font "Iosevka Term-14") (setq big-font "Iosevka Term-14")
;; start a server, unless one is already running ;; start a server, unless one is already running
@ -37,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")))))
(custom-set-variables (custom-set-variables
;; custom-set-variables was added by Custom. ;; custom-set-variables was added by Custom.
@ -100,7 +101,7 @@ There are two things you can do about this warning:
'(global-hl-line-mode t) '(global-hl-line-mode t)
'(icomplete-mode t) '(icomplete-mode t)
'(indent-tabs-mode nil) '(indent-tabs-mode nil)
'(inferior-lisp-program (executable-find "sbcl")) '(inferior-lisp-program (executable-find "sbcl") t)
'(inhibit-startup-screen t) '(inhibit-startup-screen t)
'(line-number-mode t) '(line-number-mode t)
'(line-spacing 3) '(line-spacing 3)
@ -133,7 +134,10 @@ There are two things you can do about this warning:
'(nord-comment-brightness 15) '(nord-comment-brightness 15)
'(nord-region-highlight "snowstorm") '(nord-region-highlight "snowstorm")
'(nord-uniform-mode-lines t) '(nord-uniform-mode-lines t)
'(org-agenda-dim-blocked-tasks nil)
'(org-agenda-files (quote ("~/Documents/Journal"))) '(org-agenda-files (quote ("~/Documents/Journal")))
'(org-agenda-inhibit-startup nil)
'(org-agenda-use-tag-inheritance nil)
'(org-babel-load-languages '(org-babel-load-languages
(quote (quote
((js . t) ((js . t)
@ -215,10 +219,10 @@ There are two things you can do about this warning:
(add-to-list 'load-path (expand-file-name "~/AppData/Roaming/__secrets")) (add-to-list 'load-path (expand-file-name "~/AppData/Roaming/__secrets"))
(cd "~/opt") (cd "~/opt")
(when (display-graphic-p) (when (display-graphic-p)
(add-to-list 'default-frame-alist '(fullscreen . maximized))
(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) "EVG01788WS")
(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")))) (when (string= (system-name) "XPS-8930"))))
@ -292,8 +296,8 @@ There are two things you can do about this warning:
;; ================= ALWAYS AT THE END ================= ;; ;; ================= ALWAYS AT THE END ================= ;;
;; Turn off chrome ;; Turn off chrome
;(dolist (mode '(menu-bar-mode tool-bar-mode scroll-bar-mode)) ;; (dolist (mode '(menu-bar-mode tool-bar-mode scroll-bar-mode))
; (when (fboundp mode) (funcall mode -1))) ;; (when (fboundp mode) (funcall mode -1)))
;; Local Variables: ;; Local Variables:
;; mode: emacs-lisp ;; mode: emacs-lisp