aboutsummaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorGravatar Tom Willemse2019-02-12 01:00:36 -0800
committerGravatar Tom Willemse2019-02-12 01:00:36 -0800
commit569bbc5c990b18eb71ea650403f8b2f89cca1c87 (patch)
tree6240fa4641825afce757641530cbcae097657cd8 /emacs
parentbfaa8b17635df2a825b20335e980b80857d104e7 (diff)
downloadnew-dotfiles-569bbc5c990b18eb71ea650403f8b2f89cca1c87.tar.gz
new-dotfiles-569bbc5c990b18eb71ea650403f8b2f89cca1c87.zip
Move org mode configuration to emacs-config
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.el1
-rw-r--r--emacs/.emacs.d/init/oni-org-init.el135
2 files changed, 0 insertions, 136 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 115ccac..fa9c721 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -231,7 +231,6 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
(with-eval-after-load 'js (load "oni-js-mode-init"))
(with-eval-after-load 'lui (load "oni-lui-init"))
(with-eval-after-load 'magit (load "oni-magit-init"))
-(with-eval-after-load 'org (load "oni-org-init"))
(with-eval-after-load 'php-mode (load "oni-php-mode-init"))
(with-eval-after-load 'ruby-mode (load "oni-ruby-init"))
(with-eval-after-load 'scheme (load "oni-scheme-init"))
diff --git a/emacs/.emacs.d/init/oni-org-init.el b/emacs/.emacs.d/init/oni-org-init.el
deleted file mode 100644
index 04bb759..0000000
--- a/emacs/.emacs.d/init/oni-org-init.el
+++ /dev/null
@@ -1,135 +0,0 @@
-;;; oni-org-init.el --- Org-mode configuration -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2018 Tom Willemse
-
-;; Author: Tom Willemse <tom@ryuslash.org>
-;; Keywords: local
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; My configuration for org-mode. I try to implement a GTD workflow.
-
-;;; Code:
-
-(require 'org)
-(require 'org-capture)
-(require 'org-habit)
-
-(defun oni-org-init-expand-to-home (file-name)
- "Expand FILE-NAME to the base directory for that system.
-The base for all org files on Windows is u:/, but on my linux
-installs it will always be ~."
- (let ((base-dir (if (eq system-type 'windows-nt) "u:/" "~")))
- (expand-file-name file-name base-dir)))
-
-(defun oni-org-init-setup-prettify-symbols-mode ()
- "Set up prettify symbols mode for org mode."
- (when (member "Ionicons" (font-family-list))
- (setq-local prettify-symbols-alist
- '(("[ ]" . #xf372)
- ("[X]" . #xf374)))
- (set-face-attribute 'org-checkbox nil :family "Ionicons")
- (prettify-symbols-mode)))
-
-(defun oni-org-init-heading-has-predecessor-p ()
- "Determine if the heading at point has any predecessors.
-Only tasks of a level greater than 3 are considered. A task has a
-predecessor if there is a non-DONE sibling defined before it."
- (let ((point (point)))
- (save-excursion
- (org-backward-heading-same-level 1)
- (seq-let [level _ keyword] (org-heading-components)
- (not (or (< level 3)
- (= point (point))
- (member keyword org-done-keywords)))))))
-
-(defun oni-org-init-looking-for-tag-p (tag)
- "Return t if we're currently looking for TAG in an agenda."
- (and (eql 'org-tags-view (car org-agenda-redo-command))
- (string-match-p (rx-to-string `(and word-start ,tag word-end))
- org-agenda-query-string)))
-
-(defun oni-org-init-next-heading-position ()
- "Get the position of the next Org heading."
- (or (ignore-errors
- (org-forward-element)
- (point))
- (point-max)))
-
-(defun oni-org-init-skip-tasks ()
- "Skip over tasks I don't want to see right now.
-Tasks being skipped over include ones with the \"ex\" tag and
-ones that have a predecessor."
- (let ((tags (org-get-tags (point))))
- (when (or (and (not (oni-org-init-looking-for-tag-p "ex"))
- (member "ex" tags))
- (oni-org-init-heading-has-predecessor-p))
- (oni-org-init-next-heading-position))))
-
-(setq org-default-notes-file
- (oni-org-init-expand-to-home "documents/gtd/inbox.org"))
-(setq org-src-fontify-natively t)
-(setq org-return-follows-link t)
-(setq org-fontify-whole-heading-line t)
-(setq org-hide-emphasis-markers t)
-(setq org-return-follows-link t)
-(setq org-use-fast-todo-selection t)
-(setq org-log-into-drawer t)
-(setq org-agenda-todo-ignore-scheduled 'future)
-(setq org-agenda-skip-function-global #'oni-org-init-skip-tasks)
-
-(setq org-agenda-files
- (mapcar #'oni-org-init-expand-to-home
- '("documents/gtd/todo.org"
- "documents/gtd/projects.org"
- "documents/gtd/appointments.org")))
-
-(setq org-refile-targets
- (mapcar (lambda (pair)
- (cons (oni-org-init-expand-to-home (car pair))
- (cdr pair)))
- '(("documents/gtd/todo.org" :maxlevel . 1)
- ("documents/gtd/projects.org" :level . 2)
- ("documents/gtd/someday.org" :maxlevel . 2)
- ("documents/gtd/appointments.org" :maxlevel . 1))))
-
-(setq org-capture-templates
- `(("t" "Note" entry
- (file ,(oni-org-init-expand-to-home "documents/gtd/inbox.org"))
- "* TODO %i%?")
- ("a" "Appointment" entry
- (file ,(oni-org-init-expand-to-home "documents/gtd/appointments.org"))
- "* %i%?\n %U")
- ("j" "Journal entry" entry
- (file+olp+datetree
- ,(oni-org-init-expand-to-home "documents/gtd/journal.org"))
- "* %<%H:%M:%S>\n %?")))
-
-(setq org-todo-keywords
- '((sequence "TODO(t)" "BLOCKED(b@)" "PROGRESS(p)"
- "|" "DONE(d!)" "CANCELLED(c@)")))
-
-(add-to-list 'org-modules 'org-habit)
-
-(add-hook 'org-mode-hook 'auto-fill-mode)
-(add-hook 'org-mode-hook #'oni-org-init-setup-prettify-symbols-mode)
-
-(unless (eq system-type 'windows-nt)
- (require 'org-bullets)
- (add-hook 'org-mode-hook 'org-bullets-mode))
-
-(provide 'oni-org-init)
-;;; oni-org-init.el ends here