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

Merge branch 'main' of https://gitlab.com/marcuskammer/emacs.d into main

Browse source
This commit is contained in:
Marcus Kammer 2020-08-31 18:21:17 +02:00
commit a96b6cc27d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bundle/custom_gnu.el
View file

@ -24,14 +24,14 @@
'(custom-safe-themes '(custom-safe-themes
'("37768a79b479684b0756dec7c0fc7652082910c37d8863c35b702db3f16000f8" "06bf0822aa77ea498bbd6038b59ad96fca43b272b49b18ab024218881ba134d1" "6e933f1668e124ec17fc7b6547f65ba760e06efb568a6c8091c600c67827e592" "7f6d4aebcc44c264a64e714c3d9d1e903284305fd7e319e7cb73345a9994f5ef" default)) '("37768a79b479684b0756dec7c0fc7652082910c37d8863c35b702db3f16000f8" "06bf0822aa77ea498bbd6038b59ad96fca43b272b49b18ab024218881ba134d1" "6e933f1668e124ec17fc7b6547f65ba760e06efb568a6c8091c600c67827e592" "7f6d4aebcc44c264a64e714c3d9d1e903284305fd7e319e7cb73345a9994f5ef" default))
'(default-frame-alist '(default-frame-alist
'((font . "Iosevka Term-11") '((font . "Fira Code-11")
(alpha . 100) (alpha . 100)
(undecorated) (undecorated)
(width . 85) (width . 85)
(height . 70) (height . 70)
(fullscreen . fullscreen))) (fullscreen . fullscreen)))
'(delete-selection-mode nil) '(delete-selection-mode nil)
'(diary-file "~/Documents/diary") '(diary-file "~/Documents/diary/diary")
'(display-time-mode t) '(display-time-mode t)
'(elpy-modules '(elpy-modules
'(elpy-module-company elpy-module-eldoc elpy-module-flymake elpy-module-folding elpy-module-pyvenv elpy-module-yasnippet elpy-module-django elpy-module-autodoc elpy-module-sane-defaults)) '(elpy-module-company elpy-module-eldoc elpy-module-flymake elpy-module-folding elpy-module-pyvenv elpy-module-yasnippet elpy-module-django elpy-module-autodoc elpy-module-sane-defaults))
@ -43,6 +43,8 @@
'(inhibit-startup-buffer-menu t) '(inhibit-startup-buffer-menu t)
'(initial-buffer-choice "~/Documents/journal/notes.org") '(initial-buffer-choice "~/Documents/journal/notes.org")
'(menu-bar-mode nil) '(menu-bar-mode nil)
'(nov-text-width nil)
'(nov-variable-pitch nil)
'(olivetti-body-width 73) '(olivetti-body-width 73)
'(org-adapt-indentation t) '(org-adapt-indentation t)
'(org-agenda-files '("~/Documents/journal")) '(org-agenda-files '("~/Documents/journal"))

1
init.el
View file

@ -1,6 +1,5 @@
(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/")) (add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/"))
(load "bundle--server") (load "bundle--server")
(load "bundle--package") (load "bundle--package")
(load "bundle--customfile") (load "bundle--customfile")
(load "bundle--keys") (load "bundle--keys")