1 files changed, 48 insertions, 7 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 0cb730d..d56e8a5 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -1163,13 +1163,6 @@ Computing Environment".
          (with-eval-after-load 'gnus (load "oni-gnus-init"))
        #+END_SRC
 
-  - [[file:init/oni-org-init.org][Org]] :: Org is the craziest and most flexible organizational
-       application anyone's ever seen.
-
-       #+BEGIN_SRC emacs-lisp
-         (with-eval-after-load 'org (load "oni-org-init"))
-       #+END_SRC
-
   - [[file:init/oni-eshell-init.org][Eshell]] :: The best shell on the planet.
 
        #+BEGIN_SRC emacs-lisp
@@ -1351,6 +1344,54 @@ Computing Environment".
      (add-hook 'jabber-chat-mode-hook 'oni:set-default-directory)
    #+END_SRC
 
+** Org mode
+   :PROPERTIES:
+   :header-args: :tangle "init/oni-org-init.el"
+   :END:
+
+   Since Org mode is a big package and I end up customizing it /a lot/
+   I always keep its settings in a separate file since it might be
+   awhile before org-mode is loaded.
+
+   #+BEGIN_SRC emacs-lisp :tangle yes
+     (with-eval-after-load 'org (load "oni-org-init"))
+   #+END_SRC
+
+   To keep the byte-compiler from complaining, require any libraries
+   that are used by my configuration when this file is loaded.
+
+   #+BEGIN_SRC emacs-lisp
+     (require 'org)
+     (require 'org-bullets)
+     (require 'org-capture)
+   #+END_SRC
+
+   Fontify source code blocks in Org mode natively, meaning that they
+   should be fontified using the major mode specified in the source
+   block language.
+
+   #+BEGIN_SRC emacs-lisp
+     (setq org-src-fontify-natively t)
+   #+END_SRC
+
+   Follow the link at point when {{{key(RET)}}} is pressed.
+
+   #+BEGIN_SRC emacs-lisp
+     (setq org-return-follows-link t)
+   #+END_SRC
+
+   Automatically fill paragraphs while editing text.
+
+   #+BEGIN_SRC emacs-lisp
+     (add-hook 'org-mode-hook 'auto-fill-mode)
+   #+END_SRC
+
+   Show pretty bullets instead of the default asterisk characters.
+
+   #+BEGIN_SRC emacs-lisp
+     (add-hook 'org-mode-hook 'org-bullets-mode)
+   #+END_SRC
+
 * Custom
 
   Put the customize settings in a different file so that Emacs doesn't