From 5ab30e5be5262c5abc74b3762a75b17c0eb7710c Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 27 Aug 2019 23:43:04 -0700 Subject: Add snippets for ‘oni-org’ --- GNUmakefile | 16 +- oni-org.el | 191 ------------------ oni-org/Cask | 14 ++ oni-org/oni-org.el | 214 +++++++++++++++++++++ .../snippets/org-mode/.yas-compiled-snippets.el | 11 ++ oni-org/snippets/org-mode/codeblock | 7 + oni-org/snippets/org-mode/heading | 9 + oni-org/snippets/org-mode/project | 51 +++++ oni-org/snippets/org-mode/snippet | 14 ++ 9 files changed, 335 insertions(+), 192 deletions(-) delete mode 100644 oni-org.el create mode 100644 oni-org/Cask create mode 100644 oni-org/oni-org.el create mode 100644 oni-org/snippets/org-mode/.yas-compiled-snippets.el create mode 100644 oni-org/snippets/org-mode/codeblock create mode 100644 oni-org/snippets/org-mode/heading create mode 100644 oni-org/snippets/org-mode/project create mode 100644 oni-org/snippets/org-mode/snippet diff --git a/GNUmakefile b/GNUmakefile index e58648c..246208b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -3,7 +3,7 @@ FILES := $(wildcard *.el) PACKAGE_TARGETS := $(addprefix package-,$(FILES)) package: $(PACKAGE_TARGETS) package-oni-conf package-oni-css package-oni-elisp \ - package-oni-haml package-oni-html package-oni-nxml + package-oni-haml package-oni-html package-oni-nxml package-oni-org package-%: % emacs --batch \ @@ -47,6 +47,12 @@ package-oni-nxml: --funcall package-initialize \ --eval "(package-upload-file (car (sort (file-expand-wildcards \"oni-nxml/dist/*.tar\") #'string>)))" +package-oni-org: + emacs --batch \ + --load oni-package.el \ + --funcall package-initialize \ + --eval "(package-upload-file (car (sort (file-expand-wildcards \"oni-org/dist/*.tar\") #'string>)))" + install-%: emacs --batch \ --load oni-package.el \ @@ -103,6 +109,14 @@ install-oni-nxml: $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \ --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-nxml/dist/*.tar\") #'string>)))" +install-oni-org: + emacs --batch \ + --load oni-package.el \ + --fluncall package-initialize \ + --eval '(package-refresh-contents)' \ + $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \ + --eval "(package-install-file (car (sort (file-expand-wildcards \"oni-org/dist/*.tar\") #'string>)))" + test-%: install-% emacs --batch \ --load oni-package.el \ diff --git a/oni-org.el b/oni-org.el deleted file mode 100644 index 59170d1..0000000 --- a/oni-org.el +++ /dev/null @@ -1,191 +0,0 @@ -;;; oni-org.el --- Org mode configuration -*- lexical-binding: t; -*- - -;; Copyright (C) 2019 Tom Willemse - -;; Author: Tom Willemse -;; Keywords: local -;; Version: 20190815163343 -;; Package-Requires: (org-plus-contrib org-bullets hydra org-wild-notifier) - -;; 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 . - -;;; Commentary: - -;; Configuration for `org-mode'. - -;;; Code: - -(require 'hydra) -(require 'org) -(require 'org-capture) -(require 'org-clock) -(require 'org-habit) - -(defun oni-org-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-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-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 :invisible-ok) - (seq-let [level _ keyword] (org-heading-components) - (not (or (< level 3) - (= point (point)) - (member keyword org-done-keywords))))))) - -(defun oni-org-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-next-heading-position () - "Get the position of the next Org heading." - (or (ignore-errors - (org-forward-element) - (point)) - (point-max))) - -(defun oni-org-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-looking-for-tag-p "ex")) - (member "ex" tags)) - (oni-org-heading-has-predecessor-p)) - (oni-org-next-heading-position)))) - -(defun oni-org-delete-frame-once () - "Run `delete-frame'. - -After running it once remove it from `org-capture-after-finalize-hook'." - (delete-frame) - (remove-hook 'org-capture-after-finalize-hook 'oni-org-delete-frame-once)) - -(defun oni-org-run-capture-in-dedicated-frame () - "Run `org-capture' in a dedicated frame." - (with-selected-frame (make-frame '((minibuffer))) - (org-capture nil "t") - (delete-other-windows) - (setf (frame-width) 80) - (setf (frame-height) 24) - (add-hook 'org-capture-after-finalize-hook 'oni-org-delete-frame-once))) - -(defun oni-org-maybe-change-todo-state (current-state) - "Change the state of the current task to in-progress CURRENT-STATE is todo." - (if (string= current-state "TODO") - "IN-PROGRESS" - current-state)) - -;;;###autoload -(defun oni-org-open-index () - "Open the index of my org-based personal wiki." - (interactive) - (find-file (oni-org-expand-to-home "documents/gtd/index.org"))) - -;;;###autoload(autoload 'oni-hydra-org/body "oni-org") -(defhydra oni-hydra-org (:color blue) - "Org" - ("l" org-store-link "Store link") - ("a" org-agenda "Agenda") - ("c" org-capture "Capture") - ("b" org-switchb "Switch to org buffer")) - -(setq org-default-notes-file - (oni-org-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-skip-tasks) -(setq org-clock-in-switch-to-state #'oni-org-maybe-change-todo-state) - -(setq org-agenda-custom-commands - '(("c" "Today's (Current) tasks" tags "SCHEDULED=\"\""))) - -(setq org-agenda-files - (mapcar #'oni-org-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-expand-to-home (car pair)) - (cdr pair))) - '(("documents/gtd/todo.org" :maxlevel . 1) - ("documents/gtd/projects.org" :level . 2) - ("documents/gtd/someday.org" :maxlevel . 1) - ("documents/gtd/appointments.org" :maxlevel . 1) - ("documents/gtd/music.org" :maxlevel . 1) - ("documents/gtd/books.org" :maxlevel . 1)))) - -(setq org-capture-templates - `(("t" "Note" entry - (file ,(oni-org-expand-to-home "documents/gtd/inbox.org")) - "* TODO %i%?\n :PROPERTIES:\n :CREATED: %U\n :END:") - ("a" "Appointment" entry - (file+headline ,(oni-org-expand-to-home "documents/gtd/appointments.org") - "Appointments") - "* TODO %i%?\n %U") - ("j" "Journal entry" entry - (file+olp+datetree - ,(oni-org-expand-to-home "documents/gtd/journal.org")) - "* %<%H:%M:%S>\n %?"))) - -(setq org-todo-keywords - '((sequence "TODO(t)" "BLOCKED(b@)" "IN-PROGRESS(p)" - "|" "DONE(d!)" "CANCELLED(c@)"))) - -(add-to-list 'org-modules 'org-habit) -(add-to-list 'org-modules 'org-tempo) - -(add-hook 'org-mode-hook 'auto-fill-mode) - -(unless (eq system-type 'windows-nt) - (require 'org-bullets) - (add-hook 'org-mode-hook 'org-bullets-mode) - (add-hook 'org-mode-hook #'oni-org-setup-prettify-symbols-mode)) - -;;;###autoload -(global-set-key (kbd "C-c o") 'oni-hydra-org/body) - -;;;###autoload -(global-set-key (kbd "C-") #'oni-org-open-index) - -;;;###autoload(with-eval-after-load 'org (require 'oni-org)) - -(provide 'oni-org) -;;; oni-org.el ends here diff --git a/oni-org/Cask b/oni-org/Cask new file mode 100644 index 0000000..ea3441e --- /dev/null +++ b/oni-org/Cask @@ -0,0 +1,14 @@ +(source gnu) +(source melpa) + +(package-file "./oni-org.el") + +(depends-on "oni-yasnippet" :git "../" :files ("oni-yasnippet.el")) +(depends-on "org-plus-contrib") +(depends-on "org-bullets") +(depends-on "hydra") +(depends-on "org-wild-notifier") + +(files + "*.el" + ("snippets" "./snippets/*")) diff --git a/oni-org/oni-org.el b/oni-org/oni-org.el new file mode 100644 index 0000000..4ba4506 --- /dev/null +++ b/oni-org/oni-org.el @@ -0,0 +1,214 @@ +;;; oni-org.el --- Org mode configuration -*- lexical-binding: t; -*- + +;; Copyright (C) 2019 Tom Willemse + +;; Author: Tom Willemse +;; Keywords: local +;; Version: 20190827234011 +;; Package-Requires: (oni-yasnippet org-plus-contrib org-bullets hydra org-wild-notifier) + +;; 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 . + +;;; Commentary: + +;; Configuration for `org-mode'. + +;;; Code: + +(require 'hydra) +(require 'org) +(require 'org-capture) +(require 'org-clock) +(require 'org-habit) +(require 'yasnippet) + +(defconst oni-org-root + (file-name-directory + (or load-file-name + (buffer-file-name))) + "The directory where ‘oni-org’ was loaded from.") + +(defconst oni-org-snippets-dir + (expand-file-name "snippets" oni-org-root) + "The directory where ‘oni-org’ stores its snippets.") + +(defun oni-org-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-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-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 :invisible-ok) + (seq-let [level _ keyword] (org-heading-components) + (not (or (< level 3) + (= point (point)) + (member keyword org-done-keywords))))))) + +(defun oni-org-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-next-heading-position () + "Get the position of the next Org heading." + (or (ignore-errors + (org-forward-element) + (point)) + (point-max))) + +(defun oni-org-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-looking-for-tag-p "ex")) + (member "ex" tags)) + (oni-org-heading-has-predecessor-p)) + (oni-org-next-heading-position)))) + +;;;###autoload +(defun oni-org-snippets-initialize () + "Initialize the snippets for ‘oni-org’." + (when (boundp 'yas-snippet-dirs) + (add-to-list 'yas-snippet-dirs oni-org-snippets-dir t)) + (yas-load-directory oni-org-snippets-dir)) + +(defun oni-org-delete-frame-once () + "Run `delete-frame'. + +After running it once remove it from `org-capture-after-finalize-hook'." + (delete-frame) + (remove-hook 'org-capture-after-finalize-hook 'oni-org-delete-frame-once)) + +(defun oni-org-run-capture-in-dedicated-frame () + "Run `org-capture' in a dedicated frame." + (with-selected-frame (make-frame '((minibuffer))) + (org-capture nil "t") + (delete-other-windows) + (setf (frame-width) 80) + (setf (frame-height) 24) + (add-hook 'org-capture-after-finalize-hook 'oni-org-delete-frame-once))) + +(defun oni-org-maybe-change-todo-state (current-state) + "Change the state of the current task to in-progress CURRENT-STATE is todo." + (if (string= current-state "TODO") + "IN-PROGRESS" + current-state)) + +;;;###autoload +(defun oni-org-open-index () + "Open the index of my org-based personal wiki." + (interactive) + (find-file (oni-org-expand-to-home "documents/gtd/index.org"))) + +;;;###autoload(autoload 'oni-hydra-org/body "oni-org") +(defhydra oni-hydra-org (:color blue) + "Org" + ("l" org-store-link "Store link") + ("a" org-agenda "Agenda") + ("c" org-capture "Capture") + ("b" org-switchb "Switch to org buffer")) + +(setq org-default-notes-file + (oni-org-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-skip-tasks) +(setq org-clock-in-switch-to-state #'oni-org-maybe-change-todo-state) + +(setq org-agenda-custom-commands + '(("c" "Today's (Current) tasks" tags "SCHEDULED=\"\""))) + +(setq org-agenda-files + (mapcar #'oni-org-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-expand-to-home (car pair)) + (cdr pair))) + '(("documents/gtd/todo.org" :maxlevel . 1) + ("documents/gtd/projects.org" :level . 2) + ("documents/gtd/someday.org" :maxlevel . 1) + ("documents/gtd/appointments.org" :maxlevel . 1) + ("documents/gtd/music.org" :maxlevel . 1) + ("documents/gtd/books.org" :maxlevel . 1)))) + +(setq org-capture-templates + `(("t" "Note" entry + (file ,(oni-org-expand-to-home "documents/gtd/inbox.org")) + "* TODO %i%?\n :PROPERTIES:\n :CREATED: %U\n :END:") + ("a" "Appointment" entry + (file+headline ,(oni-org-expand-to-home "documents/gtd/appointments.org") + "Appointments") + "* TODO %i%?\n %U") + ("j" "Journal entry" entry + (file+olp+datetree + ,(oni-org-expand-to-home "documents/gtd/journal.org")) + "* %<%H:%M:%S>\n %?"))) + +(setq org-todo-keywords + '((sequence "TODO(t)" "BLOCKED(b@)" "IN-PROGRESS(p)" + "|" "DONE(d!)" "CANCELLED(c@)"))) + +(add-to-list 'org-modules 'org-habit) +(add-to-list 'org-modules 'org-tempo) + +(add-hook 'org-mode-hook 'auto-fill-mode) + +(unless (eq system-type 'windows-nt) + (require 'org-bullets) + (add-hook 'org-mode-hook 'org-bullets-mode) + (add-hook 'org-mode-hook #'oni-org-setup-prettify-symbols-mode)) + +;;;###autoload +(global-set-key (kbd "C-c o") 'oni-hydra-org/body) + +;;;###autoload +(global-set-key (kbd "C-") #'oni-org-open-index) + +;;;###autoload +(with-eval-after-load 'org + (with-eval-after-load 'yasnippet + (oni-org-snippets-initialize))) + +;;;###autoload(with-eval-after-load 'org (require 'oni-org)) + +(provide 'oni-org) +;;; oni-org.el ends here diff --git a/oni-org/snippets/org-mode/.yas-compiled-snippets.el b/oni-org/snippets/org-mode/.yas-compiled-snippets.el new file mode 100644 index 0000000..84e4e69 --- /dev/null +++ b/oni-org/snippets/org-mode/.yas-compiled-snippets.el @@ -0,0 +1,11 @@ +;;; Compiled snippets and support files for `org-mode' +;;; Snippet definitions: +;;; +(yas-define-snippets 'org-mode + '(("snippet" "#+TITLE: ${1:snippet-name}\n#+OPTIONS: toc:nil\n\n* $1\n\n ${2:A short description abount $1}\n\n #+BEGIN_SRC $3 :tangle yes\n$0\n #+END_SRC" "snippet" nil nil nil "/home/chelys/projects/new-dotfiles/emacs/.emacs.d/snippets/org-mode/snippet" nil nil) + ("project" "#+TITLE: ${1:project_name}\n#+LINK: src ${2:http://code.ryuslash.org/cgit.cgi/$3$1/}\n#+LINK: tar_gz $2${4:snapshot/$1-master}.tar.gz\n#+LINK: zip $2$4.zip\n#+STARTUP: showall\n\n#+begin_html\n \n \n#+end_html\n\n#+INCLUDE: \"dlmenu.inc\"\n\n* About\n\n ${5:A short description about $1}\n\n | $0Status | $6 |\n | Language | $7 |\n | License | ${8:GPLv3} |\n\n* Why?\n\n ${9:Why did you even think of writing $1?}\n\n* Features\n\n ${10:$1 does...}\n\n* Dependencies\n\n ${11:$1 needs to have...}\n\n* Download\n\n ${12:To download $1...}\n\n* Install\n\n ${13:To install $1...}\n\n* Usage\n\n ${14:Using $1...}" "project" nil nil nil "/home/chelys/projects/new-dotfiles/emacs/.emacs.d/snippets/org-mode/project" nil nil) + ("*" "${1:*} ${2:TODO} $3\n${1:$(make-string (length text) ?\\ )} :PROPERTIES:\n${1:$(make-string (length text) ?\\ )} :CATEGORY: $4\n${1:$(make-string (length text) ?\\ )} :END:\n${1:$(make-string (length text) ?\\ )} $0" "Heading" nil nil nil "/home/chelys/projects/new-dotfiles/emacs/.emacs.d/snippets/org-mode/heading" nil nil) + ("code" "#+begin_src $1\n $0\n#+end_src" "codeblock" nil nil nil "/home/chelys/projects/new-dotfiles/emacs/.emacs.d/snippets/org-mode/codeblock" nil nil))) + + +;;; Do not edit! File generated at Sun Jun 24 19:24:25 2018 diff --git a/oni-org/snippets/org-mode/codeblock b/oni-org/snippets/org-mode/codeblock new file mode 100644 index 0000000..a200b08 --- /dev/null +++ b/oni-org/snippets/org-mode/codeblock @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: codeblock +# key: code +# -- +#+begin_src $1 + $0 +#+end_src \ No newline at end of file diff --git a/oni-org/snippets/org-mode/heading b/oni-org/snippets/org-mode/heading new file mode 100644 index 0000000..9d5451e --- /dev/null +++ b/oni-org/snippets/org-mode/heading @@ -0,0 +1,9 @@ +# -*- mode: snippet -*- +# name: Heading +# key: * +# -- +${1:*} ${2:TODO} $3 +${1:$(make-string (length text) ?\ )} :PROPERTIES: +${1:$(make-string (length text) ?\ )} :CATEGORY: $4 +${1:$(make-string (length text) ?\ )} :END: +${1:$(make-string (length text) ?\ )} $0 \ No newline at end of file diff --git a/oni-org/snippets/org-mode/project b/oni-org/snippets/org-mode/project new file mode 100644 index 0000000..269d655 --- /dev/null +++ b/oni-org/snippets/org-mode/project @@ -0,0 +1,51 @@ +# -*- mode: snippet -*- +# name: project +# key: project +# -- +#+TITLE: ${1:project_name} +#+LINK: src ${2:http://code.ryuslash.org/cgit.cgi/$3$1/} +#+LINK: tar_gz $2${4:snapshot/$1-master}.tar.gz +#+LINK: zip $2$4.zip +#+STARTUP: showall + +#+begin_html + + +#+end_html + +#+INCLUDE: "dlmenu.inc" + +* About + + ${5:A short description about $1} + + | $0Status | $6 | + | Language | $7 | + | License | ${8:GPLv3} | + +* Why? + + ${9:Why did you even think of writing $1?} + +* Features + + ${10:$1 does...} + +* Dependencies + + ${11:$1 needs to have...} + +* Download + + ${12:To download $1...} + +* Install + + ${13:To install $1...} + +* Usage + + ${14:Using $1...} \ No newline at end of file diff --git a/oni-org/snippets/org-mode/snippet b/oni-org/snippets/org-mode/snippet new file mode 100644 index 0000000..67f15d5 --- /dev/null +++ b/oni-org/snippets/org-mode/snippet @@ -0,0 +1,14 @@ +# -*- mode: snippet -*- +# name: snippet +# key: snippet +# -- +#+TITLE: ${1:snippet-name} +#+OPTIONS: toc:nil + +* $1 + + ${2:A short description abount $1} + + #+BEGIN_SRC $3 :tangle yes +$0 + #+END_SRC \ No newline at end of file -- cgit v1.2.3-54-g00ecf