emacs: Update org theming

- Remove thanos/org-theme-dracula & thanos/org-theme/darkone
- Rewrite gruvbox theming & do colorscheme as seperate variable
- Disable org-modern-table

1 files changed, 13 insertions, 59 deletions

diff --git a/.emacs.d/modules/thanos-org.el b/.emacs.d/modules/thanos-org.el
index be76824..00cac5d 100644
--- a/.emacs.d/modules/thanos-org.el
+++ b/.emacs.d/modules/thanos-org.el
@@ -165,67 +165,20 @@
 (require 'org-agenda)
 (require 'org)
 
-(defun thanos/org-theme-dracula ()
-  "Enable Dracula theme for Org headers."
-  (interactive)
-  (dolist
-      (face
-       '((org-level-1 1.7 "#8be9fd" extra-bold)
-	 (org-level-2 1.6 "#bd93f9" extra-bold)
-	 (org-level-3 1.5 "#50fa7b" bold)
-	 (org-level-4 1.4 "#ff79c6" semi-bold)
-	 (org-level-5 1.3 "#9aedfe" normal)
-	 (org-level-6 1.2 "#caa9fa" normal)
-	 (org-level-7 1.1 "#5af78e" normal)
-	 (org-level-8 1.0 "#ff92d0" normal)))
-    (set-face-attribute (nth 0 face) nil
-			:font "JetBrains Mono"
-			:weight (nth 3 face)
-			:height (nth 1 face)
-			:foreground (nth 2 face)))
-  (set-face-attribute 'org-table nil
-		      :font "JetBrains Mono"
-		      :weight 'normal
-		      :height 1.0
-		      :foreground "#bfafdf"))
-
-(defun thanos/org-theme-darkone ()
-  "Enable Darkone theme for Org headers."
-  (interactive)
-  (dolist
-      (face
-       '((org-level-1 1.70 "#51afef" bold)
-	 (org-level-2 1.55 "#7FBCD2" bold)
-	 (org-level-3 1.40 "#da8548" bold)
-	 (org-level-4 1.20 "#da8548" semi-bold)
-	 (org-level-5 1.20 "#5699af" normal)
-	 (org-level-6 1.20 "#a9a1e1" normal)
-	 (org-level-7 1.10 "#46d9ff" normal)
-	 (org-level-8 1.00 "#ff6c6b" normal)))
-    (set-face-attribute (nth 0 face) nil
-			:font "Jetbrains Mono"
-			:weight (nth 3 face)
-			:height (nth 1 face)
-			:foreground (nth 2 face)))
-  (set-face-attribute 'org-table nil
-		      :font "Jetbrains Mono"
-		      :weight 'normal
-		      :height 1.0
-		      :foreground "#A66CFF"))
+(defvar org-gruvbox-theming
+  '((org-level-1 1.50 "#fb4934" extra-bold)
+    (org-level-2 1.35 "#98971a" bold)
+    (org-level-3 1.30 "#458588" bold)
+    (org-level-4 1.20 "#b16286" semi-bold)
+    (org-level-5 1.10 "#689d6a" normal)
+    (org-level-6 1.10 "#d3869b" normal)
+    (org-level-7 1.10 "#8ec07c" normal)
+    (org-level-8 1.00 "#ebdbb2" normal)))
 
 (defun thanos/org-theme-gruvbox ()
   "Enable Darkone theme for Org headers."
   (interactive)
-  (dolist
-      (face
-       '((org-level-1 1.70 "#fb4934" bold)
-	 (org-level-2 1.55 "#98971a" bold)
-	 (org-level-3 1.40 "#458588" bold)
-	 (org-level-4 1.20 "#b16286" semi-bold)
-	 (org-level-5 1.20 "#689d6a" normal)
-	 (org-level-6 1.20 "#d3869b" normal)
-	 (org-level-7 1.10 "#8ec07c" normal)
-	 (org-level-8 1.00 "#ebdbb2" normal)))
+  (dolist (face org-gruvbox-theming)    
     (set-face-attribute (nth 0 face) nil
 			:font "Jetbrains Mono"
 			:weight (nth 3 face)
@@ -233,9 +186,9 @@
 			:foreground (nth 2 face)))
   (set-face-attribute 'org-table nil
 		      :font "Jetbrains Mono"
-		      :weight 'normal
+		      :weight 'semi-bold
 		      :height 1.0
-		      :foreground "#A66CFF"))
+		      :foreground "#fb4934"))
 
 (modify-all-frames-parameters
  '((right-divider-width . 5)
@@ -271,6 +224,7 @@
 
 (global-org-modern-mode)
 
+(setf org-modern-table nil)
 (setf org-modern-todo nil)