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

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

Browse source
This commit is contained in:
Marcus Kammer 2020-06-26 09:39:37 +02:00
commit 9c6a879aa6
2 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundle/custom_gnu.el
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)

55
init.el
View file

@ -163,35 +163,36 @@ There are two things you can do about this warning:
(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)
(add-to-list 'auto-mode-alist '("\\.tmpl\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.tmpl\\'" . web-mode))
;; DIARY ;; DIARY
(setq cal-html-directory "~/Documents/Diary" (setq cal-html-directory "~/Documents/Diary"
view-diary-entries-initially t view-diary-entries-initially t
mark-diary-entries-in-calendar t mark-diary-entries-in-calendar t
number-of-diary-entries 7 number-of-diary-entries 7
calendar-date-style (quote iso) calendar-date-style (quote iso)
calendar-week-start-day 1) calendar-week-start-day 1)
(setq calendar-intermonth-text (setq calendar-intermonth-text
(quote (quote
(propertize (propertize
(format "%2d" (format "%2d"
(car (car
(calendar-iso-from-absolute (calendar-iso-from-absolute
(calendar-absolute-from-gregorian (calendar-absolute-from-gregorian
(list month day year))))) (list month day year)))))
(quote font-lock-face) (quote font-lock-face)
(quote font-lock-function-name-face)))) (quote font-lock-function-name-face))))
(when (string= (system-name) "EVG02667NB") (when (string= (system-name) "EVG02667NB")
(unless (file-directory-p (expand-file-name "~/Documents")) (unless (file-directory-p (expand-file-name "~/Documents"))
(let ((docs-path (getenv "DOCS_PATH"))) (let ((docs-path (getenv "DOCS_PATH")))
(setq cal-html-directory (concat docs-path "\\Diary") (setq cal-html-directory (concat docs-path "\\Diary")
diary-file (concat docs-path "\\Diary\\diary") diary-file (concat docs-path "\\Diary\\diary")
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-region 'disabled nil)
(put 'narrow-to-page 'disabled nil) (put 'narrow-to-page 'disabled nil)
@ -207,3 +208,11 @@ There are two things you can do about this warning:
(when (eq system-type 'windows-nt) (when (eq system-type 'windows-nt)
(win-set-sbcl)) (win-set-sbcl))
(defun mk-write-mode-enable ()
(setq olivetti-body-width 73)
(setq mode-line-format nil)
(olivetti-mode))
(defun mk-write-mode-toggle ()
(defvar mode-line-format-current
(symbol-value 'mode-line-format)))