1 files changed, 17 insertions, 7 deletions

@@ -544,8 +544,7 @@
   (setq load-path (cl-remove-if (lambda (path)
                                   (string-match-p "lisp/org\\'" path))
                                 load-path))
-  (:also-load +org
-              _work)
+  (:also-load +org)
   (:option org-adapt-indentation nil
            org-archive-mark-done t
            org-catch-invisible-edits 'show-and-error
@@ -568,8 +567,11 @@
            org-image-actual-width (list (* (window-font-width)
                                            (- fill-column 8)))
            org-imenu-depth 3
+           org-indent-indentation-per-level 0
+           org-indent-mode-turns-on-hiding-stars nil
            org-list-demote-modify-bullet '(("-" . "+")
-                                           ("+" . "-"))
+                                           ("+" . "*")
+                                           ("*" . "-"))
            org-log-done 'time
            org-log-into-drawer t
            org-num-skip-commented t
@@ -635,10 +637,18 @@
      ;; NOTE: these `progn' and `default's are necessary; otherwise Emacs
      ;; complains about "Invalid face reference: t" in org-mode buffers, because
      ;; `compose-region' returns t.
-     ("^ *\\([-]\\) "
-      (0 (progn (compose-region (match-beginning 1) (match-end 1) "›") 'default)))
-     ("^ *\\([+]\\) "
-      (0 (progn (compose-region (match-beginning 1) (match-end 1) "»") 'default)))))
+     ("^[ \t]*\\([-]\\) "
+      (0 (progn (compose-region (match-beginning 1) (match-end 1) "–") 'fixed-pitch)))
+     ("^[ \t]*\\([+]\\) "
+      (0 (progn (compose-region (match-beginning 1) (match-end 1) "¬") 'fixed-pitch)))
+     ("^[ \t]+\\([*]\\) "
+      (0 (progn (compose-region (match-beginning 1) (match-end 1) "→") 'fixed-pitch)))
+     ;; Fancy numbered lists (well, monospaced)
+     ("^[ \t]*\\(\\(?:[0-9]+\\|[A-Za-z]\\)[.)]\\) " 0 'fixed-pitch t)))
+  ;; Make nobreak-space fixed-pitch as well, for better alignment (is this the
+  ;; best way to do this? probably not!)
+  (:face org-indent ((t (:inherit (fixed-pitch))))
+         nobreak-space ((t (:inherit (fixed-pitch)))))
   (with-eval-after-load 'form-feed
     ;; Horizontal lines
     (font-lock-add-keywords