Merge branch 'master' of gitlab.com:chriscochrun/dotemacs

init.el

@@ -355,7 +355,8 @@ vertically."
   :config
   (setq org-startup-indented t
 	org-edit-src-content-indentation 0
-	org-agenda-sticky t)
+	org-agenda-sticky t
+	org-fontify-quote-and-verse-blocks t)
 
   (add-hook 'org-mode-hook 'chris/org-mode-setup)
 
@@ -446,8 +447,7 @@ vertically."
     "Remove the org-columns overlay and turn on olivetti-mode"
     (interactive)
     (org-columns-quit)
-    (visual-line-mode +1)
-    (olivetti-mode +1))
+    (chris/org-mode-setup))
 
   (add-hook 'org-agenda-finalize-hook 'evil-normal-state)
 
@@ -463,6 +463,7 @@ vertically."
     (set-face-attribute `,face nil :inherit 'fixed-pitch))
   
   (set-face-attribute 'org-block-end-line nil :inherit 'org-block-begin-line)
+  (set-face-attribute 'org-quote nil :background "#242631" :inherit 'fixed-pitch)
 
   :general
   (chris/leader-keys
@@ -577,7 +578,11 @@ vertically."
   :after org
   :config
   (org-superstar-mode +1)
-  (setq org-superstar-headline-bullets-list '("\u25c9" "\u25c8" "\u25b8" "\u25ce" "\u272c" "\u25c7" "\u2749" "\u2719" "\u2756"))
+  (setq org-superstar-headline-bullets-list '("\u25c9" "\u25c8" "盛" "\u25ce" "\u272c" "\u25c7" "\u2749" "\u2719" "\u2756"))
+  (setq org-superstar-item-bullet-alist '((?- . ?\u25b8)
+					  (?+ . ?\u2749)
+					  (?* . ?\u25c9)))
+  (set-face-attribute 'org-superstar-item nil :inherit 'org-level-3)
   (add-hook 'org-mode-hook 'org-superstar-mode))
 
 (defun chris/org-dwim-at-point (&optional arg)
@@ -997,6 +1002,11 @@ If on a:
   :config
   (pdf-tools-install))
 
+(use-package nov
+  :mode ("\\.epub\\'" . nov-mode)
+  :config
+  (add-hook 'nov-mode-hook 'olivetti-mode))
+
 (setq display-buffer-alist
       '(("\\*e?shell\\*"
 	 (display-buffer-in-side-window)