summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--init.org32
1 files changed, 17 insertions, 15 deletions
diff --git a/init.org b/init.org
index 42fba09..5f1b7df 100644
--- a/init.org
+++ b/init.org
@@ -750,7 +750,18 @@ customizing it.
'auto-compile-inhibit-compile-detached-git-head))
#+end_src
-*** Org
+*** [[https://orgmode.org/][Org]]
+
+#+begin_quote
+Org mode is for keeping notes, maintaining TODO lists, planning
+projects, and authoring documents with a fast and effective plain-text
+system.
+#+end_quote
+
+In short, my favourite way of life.
+
+First, we have to resort to a [[https://github.com/raxod502/straight.el#installing-org-with-straightel][hack]] to be able to use the correct
+latest version of Org from upstream.
#+begin_src emacs-lisp
(use-package git)
@@ -781,24 +792,13 @@ customizing it.
"--abbrev=0"
"HEAD")))))
- (provide 'org-version)
-
- (use-package org
- :defer 0.8) ; or org-plus-contrib if desired
+(provide 'org-version)
#+end_src
-*** COMMENT [[https://orgmode.org/][Org mode]]
-
-#+begin_quote
-Org mode is for keeping notes, maintaining TODO lists, planning
-projects, and authoring documents with a fast and effective plain-text
-system.
-#+end_quote
-
-In short, my favourite way of life.
+And here's where my actual Org configurations begin:
#+begin_src emacs-lisp
-(use-package org
+(use-package org-plus-contrib
:defer 1
:config
(setq org-src-tab-acts-natively t
@@ -830,6 +830,7 @@ In short, my favourite way of life.
'(org-latex-and-related ((t (:foreground "#b294bb")))))
(use-package ox-latex
+ :straight nil
:after ox
:config
(setq org-latex-listings 'listings
@@ -847,6 +848,7 @@ In short, my favourite way of life.
t))
(use-package ox-beamer
+ :straight nil
:after ox)
(use-package orgalist