From 200ec038f901ed791362b920fbb8ea9de9d49d4a Mon Sep 17 00:00:00 2001
From: xerus2000 <27jf@pm.me>
Date: Thu, 26 Nov 2020 20:34:08 +0100
Subject: [PATCH] config/doom: reorder & simplify org config

---
 .config/doom/.gitignore  |  1 +
 .config/doom/config.el   | 37 ++++++++++++++++++++++++-------------
 .config/doom/packages.el |  1 +
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/.config/doom/.gitignore b/.config/doom/.gitignore
index 0a41f1e..fb70506 100644
--- a/.config/doom/.gitignore
+++ b/.config/doom/.gitignore
@@ -1,3 +1,4 @@
 init.el
 local.el
+custom.el
 */
diff --git a/.config/doom/config.el b/.config/doom/config.el
index 2ad3c6d..9864e14 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -25,8 +25,8 @@
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
 (setq   doom-theme 'doom-one
-        doom-font (font-spec :family "Fira Code" :size 24 :weight 'semi-light)
-        doom-variable-pitch-font (font-spec :family "sans" :size 25))
+        doom-font (font-spec :family "Fira Code" :size 28 :weight 'semi-light)
+        doom-variable-pitch-font (font-spec :family "sans" :size 28))
 
 (setq display-line-numbers-type 'relative)
 
@@ -38,14 +38,6 @@
         :leader "as" 'annotate-mode
         )
 
-(setq   plantuml-executable-path "nostderr"
-        plantuml-executable-args '("plantuml" "-headless")
-        plantuml-default-exec-mode 'executable
-        plantuml-output-type "png"
-        plantuml-jar-path "/usr/share/java/plantuml/plantuml.jar"
-        plantuml-java-args '("-Djava.awt.headless=true" "-jar")
-        )
-
 ;; Undo
 (setq   evil-want-fine-undo t)
 (setq   amalgamating-undo-limit 5)
@@ -103,8 +95,11 @@
 (set-file-template! 'org-mode :ignore t)
 (setq default-directory org-directory)
 (setq org-read-date-prefer-future nil)
-(setq org-image-actual-width 200)
+(setq org-image-actual-width t)
+
+; Exporting
 (setq org-latex-packages-alist '(("margin=3cm" "geometry") ("avoid-all" "widows-and-orphans")))
+(setq org-export-with-sub-superscripts nil)
 
 ;; org toggle source blocks with C-c t
 (defvar org-blocks-hidden nil)
@@ -118,8 +113,6 @@
 (define-key org-mode-map (kbd "C-c t") 'org-toggle-blocks)
 (define-key org-mode-map (kbd "C-c .") 'org-time-stamp-inactive)
 
-(add-hook 'org-mode-hook 'org-toggle-blocks)
-(add-hook 'org-mode-hook 'org-toggle-inline-images)
 (add-hook 'org-mode-hook (apply-partially '+org/close-all-folds 2))
 
 ;; https://christiantietze.de/posts/2019/06/org-fold-heading/
@@ -141,6 +134,24 @@
       (ct/org-foldup)))
 (define-key org-mode-map (kbd "S-<tab>") 'ct/org-shifttab)
 
+;; PLANTUML
+
+(setq   plantuml-executable-path "nostderr"
+        plantuml-executable-args '("plantuml" "-headless")
+        plantuml-default-exec-mode 'executable
+        plantuml-jar-path "/usr/share/java/plantuml/plantuml.jar"
+        org-plantuml-jar-path plantuml-jar-path
+        plantuml-java-args '("-Djava.awt.headless=true" "-jar")
+        )
+(add-to-list 'org-src-lang-modes '("plantuml" . plantuml))
+(with-eval-after-load 'org
+(org-babel-do-load-languages
+ 'org-babel-load-languages
+ '(other Babel languages
+   (plantuml . t)
+   )))
+
+
 ;; Here are some additional functions/macros that could help you configure Doom:
 ;;
 ;; - `load!' for loading external *.el files relative to this one
diff --git a/.config/doom/packages.el b/.config/doom/packages.el
index 5f9859f..27ed2ab 100644
--- a/.config/doom/packages.el
+++ b/.config/doom/packages.el
@@ -53,4 +53,5 @@
 (package! visual-fill-column)
 (package! togetherly)
 (package! plantuml-mode)
+(package! ox-reveal)
 ;(package! plantuml-mode :recipe (:local-repo "plantuml-mode"))