literate configuration

2 files changed, 64 insertions, 53 deletions

diff --git a/bard-elisp/bard-ryo.el b/bard-elisp/bard-ryo.el
deleted file mode 100644
index 782aab8..0000000
--- a/bard-elisp/bard-ryo.el
+++ /dev/null
@@ -1,49 +0,0 @@
-(defun bard/ryo-insert-p ()
-  "Return t if `ryo-modal-mode` is not bound or not active."
-  (not (bound-and-true-p ryo-modal-mode)))
-
-(defun xah-beginning-of-line-or-block ()
-  "Move cursor to beginning of indent or line, end of previous block, in that order.
-
-If `visual-line-mode' is on, beginning of line means visual line.
-
-URL `http://xahlee.info/emacs/emacs/emacs_move_by_paragraph.html'
-Created: 2018-06-04
-Version: 2024-10-30"
-  (interactive)
-  (let ((xp (point)))
-    (if (or (eq (point) (line-beginning-position))
-            (eq last-command this-command))
-        (when (re-search-backward "\n[\t\n ]*\n+" nil :move)
-          (skip-chars-backward "\n\t ")
-          ;; (forward-char)
-          )
-      (if visual-line-mode
-          (beginning-of-visual-line)
-        (if (eq major-mode 'eshell-mode)
-            (progn
-              (declare-function eshell-bol "esh-mode.el" ())
-              (eshell-bol))
-          (back-to-indentation)
-          (when (eq xp (point))
-            (beginning-of-line)))))))
-
-(defun xah-end-of-line-or-block ()
-  "Move cursor to end of line or next block.
-
-• When called first time, move cursor to end of line.
-• When called again, move cursor forward by jumping over any sequence of whitespaces containing 2 blank lines.
-• if `visual-line-mode' is on, end of line means visual line.
-
-URL `http://xahlee.info/emacs/emacs/emacs_move_by_paragraph.html'
-Created: 2018-06-04
-Version: 2024-10-30"
-  (interactive)
-  (if (or (eq (point) (line-end-position))
-          (eq last-command this-command))
-      (re-search-forward "\n[\t\n ]*\n+" nil :move)
-    (if visual-line-mode
-        (end-of-visual-line)
-      (end-of-line))))
-
-(provide 'bard-ryo)
diff --git a/bard-elisp/bard-theme.el b/bard-elisp/bard-theme.el
index 98f420a..da33997 100644
--- a/bard-elisp/bard-theme.el
+++ b/bard-elisp/bard-theme.el
@@ -2,7 +2,7 @@
         '((default
            :default-height 140
            :default-family "Iosevka Comfy"
-           :variable-pitch-family "Iosevka Comfy Motion"
+           :variable-pitch-family "Iosevka Comfy"
            :variable-pitch-height 1.0
            :fixed-pitch-family "Iosevka Comfy"
            :fixed-pitch-height 1.0
@@ -12,10 +12,32 @@
            :inherit default
            :default-height 135)
           (wide
-           :inherit default
+           :default-height 135
            :default-family "Iosevka Comfy Wide"
            :fixed-pitch-family "Iosevka Comfy Wide"
            :variable-pitch-family "Iosevka Comfy Wide Motion Duo")
+          (prot
+           :default-family "Iosevka Comfy Wide Motion"
+           :default-height 130
+           :default-weight medium
+           :fixed-pitch-family "Iosevka Comfy Wide Motion"
+           :variable-pitch-family "Iosevka Comfy Wide Duo"
+           :bold-weight extrabold)
+          (mono
+           :default-height 130
+           :default-family "monospace"
+           :fixed-pitch-family "monospace"
+           :variable-pitch-family "Baskerville"
+           :variable-pitch-height 140)
+          (mono-large
+           :inherit mono
+           :default-height 150
+           :variable-pitch-height 160)
+          (mac
+           :default-height 130
+           :default-family "Monaco"
+           :variable-pitch-family "Monaco"
+           :fixed-pitch-family "Monaco")
           (large
            :inherit default
            :default-height 160
@@ -44,8 +66,7 @@
 
 (dolist (hook '(bard/after-theme-load-hook))
   (add-hook hook #'fontaine-apply-current-preset)
-  (add-hook hook #'logos-update-fringe-in-buffers)
-  (add-hook hook #'bard/update-ryo-cursor-color))
+  (add-hook hook #'logos-update-fringe-in-buffers))
 
 (defun bard/select-theme (&optional theme)
   "Enable the specified THEME, or prompt the user to select one if THEME is nil."
@@ -96,4 +117,43 @@ leave it alone in pdf-view-mode."
 
 (add-hook 'post-command-hook #'bard/update-cursor-type)
 
+(defun bard/outline-heading-faces ()
+  (set-face-attribute 'org-level-1 nil
+                      :inherit '(outline-1 variable-pitch)
+                      :weight 'light
+                      :height 1.5)
+
+  (set-face-attribute 'org-level-2 nil
+                      :inherit '(outline-2 variable-pitch)
+                      :weight 'light
+                      :height 1.3)
+
+  (set-face-attribute 'org-level-3 nil
+                      :inherit 'outline-3
+                      :height 1.2)
+
+  (set-face-attribute 'org-level-4 nil
+                      :inherit '(outline-4 variable-pitch)
+                      :height 1.1)
+
+  (set-face-attribute 'org-level-5 nil
+                      :inherit '(outline-5 variable-pitch)
+                      :height 1.1)
+
+  (set-face-attribute 'org-level-6 nil
+                      :inherit '(outline-6 variable-pitch)
+                      :height 1.1)
+  
+  (set-face-attribute 'org-agenda-date nil
+                      :inherit 'variable-pitch
+                      :weight 'bold
+                      :height 1.3)
+
+  (set-face-attribute 'org-agenda-structure nil
+                      :inherit 'variable-pitch
+                      :weight 'bold
+                      :height 1.5))
+
+(add-hook 'bard/after-theme-load-hook #'bard/outline-heading-faces)
+
 (provide 'bard-theme)