Yet another massive update

init/init-org.el

@@ -1,30 +1,33 @@
 (use-package org
+  :commands (org-capture
+             org-capture-string
+             my:org-capture)
   :mode (("\\.org$" . org-mode)
          ("\\.opml$" . org-mode))
   :init
   (progn
     (add-hook 'org-mode-hook 'enable-tab-width-2)
-    (add-hook 'org-mode-hook 'evil-org-mode)
     (add-hook 'org-mode-hook 'turn-on-auto-fill)
     (add-hook 'org-mode-hook 'iimage-mode)
+    (add-hook 'org-mode-hook 'org-indent-mode)
+    (add-hook 'org-mode-hook 'evil-org-mode)
+    (add-hook! 'org-mode-hook (hl-line-mode -1)))
+  :config
+  (progn
+    (after "org-indent" (diminish 'org-indent-mode))
+    (after "iimage"     (diminish 'iimage-mode))
 
-    ;; Reset evil to ensure evil-org-mode's maps work
-    (add-hook! 'org-mode-hook (evil-mode nil) (evil-mode 1))
-
-    (setq org-directory "~/Dropbox/notes"
-          org-default-notes-file "~/Dropbox/notes/notes.org"
-          org-agenda-files '("~/Dropbox/notes"
-                             "~/Dropbox/notes/projects"
-                             "~/Dropbox/notes/projects/dev"
-                             "~/Dropbox/notes/projects/gamedev"
-                             "~/Dropbox/notes/projects/webdev")
-          org-archive-location "~/Dropbox/notes/archive/%s::"
+    (setq org-directory "~/Dropbox/notes")
+    (setq org-project-directory (expand-file-name "projects" org-directory)    ; custom variable
+          org-default-notes-file (expand-file-name "notes.org" org-directory)
+          org-agenda-files (append (list org-directory)
+                                   (f-entries org-project-directory (lambda (path) (f-ext? path "org")) t))
+          org-archive-location (concat org-directory "/archive/%s::")
           org-confirm-babel-evaluate nil
           org-src-tab-acts-natively t
-          org-image-actual-width 300
-          org-startup-with-inline-images t)
-
-    (setq org-completion-use-ido t
+          org-image-actual-width 250
+          org-startup-with-inline-images t
+          org-completion-use-ido t
           org-hidden-keywords '(title)
           org-special-ctrl-a/e t
           org-hide-leading-stars t
@@ -32,14 +35,19 @@
           org-checkbox-hierarchical-statistics t
           org-tags-column -87
           org-log-done t
-          org-todo-keywords
-          '((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d)")
-            (sequence "DOING(s)" "PENDING(p)")
-            (sequence "|" "CANCELLED(c)")))
+          org-confirm-elisp-link-function nil
+          org-startup-folded 'content
+          org-todo-keywords '((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d)")
+                              (sequence "DOING(s)" "PENDING(p)")
+                              (sequence "|" "CANCELLED(c)"))
+          org-mobile-directory "~/Dropbox/Apps/MobileOrg"
+          org-mobile-inbox-for-pull (expand-file-name "mobile.org" org-directory))
 
-    (setq org-src-fontify-natively t)
-    (setq org-blank-before-new-entry '((heading . auto) (plain-list-item . auto)))
-    (setq org-export-backends '(ascii html latex md opml))
+    (setq org-src-fontify-natively t
+          org-blank-before-new-entry '((heading . auto) (plain-list-item . auto))
+          org-export-backends '(ascii html latex md opml))
+
+    (add-to-list 'org-link-frame-setup '(file . find-file))
 
     (setq org-tag-alist '(("@home" . ?h)
                           ("@daily" . ?d)
@@ -50,35 +58,26 @@
                           ("@writing" . ?w)
                           ("@projects" . ?r)))
 
+    (defun project-org-filename (cat)
+      (interactive (list (completing-read "Choose category:"
+                                          (mapcar 'f-filename (f-directories org-project-directory)))))
+      (expand-file-name (concat (f-filename (project-root)) ".org")
+                        (expand-file-name cat org-project-directory)))
     (setq org-capture-templates
           '(("t" "TODO" entry (file+headline "~/Dropbox/notes/todo.org" "Inbox") "* TODO %? %u\n%i")
-            ("T" "Project TODO" entry (file+headline (concat (projectile-project-root) "/TODO.org") "Unsorted") "** %u %?\n%i" :prepend t)
-            ("c" "Changelog" entry (file+headline (concat (projectile-project-root) "/CHANGELOG.org") "Unsorted") "** %u %? :unsorted:\n%i" :prepend t)
-            ("n" "Note" entry (file+headline org-default-notes-file "Unfiled") "** %T %?\n%i" :prepend t)
+            ("T" "Project TODO" entry (file+headline (project-org-filename) "Tasks") "** TODO %?\n%i" :prepend t)
+            ("N" "Project Note" entry (file+headline (project-org-filename) "Notes") "** %u %?\n%i")
+            ("c" "Changelog" entry (file+datetree (project-org-filename)) "** %<%H:%M>: %? :unsorted:\n%i" :prepend t)
+            ("n" "Note" entry (file+datetree org-default-notes-file) "** %<%H:%M>: %?\n%i" :prepend t)
             ("j" "Journal" entry (file+datetree "~/Dropbox/notes/journal.org") "** %?%^g\nAdded: %U\n%i")
             ("a" "Trivia" entry (file "~/Dropbox/notes/trivia.org") "* %u %?\n%i" :prepend t)
             ("s" "Writing Scraps" entry (file "~/Dropbox/notes/writing.org") "* %u %?\n%i" :prepend t)
             ("v" "Vocab" entry (file "~/Dropbox/notes/vocab.org") "* %?\n%i" :prepend t)
             ("e" "Excerpt" entry (file "~/Dropbox/notes/excerpts.org") "* %u %?\n%i" :prepend t)))
 
-    (setq org-agenda-custom-commands
-          '(("x" agenda)
-            ("y" agenda*)
-            ("w" todo "WAITING")
-            ("W" todo-tree "WAITING")
-            ("to" todo)
-            ("tp" tags "+Projects")
-            ("tg" tags-todo "+gamedev")
-            ("tw" tags-tree "+webdev"))))
-  :config
-  (progn
-    (message "Org-mode loaded")
-
     (setq iimage-mode-image-regex-alist
-                  '(("\\(`?file://\\|\\[\\[\\|<\\|`\\)?\\([-+./_0-9a-zA-Z]+\\.\\(GIF\\|JP\\(?:E?G\\)\\|P\\(?:BM\\|GM\\|N[GM]\\|PM\\)\\|SVG\\|TIFF?\\|X\\(?:[BP]M\\)\\|gif\\|jp\\(?:e?g\\)\\|p\\(?:bm\\|gm\\|n[gm]\\|pm\\)\\|svg\\|tiff?\\|x\\(?:[bp]m\\)\\)\\)\\(\\]\\]\\|>\\|'\\)?" . 2)
-                    ("<\\(http://.+\\.\\(GIF\\|JP\\(?:E?G\\)\\|P\\(?:BM\\|GM\\|N[GM]\\|PM\\)\\|SVG\\|TIFF?\\|X\\(?:[BP]M\\)\\|gif\\|jp\\(?:e?g\\)\\|p\\(?:bm\\|gm\\|n[gm]\\|pm\\)\\|svg\\|tiff?\\|x\\(?:[bp]m\\)\\)\\)>" . 1)))
-
-    (push '("\\*Org.+\\*" :regexp t :width 0.3 :position bottom) popwin:special-display-config)
+          '(("\\(`?file://\\|\\[\\[\\|<\\|`\\)?\\([-+./_0-9a-zA-Z]+\\.\\(GIF\\|JP\\(?:E?G\\)\\|P\\(?:BM\\|GM\\|N[GM]\\|PM\\)\\|SVG\\|TIFF?\\|X\\(?:[BP]M\\)\\|gif\\|jp\\(?:e?g\\)\\|p\\(?:bm\\|gm\\|n[gm]\\|pm\\)\\|svg\\|tiff?\\|x\\(?:[bp]m\\)\\)\\)\\(\\]\\]\\|>\\|'\\)?" . 2)
+            ("<\\(http://.+\\.\\(GIF\\|JP\\(?:E?G\\)\\|P\\(?:BM\\|GM\\|N[GM]\\|PM\\)\\|SVG\\|TIFF?\\|X\\(?:[BP]M\\)\\|gif\\|jp\\(?:e?g\\)\\|p\\(?:bm\\|gm\\|n[gm]\\|pm\\)\\|svg\\|tiff?\\|x\\(?:[bp]m\\)\\)\\)>" . 1)))
 
     (org-babel-do-load-languages 'org-babel-load-languages
                                  '((python . t)
@@ -92,54 +91,31 @@
     (defadvice evil-force-normal-state (before evil-esc-org-remove-highlights activate)
       (org-remove-occur-highlights))
 
-    ;; Auto update cookies
-    (defun my--org-mode-update-cookies ()
-      (when (eq major-mode 'org-mode) (org-update-parent-todo-statistics) (org-update-statistics-cookies nil)))
-    (add-hook 'evil-normal-state-entry-hook 'my--org-mode-update-cookies)
-
     (define-minor-mode evil-org-mode
       :init-value nil
-      :lighter " EvilOrg"
+      :lighter " !"
       :keymap (make-sparse-keymap) ; defines evil-org-mode-map
       :group 'evil-org)
 
-    ;; (use-package org-present
-    ;;   :config
-    ;;   (progn
-    ;;     (defun my--org-present-mode-on ()
-    ;;       (org-present-big)
-    ;;       (org-display-inline-images)
-    ;;       (org-present-hide-cursor)
-    ;;       (org-present-read-only))
+    ;; (progn ; opml support
+    ;;   (defun set-buffer-file-format-to-opml ()
+    ;;     (when (string-match "\.opml$" (buffer-file-name))
+    ;;       (setq buffer-file-format '(opml))))
 
-    ;;     (defun my--org-present-mode-off ()
-    ;;       (org-present-small)
-    ;;       (org-remove-inline-images)
-    ;;       (org-present-show-cursor)
-    ;;       (org-present-read-write))
+    ;;   (defun my--opml-encode (begin end buffer)
+    ;;     "Export Org mode buffer to OPML."
+    ;;     (let ((org-export-show-temporary-export-buffer nil)
+    ;;           (name "*OPML Export Buffer*"))
+    ;;       (org-export-to-buffer 'opml name)
+    ;;       (erase-buffer)
+    ;;       (insert-buffer-substring (get-buffer name))
+    ;;       (point-max)))
 
-    ;;     (add-hook 'org-present-mode-hook 'my--org-present-mode-on)
-    ;;     (add-hook 'org-present-mode-quit-hook 'my--org-present-mode-off)))
-
-    (progn ; opml support
-      (defun set-buffer-file-format-to-opml ()
-        (when (string-match "\.opml$" (buffer-file-name))
-          (setq buffer-file-format '(opml))))
-
-      (defun my--opml-encode (begin end buffer)
-        "Export Org mode buffer to OPML."
-        (let ((org-export-show-temporary-export-buffer nil)
-              (name "*OPML Export Buffer*"))
-          (org-export-to-buffer 'opml name)
-          (erase-buffer)
-          (insert-buffer-substring (get-buffer name))
-          (point-max)))
-
-      (add-hook 'find-file-hooks 'set-buffer-file-format-to-opml)
-      (add-to-list 'format-alist '(opml "Outline Processor Markup Language"
-                                        "<[?]xml version=\"1.0\"[^>]*[?]>[\n]?.*[\n]?.*[\n]?<opml version=\"[1|2].0\">"
-                                        "~/.emacs.d/elisp/org-opml/opml2org.py" my--opml-encode t))
-      (shut-up (load-library "ox-opml")))
+    ;;   (add-hook 'find-file-hooks 'set-buffer-file-format-to-opml)
+    ;;   (add-to-list 'format-alist '(opml "Outline Processor Markup Language"
+    ;;                                     "<[?]xml version=\"1.0\"[^>]*[?]>[\n]?.*[\n]?.*[\n]?<opml version=\"[1|2].0\">"
+    ;;                                     "~/.emacs.d/elisp/org-opml/opml2org.py" my--opml-encode t))
+    ;;   (shut-up (load-library "ox-opml")))
 
     (progn ; key bindings
       (defun my--org-in-list-p ()
@@ -185,6 +161,42 @@
                 (t (org-insert-heading)))
           (insert "[ ] ")))
 
+      ;; Hide properties PERMANENTLY
+      (defun org-cycle-hide-drawers (state)
+        "Re-hide all drawers after a visibility state change."
+        (when (and (derived-mode-p 'org-mode)
+                   (not (memq state '(overview folded contents))))
+          (save-excursion
+            (let* ((globalp (memq state '(contents all)))
+                   (beg (if globalp (point-min) (point)))
+                   (end (if globalp (point-max)
+                          (if (eq state 'children)
+                              (save-excursion (outline-next-heading) (point))
+                            (org-end-of-subtree t)))))
+              (goto-char beg)
+              (while (re-search-forward org-drawer-regexp end t)
+                (save-excursion
+                  (beginning-of-line 1)
+                  (backward-char 1)
+                  (let ((b (point)))
+                    (if (re-search-forward
+                         "^[ \t]*:END:"
+                         (save-excursion (outline-next-heading) (point)) t)
+                        (outline-flag-region b (point-at-eol) t)
+                      (user-error ":END: line missing at position %s" b)))))))))
+
+      (use-package org-agenda
+        :config
+        (setq org-agenda-restore-windows-after-quit t
+              org-agenda-custom-commands '(("x" agenda)
+                                           ("y" agenda*)
+                                           ("w" todo "WAITING")
+                                           ("W" todo-tree "WAITING")
+                                           ("to" todo)
+                                           ("tp" tags "+Projects")
+                                           ("tg" tags-todo "+gamedev")
+                                           ("tw" tags-tree "+webdev"))))
+
       (bind 'insert org-mode-map [remap my.inflate-space-maybe] 'self-insert-command)
 
       (bind org-mode-map
@@ -193,14 +205,14 @@
             "C-k" nil)
 
       (bind '(normal insert) evil-org-mode-map
-            "¬" 'org-metaright       ; M-j
-            "˙" 'org-metaleft        ; M-h
-            "˚" 'org-metaup          ; M-k
-            "Δ" 'org-metadown        ; M-j
-            "Ò" 'org-shiftmetaright  ; M-L
-            "Ó" 'org-shiftmetaleft   ; M-H
-            "" 'org-shiftmetaup     ; M-K
-            "Ô" 'org-shiftmetadown)  ; M-J
+            "A-l" 'org-metaright       ; M-j
+            "A-h" 'org-metaleft        ; M-h
+            "A-k" 'org-metaup          ; M-k
+            "A-j" 'org-metadown        ; M-j
+            "A-l" 'org-shiftmetaright  ; M-L
+            "A-h" 'org-shiftmetaleft   ; M-H
+            "A-k" 'org-shiftmetaup     ; M-K
+            "A-j" 'org-shiftmetadown)  ; M-J
 
       (bind 'insert evil-org-mode-map
             "C-e"           'org-end-of-line
@@ -215,65 +227,90 @@
       (defun my/org-surround (delim)
         (insert delim) (save-excursion (insert delim)))
 
-      (bind 'insert evil-org-mode-map
+      (bind evil-org-mode-map
+            "M-a" 'mark-whole-buffer
+
+            'insert
             ;; Add new header line before this line
-            (kbd "<S-M-return>") 'my--org-insert-item-before
+            "<S-M-return>" 'my--org-insert-item-before
             ;; Add new header line after this line
-            (kbd "<M-return>") 'my--org-insert-item-after
+            "<M-return>"   'my--org-insert-item-after
 
-            (kbd "M-b") (λ (my/org-surround "*"))     ; bold
-            (kbd "M-u") (λ (my/org-surround "_"))     ; underline
-            (kbd "M-i") (λ (my/org-surround "/"))     ; italics
-            (kbd "M-`") (λ (my/org-surround "+")))    ; strikethrough
-      (bind 'visual evil-org-mode-map
-            (kbd "M-b") "S*"
-            (kbd "M-u") "S_"
-            (kbd "M-i") "S/"
-            (kbd "M-`") "S+")
+            "M-b" (λ (my/org-surround "*"))     ; bold
+            "M-u" (λ (my/org-surround "_"))     ; underline
+            "M-i" (λ (my/org-surround "/"))     ; italics
+            "M-`" (λ (my/org-surround "+"))     ; strikethrough
 
-      (bind '(normal visual) evil-org-mode-map
-            ", l" 'org-insert-link)
+            'visual
+            "M-b" "S*"
+            "M-u" "S_"
+            "M-i" "S/"
+            "M-`" "S+"
 
-      (bind 'normal evil-org-mode-map
-            ", +" 'org-align-all-tags
-            ", /" 'org-sparse-tree
-            ", ?" 'org-tags-view
-            ", a" 'org-attach
-            ", D" 'org-time-stamp-inactive
-            ", T" 'org-show-todo-tree
-            ", d" 'org-time-stamp
-            ", r" 'org-refile
-            ", s" 'org-schedule
-            ", t" 'org-todo
-            "g r" 'org-babel-execute-src-block-maybe
-            "g h" 'outline-up-heading
-            "g j" 'org-forward-heading-same-level
-            "g k" 'org-backward-heading-same-level
-            "g l" 'outline-next-visible-heading
-            "g o"   'org-open-at-point
-            "g O"   'org-attach-open
-            "g C-o" 'org-attach-reveal
-            "g i" (λ (if (> (length org-inline-image-overlays) 0)
+            '(normal visual)
+            ", l" 'org-insert-link
+
+            'normal
+            ",=" 'org-align-all-tags
+            ",/" 'org-sparse-tree
+            ",?" 'org-tags-view
+            ",a" 'org-attach
+            ",D" 'org-time-stamp-inactive
+            ",T" 'org-show-todo-tree
+            ",d" 'org-time-stamp
+            ",r" 'org-refile
+            ",s" 'org-schedule
+            ",t" 'org-todo
+            "gr" 'org-babel-execute-src-block-maybe
+            "gh" 'outline-up-heading
+            "gj" 'org-forward-heading-same-level
+            "gk" 'org-backward-heading-same-level
+            "gl" 'outline-next-visible-heading
+            "go"   'org-open-at-point
+            "gO"   'org-attach-open
+            "gC-o" 'org-attach-reveal
+            "gI" (λ (if (> (length org-inline-image-overlays) 0)
                          (org-remove-inline-images)
                        (org-display-inline-images nil t (line-beginning-position) (line-end-position))))
-            "g Q" 'org-fill-paragraph
-            "g a" 'org-attach
-            "g A" 'org-agenda
-            "g t" 'org-show-todo-tree
+            "gQ" 'org-fill-paragraph
+            "ga" 'org-attach
+            "gA" 'org-agenda
+            "gt" 'org-show-todo-tree
+            "]l" 'org-next-link
+            "[l" 'org-previous-link
             "$" 'org-end-of-line
             "^" 'org-beginning-of-line
             "<" 'org-metaleft
             ">" 'org-metaright
             "-" 'org-cycle-list-bullet
-            ", SPC" 'my--toggle-checkbox
-            ", <return>" 'org-archive-subtree
+            ",SPC" 'my--toggle-checkbox
+            ",<return>" 'org-archive-subtree
             "<S-M-return>" 'my--org-insert-item-before
             "<M-return>" 'my--org-insert-item-after
             "RET" (λ (cond ((org-at-item-checkbox-p)
                             (org-toggle-checkbox))
                            ((org-entry-is-todo-p)
                             (org-todo 'done))))
-            [tab] 'org-cycle))
+            [tab] 'org-cycle)
+
+      (after "org-agenda"
+        (bind 'emacs org-agenda-mode-map
+              "<escape>" 'org-agenda-Quit
+              "C-j" 'org-agenda-next-item
+              "C-k" 'org-agenda-previous-item
+              "C-n" 'org-agenda-next-item
+              "C-p" 'org-agenda-previous-item)))
+
+    (evil-define-operator my:org-capture (&optional beg end)
+      "Send a selection to org-capture."
+      :move-point nil
+      :type inclusive
+      (interactive "<r><!>")
+      (let ((text (when (and (evil-visual-state-p) beg end)
+                    (buffer-substring beg end))))
+        (if text
+            (org-capture-string text)
+          (org-capture))))
 
     (evil-define-command my:org-insert-image-url (&optional image-url)
       :repeat nil