summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.el2
-rw-r--r--lisp/init-babel.el12
-rw-r--r--lisp/init-org.el25
-rw-r--r--lisp/init-orgcontacts.el9
4 files changed, 25 insertions, 23 deletions
diff --git a/init.el b/init.el
index b13cd62..4ed4382 100644
--- a/init.el
+++ b/init.el
@@ -18,8 +18,6 @@
(require 'init-diminish)
(require 'init-org)
-(require 'init-orgcontacts)
-(require 'init-babel)
(require 'init-files)
(require 'init-buffers)
diff --git a/lisp/init-babel.el b/lisp/init-babel.el
deleted file mode 100644
index 615c860..0000000
--- a/lisp/init-babel.el
+++ /dev/null
@@ -1,12 +0,0 @@
-(setq org-confirm-babel-evaluate nil
- org-src-fontify-natively t)
-
-(org-babel-do-load-languages
- 'org-babel-load-languages
- '((sh . t)
- (python . t)
- (R . t)
- (emacs-lisp . t)
- (latex . t)))
-
-(provide 'init-babel)
diff --git a/lisp/init-org.el b/lisp/init-org.el
index 2debdcc..29a3757 100644
--- a/lisp/init-org.el
+++ b/lisp/init-org.el
@@ -465,6 +465,31 @@ global value. A numeric prefix sets MAXLEVEL (defaults to 2)."
("\\subparagraph{%s}" . "\\subparagraph*{%s}"))))
+;;; Org Babel
+
+(setq org-confirm-babel-evaluate nil
+ org-src-fontify-natively t)
+
+(org-babel-do-load-languages
+ 'org-babel-load-languages
+ '((sh . t)
+ (python . t)
+ (R . t)
+ (emacs-lisp . t)
+ (latex . t)))
+
+
+;;; Org Contacts
+
+(require 'org-contacts)
+
+(setq org-contacts-files '("~/notes/contacts.org"))
+
+(add-to-list 'org-capture-templates
+ '("a" "email address" entry (file+headline "~/notes/contacts.org" "Inbox")
+ "** %(org-contacts-template-name)\n :PROPERTIES:\n :EMAIL: %(org-contacts-template-email)\n :END:"))
+
+
;;; Org in other modes
(after 'git-commit
diff --git a/lisp/init-orgcontacts.el b/lisp/init-orgcontacts.el
deleted file mode 100644
index 548c146..0000000
--- a/lisp/init-orgcontacts.el
+++ /dev/null
@@ -1,9 +0,0 @@
-(require 'org-contacts)
-
-(setq org-contacts-files '("~/notes/contacts.org"))
-
-(add-to-list 'org-capture-templates
- '("a" "email address" entry (file+headline "~/notes/contacts.org" "Inbox")
- "** %(org-contacts-template-name)\n :PROPERTIES:\n :EMAIL: %(org-contacts-template-email)\n :END:"))
-
-(provide 'init-orgcontacts)