From f466ec0d0627b82d577048dce34df2776f183db3 Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Wed, 24 Apr 2019 17:24:14 -0400 Subject: [PATCH] use org contrib --- conf.org | 4 ++-- init.el | 13 ++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/conf.org b/conf.org index d55d5ff..acbd045 100644 --- a/conf.org +++ b/conf.org @@ -954,8 +954,8 @@ No custom code here, but flycheck needs =sqlint= (on Arch available through the *** modules Org has several extensions in the form of loadable modules. =org-protocol= is used as a backend for external programs to communicate with =org-mode=. =org-habit= allows the habit todoitem which is used as a more flexible recurring task. #+BEGIN_SRC emacs-lisp -(setq org-modules '(org-habit org-protocol)) -(straight-use-package '(org :type built-in)) +(org-set-modules 'org-modules '(org-habit org-protocol)) + ;; make sure everything else works that I have customly defined (require 'org-agenda) (require 'org-protocol) diff --git a/init.el b/init.el index 7f4c9f2..2bbd011 100644 --- a/init.el +++ b/init.el @@ -1,8 +1,3 @@ -;; (require 'package) -;; (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t) -;; (add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t) -;; (package-initialize) - ;; init the straight package manager (defvar bootstrap-version) (let ((bootstrap-file @@ -27,14 +22,14 @@ (straight-use-package 'use-package) -;; (unless (package-installed-p 'use-package) -;; (package-refresh-contents) -;; (package-install 'use-package)) - (defvar nd/conf-dir "~/.emacs.d/" "The absolute path to the EMACS configuration directory.") (defvar nd/conf-main (expand-file-name "conf.org" nd/conf-dir) "The absolute path the main EMACS configuration file.") +;; ensure we don't use built-in org mode +(use-package org :straight org-plus-contrib) +;; (straight-use-package '(org :type built-in)) + (org-babel-load-file nd/conf-main)