Merge branch 'cleanup-dot-emacs-dir' of gitlab.com:marcuskammer/emacs.d into cleanup-dot-emacs-dir

This commit is contained in:
Marcus Kammer 2020-06-26 08:15:17 +02:00
commit 8e2c84c7da
3 changed files with 170 additions and 149 deletions

View file

@ -14,7 +14,7 @@
'(default-frame-alist '(default-frame-alist
(quote (quote
((undecorated . t) ((undecorated . t)
(font . "Fira Code-11") (font . "Fira Code-13")
(fullscreen . maximized) (fullscreen . maximized)
(alpha . 100)))) (alpha . 100))))
'(delete-selection-mode nil) '(delete-selection-mode nil)

View file

@ -8,10 +8,13 @@
'(default-frame-alist '(default-frame-alist
(quote (quote
((vertical-scroll-bars) ((vertical-scroll-bars)
(font . "Iosevka Term-12") (font . "Fira Code-11")
(fullscreen . maximized)))) (fullscreen . maximized))))
'(delete-by-moving-to-trash t) '(delete-by-moving-to-trash t)
'(display-line-numbers-grow-only t) '(display-line-numbers-grow-only t)
'(elpy-modules
(quote
(elpy-module-company elpy-module-eldoc elpy-module-flymake elpy-module-pyvenv elpy-module-yasnippet elpy-module-sane-defaults)))
'(geiser-default-implementation (quote racket)) '(geiser-default-implementation (quote racket))
'(horizontal-scroll-bar-mode nil) '(horizontal-scroll-bar-mode nil)
'(inhibit-startup-buffer-menu t) '(inhibit-startup-buffer-menu t)
@ -19,6 +22,14 @@
'(initial-frame-alist nil) '(initial-frame-alist nil)
'(ls-lisp-dirs-first t) '(ls-lisp-dirs-first t)
'(menu-bar-mode nil) '(menu-bar-mode nil)
'(mode-line-format
(quote
("-" mode-line-mule-info mode-line-modified mode-line-frame-identification mode-line-buffer-identification " " mode-line-position mode-line-modes
(which-func-mode
("" which-func-format "--"))
(global-mode-string
("--" global-mode-string))
"-%-")))
'(olivetti-body-width 90) '(olivetti-body-width 90)
'(olivetti-lighter " Olv") '(olivetti-lighter " Olv")
'(olivetti-minimum-body-width 80) '(olivetti-minimum-body-width 80)
@ -48,7 +59,7 @@
"c:/Users/Marcus.Kammer/AppData/Local/Programs/plantuml/plantuml.jar") "c:/Users/Marcus.Kammer/AppData/Local/Programs/plantuml/plantuml.jar")
'(package-selected-packages '(package-selected-packages
(quote (quote
(racket-mode geiser slime web-mode js2-mode markdown-mode yaml-mode olivetti elpy use-package nord-theme nordless-theme org toc-org ox-reveal ace-window htmlize ivy magit))) (rust-mode sphinx-frontend sphinx-mode racket-mode geiser slime web-mode js2-mode markdown-mode yaml-mode olivetti elpy use-package nord-theme nordless-theme org toc-org ox-reveal ace-window htmlize ivy magit)))
'(python-indent-guess-indent-offset nil) '(python-indent-guess-indent-offset nil)
'(python-shell-interpreter "ipython") '(python-shell-interpreter "ipython")
'(ring-bell-function (quote ignore)) '(ring-bell-function (quote ignore))

24
init.el
View file

@ -163,6 +163,7 @@
(add-hook 'diary-display-hook 'fancy-diary-display) (add-hook 'diary-display-hook 'fancy-diary-display)
(add-hook 'today-visible-calendar-hook 'calendar-mark-today) (add-hook 'today-visible-calendar-hook 'calendar-mark-today)
(add-hook 'write-file-hooks 'delete-trailing-whitespace) (add-hook 'write-file-hooks 'delete-trailing-whitespace)
(add-hook 'org-mode-hook 'turn-on-auto-fill) (add-hook 'org-mode-hook 'turn-on-auto-fill)
(add-hook 'rst-mode-hook 'turn-on-orgstruct) (add-hook 'rst-mode-hook 'turn-on-orgstruct)
(add-hook 'newsticker-mode-hook 'imenu-add-menubar-index) (add-hook 'newsticker-mode-hook 'imenu-add-menubar-index)
@ -193,16 +194,25 @@
timeclock-file (concat docs-path "\\Diary\\timelog"))))) timeclock-file (concat docs-path "\\Diary\\timelog")))))
(provide 'calendar-settings) (provide 'calendar-settings)
(put 'narrow-to-region 'disabled nil)
(put 'narrow-to-page 'disabled nil)
;; SBCL
(defun win-set-sbcl ()
;; %USERPROFILE%\AppData\Local\Programs\emacs-26.2-x86_64\bin\emacsclientw.exe -c -n -a runemacs.exe
;; (setq inferior-lisp-program (executable-find "sbcl"))
(setq sbcl-exe (expand-file-name "~/AppData/Local/Programs/Steel Bank Common Lisp/1.4.14/sbcl.exe")
sbcl-core (expand-file-name "~/AppData/Local/Programs/Steel Bank Common Lisp/1.4.14/sbcl.core")
inferior-lisp-program "sbcl"
slime-lisp-implementations `((sbcl (,sbcl-exe "--core" ,sbcl-core)))))
(when (eq system-type 'windows-nt)
(win-set-sbcl))
(defun mk-write-mode-enable () (defun mk-write-mode-enable ()
(setq olivetti-body-width 73) (setq olivetti-body-width 73)
(setq mode-line-format nil) (setq mode-line-format nil)
(olivetti-mode)) (olivetti-mode))
(defun mk-write-mode-toggle () (defun mk-write-mode-toggle ()
(defvar mode-line-format-current (defvar mode-line-format-current
(symbol-value 'mode-line-format)) (symbol-value 'mode-line-format)))
;; Local Variables:
;; mode: emacs-lisp
;; coding: utf-8
;; fill-column: 79
;; End: