diff --git a/ha-config.org b/ha-config.org index 099dd2b..19ba330 100644 --- a/ha-config.org +++ b/ha-config.org @@ -56,9 +56,9 @@ Changes and settings I like introduced in Emacs 28: I’ve got preferences for how I like scrolling, and with my org files, I need a little more of the of the context, so this increases from =2= to =3=, but I like to keep the cursor in place when I can: #+begin_src emacs-lisp -(setq next-screen-context-lines 3 - scroll-error-top-bottom t - scroll-preserve-screen-position t) + (setq next-screen-context-lines 30 + scroll-error-top-bottom t + scroll-preserve-screen-position t) #+end_src Emacs has some new code to display line-numbers, and the =visual= value works well with my Org files, allowing a jump to a line via ~6 j~: @@ -901,7 +901,7 @@ Build the hydra as well as configure the =perspective= project. :config (setq persp-suppress-no-prefix-key-warning t) - (persp-mode +1) + (persp-mode) (defhydra hydra-workspace-leader (:color blue :hint nil) " Workspaces- %s(ha-persp-labels) diff --git a/ha-demos.org b/ha-demos.org index effdb3e..fd99e5d 100644 --- a/ha-demos.org +++ b/ha-demos.org @@ -80,9 +80,8 @@ Regardless of the presentation package I use, I make them all look similar with (ha-demo-hide-cursor) (ha-demo-presentation-frame frame-name) - (if (fboundp 'org-present-big) - (org-present-big) - (font-size-adjust 4)) ; instead of (text-scale-set 4) + (ha-set-favorite-font-size 42) ; instead of (text-scale-set 4) + (diff-hl-mode -1) (flycheck-mode -1) (jinx-mode -1) @@ -107,7 +106,7 @@ And after a presentation finishes, this function cleans up by restoring minor mo (ha-demo-show-cursor) (ha-demo-normalize-frame) - (font-size-adjust -4) ; (text-scale-set 0) + (ha-mac-monitor-fontsize) ; (text-scale-set 0) (diff-hl-mode) (flycheck-mode) (jinx-mode)) diff --git a/ha-display.org b/ha-display.org index b3beefd..392de1f 100644 --- a/ha-display.org +++ b/ha-display.org @@ -259,15 +259,21 @@ Simple function that gives me the font information based on the size I need. Re #+begin_src emacs-lisp (defun ha-set-favorite-font-size (size) "Set the default font size as well as equalize the fixed and variable fonts." - ;; The font specification is the name and the size ... odd enough I guess: - (let ((fixed-font (format "%s-%d" ha-fixed-font size)) + + (let ((mixed-on mixed-pitch-mode) + (fixed-font (format "%s-%d" ha-fixed-font size)) (prop-font (format "%s-%d" ha-variable-font size))) + (when mixed-on + (mixed-pitch-mode -1)) + + ;; The font specification is the name and the size ... odd enough I guess: (set-face-attribute 'default nil :font fixed-font) (set-face-attribute 'fixed-pitch nil :font fixed-font :inherit 'default :height 'unspecified) (set-face-attribute 'variable-pitch nil :font prop-font :inherit 'default - :height (* size 10) - ))) + :height 'unspecified) + (when mixed-on + (mixed-pitch-mode 1)))) #+end_src Define /interactive/ functions to quickly adjusting the font size based on my computing scenario: @@ -319,6 +325,7 @@ Which font to choose? (font-monitor-size-default) #+end_src + ** Mixed Pitch [[https://github.com/emacsmirror/mixed-pitch][Mixed pitch]] is a minor mode that enables mixing fixed-pitch (also known as fixed-width or monospace) and variable-pitch (AKA “proportional”) fonts. It tries to be smart about which fonts get which face. @@ -403,6 +410,7 @@ This project replaces [[https://github.com/domtronn/all-the-icons.el][all-the-ic ('mdicon "md") ('codicon "cod") ('sucicon "custom") + ('devicon "dev") (t collection))) (title (plist-get args :title)) (space (plist-get args :space)) @@ -530,13 +538,8 @@ Increase or decrease the set size of the face: (let* ((font-family (face-attribute 'default :font)) (font-size (font-get font-family :size)) - (new-size (+ delta font-size)) - (mixed-on mixed-pitch-mode)) - (when mixed-on - (mixed-pitch-mode -1)) - (ha-set-favorite-font-size new-size) - (when mixed-on - (mixed-pitch-mode 1)))) + (new-size (+ delta font-size))) + (ha-set-favorite-font-size new-size))) (defun font-size-increase () "Increase the `default' font size of all frames."