From d20e40b1f9b4942630df8b6cc180242e63a01278 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@tfcconnection.org>
Date: Fri, 26 Feb 2021 09:15:33 -0600
Subject: [PATCH] Added elfeed and mixed-font-faces

---
 README.org | 34 +++++++++++++++++++++++++++++++++-
 init.el    | 26 +++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/README.org b/README.org
index 0f5f8ec4..dbc92288 100644
--- a/README.org
+++ b/README.org
@@ -19,6 +19,7 @@
   - [[#org-mode][Org Mode]]
   - [[#mu4e][MU4E]]
   - [[#calendar][Calendar]]
+  - [[#elfeed][Elfeed]]
   - [[#magit][Magit]]
   - [[#eshell][Eshell]]
   - [[#pdf-tools][PDF-Tools]]
@@ -91,7 +92,7 @@ In order to have this config work on both my desktop with regular joe-schmoe mon
   (set-face-attribute 'fixed-pitch nil :font "VictorMono Nerd Font"
                       :height chris/default-font-size)
   (set-face-attribute 'variable-pitch nil :font "Cantarell"
-                      :height chris/default-font-size :weight 'regular))
+                      :height (+ chris/default-font-size (/ chris/default-font-size 8)) :weight 'regular))
 
 (if (daemonp)
     (add-hook 'after-make-frame-functions
@@ -731,6 +732,21 @@ We also need to add =evil-org= to make better keybindings.
   :after org)
 #+end_src
 
+Let's make sure org-mode faces are inheriting fixed pitch faces.
+#+begin_src emacs-lisp
+(eval-after-load 'org
+  (dolist (face '(org-block
+		  org-block-begin-line
+		  org-block-end-line
+		  org-code
+		  org-document-info-keyword
+		  org-meta-line
+		  org-table
+		  org-verbatim))
+    (set-face-attribute `,face nil :inherit 'fixed-pitch)))
+(eval-after-load 'org
+  (set-face-attribute 'org-block-end-line nil :inherit 'org-block-begin-line))
+#+end_src
 *** Org-Super-Agenda
 Super Agenda gives me a really nice way of making the agenda view look a lot better with some better information included.
 #+begin_src emacs-lisp
@@ -1129,6 +1145,22 @@ Here we setup an easy way to use ical as a source for calendar views.
 (use-package calfw-ical
   :after calfw)
 #+end_src
+
+** Elfeed
+#+begin_src emacs-lisp
+(use-package elfeed
+  :commands (elfeed)
+  :general
+  (chris/leader-keys
+    "of" 'elfeed))
+#+end_src
+
+#+begin_src emacs-lisp
+(use-package elfeed-org
+  :after elfeed
+  :config
+  (setq rmh-elfeed-org-files (list "~/org/elfeed.org")))
+#+end_src
 ** Magit
 Use magit, because why wouldn't you? duh!
 #+begin_src emacs-lisp
diff --git a/init.el b/init.el
index f51b6855..0ca7da1f 100644
--- a/init.el
+++ b/init.el
@@ -30,7 +30,7 @@
   (set-face-attribute 'fixed-pitch nil :font "VictorMono Nerd Font"
                       :height chris/default-font-size)
   (set-face-attribute 'variable-pitch nil :font "Cantarell"
-                      :height chris/default-font-size :weight 'regular))
+                      :height (+ chris/default-font-size (/ chris/default-font-size 8)) :weight 'regular))
 
 (if (daemonp)
     (add-hook 'after-make-frame-functions
@@ -480,6 +480,19 @@ vertically."
 (use-package evil-org
   :after org)
 
+(eval-after-load 'org
+  (dolist (face '(org-block
+		  org-block-begin-line
+		  org-block-end-line
+		  org-code
+		  org-document-info-keyword
+		  org-meta-line
+		  org-table
+		  org-verbatim))
+    (set-face-attribute `,face nil :inherit 'fixed-pitch)))
+(eval-after-load 'org
+  (set-face-attribute 'org-block-end-line nil :inherit 'org-block-begin-line))
+
 (use-package org-super-agenda
   :after org-agenda
   :init
@@ -842,6 +855,17 @@ If on a:
 (use-package calfw-ical
   :after calfw)
 
+(use-package elfeed
+  :commands (elfeed)
+  :general
+  (chris/leader-keys
+    "of" 'elfeed))
+
+(use-package elfeed-org
+  :after elfeed
+  :config
+  (setq rmh-elfeed-org-files (list "~/org/elfeed.org")))
+
 (use-package magit
   :commands (magit-status magit-get-current-branch)
   :general