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

This commit is contained in:
Marcus Kammer 2019-09-21 22:43:38 +02:00
commit 137455bf18

17
init.el
View file

@ -64,7 +64,7 @@ There are two things you can do about this warning:
'(default-frame-alist '(default-frame-alist
(quote (quote
((fullscreen . maximized) ((fullscreen . maximized)
(width . 86) (width . 90)
(height . 46) (height . 46)
(font . "Iosevka Term-13.0") (font . "Iosevka Term-13.0")
(vertical-scroll-bars) (vertical-scroll-bars)
@ -202,13 +202,20 @@ There are two things you can do about this warning:
(when (eq system-type 'windows-nt) (when (eq system-type 'windows-nt)
;; %USERPROFILE%\AppData\Local\Programs\emacs-26.2-x86_64\bin\emacsclientw.exe -c -n -a runemacs.exe ;; %USERPROFILE%\AppData\Local\Programs\emacs-26.2-x86_64\bin\emacsclientw.exe -c -n -a runemacs.exe
(cd "~/opt") ;; (setq inferior-lisp-program (executable-find "sbcl"))
(add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo")) (setq sbcl-exe (expand-file-name "~/AppData/Local/Programs/Steel Bank Common Lisp/1.4.14/sbcl.exe"))
(setq sbcl-core (expand-file-name "~/AppData/Local/Programs/Steel Bank Common Lisp/1.4.14/sbcl.core"))
(setq slime-lisp-implementations `((sbcl (,sbcl-exe "--core" ,sbcl-core))))
(setq python-shell-interpreter "python") (setq python-shell-interpreter "python")
(setq inferior-lisp-program "sbcl")
(add-to-list 'load-path (expand-file-name "~/AppData/Roaming/__secrets"))
(cd "~/opt")
(when (display-graphic-p) (when (display-graphic-p)
(when (string= (system-name) "EVG01788WS")
(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")
(add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo")))
(when (string= (system-name) "XPS-8930"))))
(when (eq system-type 'gnu/linux) (when (eq system-type 'gnu/linux)
(setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3") (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")