Coupla small changes

This commit is contained in:
Case Duckworth 2022-01-12 17:40:43 -06:00
parent 2a119625e6
commit 125a82251c
3 changed files with 46 additions and 42 deletions

View File

@ -76,31 +76,34 @@ See `no-littering' for examples.")
;;; Fonts ;;; Fonts
(progn (progn
;; Set default faces ;; Set default faces
(let ((font-name system-default-font) (+with-message "Setting default faces"
(font-size system-default-height) (let ((font-name system-default-font)
(variable-font-name system-variable-pitch-font) (font-size system-default-height)
(variable-font-size system-variable-pitch-height)) (variable-font-name system-variable-pitch-font)
(set-face-attribute 'default nil :family system-default-font (variable-font-size system-variable-pitch-height))
:height font-size :weight 'book) (set-face-attribute 'default nil :family system-default-font
(set-face-attribute 'italic nil :family font-name :height font-size :weight 'book)
:height font-size :slant 'italic) (set-face-attribute 'italic nil :family font-name
(set-face-attribute 'variable-pitch nil :family variable-font-name :height font-size :slant 'italic)
:height variable-font-size)) (set-face-attribute 'variable-pitch nil :family variable-font-name
:height variable-font-size)))
;; Emoji fonts ;; Emoji fonts
(let ((ffl (font-family-list))) (+with-message "Adding emoji fonts"
(dolist (font '("Noto Color Emoji" (let ((ffl (font-family-list)))
"Noto Emoji" (dolist (font '("Noto Color Emoji"
"Segoe UI Emoji" "Noto Emoji"
"Apple Color Emoji" "Segoe UI Emoji"
"FreeSans" "Apple Color Emoji"
"FreeMono" "FreeSans"
"FreeSerif" "FreeMono"
"Unifont" "FreeSerif"
"Symbola")) "Unifont"
(when (member font ffl) "Symbola"))
(set-fontset-font t 'symbol (font-spec :family font) nil :append))))) (when (member font ffl)
(message "Found font: %s" font)
(set-fontset-font t 'symbol (font-spec :family font) nil :append))))))
;;; Packages ;;; Packages
@ -118,21 +121,22 @@ See `no-littering' for examples.")
;; Bootstrap straight.el ;; Bootstrap straight.el
;; https://github.com/raxod502/straight.el ;; https://github.com/raxod502/straight.el
(defvar bootstrap-version) (+with-message "Bootstrapping straight"
(let ((bootstrap-file (defvar bootstrap-version)
(expand-file-name (let ((bootstrap-file
"straight/repos/straight.el/bootstrap.el" (expand-file-name
straight-base-dir)) "straight/repos/straight.el/bootstrap.el"
(bootstrap-version 5)) straight-base-dir))
(unless (file-exists-p bootstrap-file) (bootstrap-version 5))
(with-current-buffer (unless (file-exists-p bootstrap-file)
(url-retrieve-synchronously (with-current-buffer
(concat "https://raw.githubusercontent.com/" (url-retrieve-synchronously
"raxod502/straight.el/develop/install.el") (concat "https://raw.githubusercontent.com/"
'silent 'inhibit-cookies) "raxod502/straight.el/develop/install.el")
(goto-char (point-max)) 'silent 'inhibit-cookies)
(eval-print-last-sexp))) (goto-char (point-max))
(load bootstrap-file nil 'nomessage)) (eval-print-last-sexp)))
(load bootstrap-file nil 'nomessage)))
;; Early-loaded packages -- those that, for some reason or another, ;; Early-loaded packages -- those that, for some reason or another,
;; need to be ensured to be loaded first. ;; need to be ensured to be loaded first.

View File

@ -1266,9 +1266,11 @@ See also `crux-reopen-as-root-mode'."
) )
(setup (:straight org-visibility) (setup (:straight org-visibility)
;; I think this is causing hangups on Windows .. ?
(:option org-visibility-state-file (.etc "org-visibility") (:option org-visibility-state-file (.etc "org-visibility")
org-visibility-include-regexps '("\\.org\\'")) org-visibility-include-regexps '("\\.org\\'"))
(org-visibility-enable-hooks)) ;; (org-visibility-enable-hooks)
)
(setup (:straight orglink) (setup (:straight orglink)
(global-orglink-mode +1)) (global-orglink-mode +1))

View File

@ -58,9 +58,7 @@ FUNC should be a function with the signature (THING REMEMBERED-SETTING)."
;;;###autoload ;;;###autoload
(define-minor-mode reading-mode (define-minor-mode reading-mode
"A mode for reading." "A mode for reading."
:init-value nil
:lighter " Read" :lighter " Read"
:keymap (make-sparse-keymap)
(if reading-mode (if reading-mode
;; turn on ;; turn on
(progn (progn