Skip to content

Commit

Permalink
lang/org: add +jupyter feature, deprecate +ipython
Browse files Browse the repository at this point in the history
And disable +pandoc by default

Relevant to doomemacs#2198
  • Loading branch information
hlissner committed Dec 17, 2019
1 parent 11acc30 commit e782ef1
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 5 deletions.
4 changes: 2 additions & 2 deletions init.example.el
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@
(org ; organize your plain life in plain text
+dragndrop ; drag & drop files/images into org buffers
;;+hugo ; use Emacs for hugo blogging
+ipython ; ipython/jupyter support for babel
+pandoc ; export-with-pandoc support
;;+jupyter ; ipython/jupyter support for babel
;;+pandoc ; export-with-pandoc support
;;+pomodoro ; be fruitful with the tomato technique
+present) ; using org-mode for presentations
;;perl ; write code no one else can comprehend
Expand Down
9 changes: 6 additions & 3 deletions modules/lang/org/README.org
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ intuitive out of the box:
org files to reveal.js slideshows.
+ Drag-and-drop support for images (with inline preview) and media files (drops
a file icon and a short link) (requires =+dragndrop= flag).
+ Integration with pandoc, ipython, reveal.js, beamer, and others (requires
flags).
+ Integration with pandoc, ipython, jupyter, reveal.js, beamer, and others
(requires flags).
+ Export-to-clipboard functionality, for copying text into formatted html,
markdown or rich text to the clipboard (see ~+org/export-to-clipboard~ and
~+org/export-to-clipboard-as-rich-text~).
Expand All @@ -57,7 +57,8 @@ https://www.mfoot.com/blog/2015/11/22/literate-emacs-configuration-with-org-mode
+ =+gnuplot= Installs gnuplot & gnuplot-mode, which enables rendering images
from gnuplot src blocks or plotting tables with ~org-plot/gnuplot~ (bound to
=SPC m b p=, by default).
+ =+ipython= Enables ipython+babel integration.
+ =+ipython= (**DEPRECATED**) Enables ipython integration for babel.
+ =+jupyter= Enables Jupyter integration for babel.
+ =+pandoc= Enables pandoc integration into the Org exporter.
+ =+pomodoro= Enables a pomodoro timer for clocking time on tasks.
+ =+present= Enables integration with reveal.js, beamer and org-tree-slide, so
Expand Down Expand Up @@ -96,6 +97,8 @@ https://www.mfoot.com/blog/2015/11/22/literate-emacs-configuration-with-org-mode
+ [[https://github.com/bruceravel/gnuplot-mode][gnuplot-mode]]
+ =+ipython=
+ [[https://github.com/gregsexton/ob-ipython][ob-ipython]]
+ =+jupyter=
+ [[https://github.com/dzop/emacs-jupyter][jupyter]]
+ =+pandoc=
+ [[https://github.com/kawabata/ox-pandoc][ox-pandoc]]
+ =+pomodoro=
Expand Down
13 changes: 13 additions & 0 deletions modules/lang/org/contrib/jupyter.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
;;; lang/org/contrib/jupyter.el -*- lexical-binding: t; -*-
;;;###if (featurep! +jupyter)

(use-package! ob-jupyter
:defer t
:init
(after! ob-async
(pushnew! ob-async-no-async-languages-alist "jupyter-python" "jupyter-julia"))

(add-hook! '+org-babel-load-functions
(defun +org-babel-load-jupyter-h (lang)
(and (string-prefix-p "jupyter-" (symbol-name lang))
(require 'ob-jupyter nil t)))))
2 changes: 2 additions & 0 deletions modules/lang/org/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
(package! gnuplot-mode))
(when (featurep! +ipython)
(package! ob-ipython))
(when (featurep! +jupyter)
(package! jupyter))
(when (featurep! +pomodoro)
(package! org-pomodoro))
(when (featurep! +present)
Expand Down

0 comments on commit e782ef1

Please sign in to comment.