Restore org module
This commit is contained in:
Henrik Lissner
parent
d050b90c69
commit
fd9390f864
2 changed files with 163 additions and 165 deletions
2
init.el
2
init.el
|
|
@ -79,7 +79,7 @@
|
||||||
module-elisp ;
|
module-elisp ;
|
||||||
module-lua ; one-based indices? one-based indices.
|
module-lua ; one-based indices? one-based indices.
|
||||||
module-lb6 ; LaunchBar 6 development
|
module-lb6 ; LaunchBar 6 development
|
||||||
;; module-org ; for fearless [organized] leader
|
module-org ; for fearless [organized] leader
|
||||||
module-php ; making php less painful to work with
|
module-php ; making php less painful to work with
|
||||||
module-python ; beautiful is better than ugly
|
module-python ; beautiful is better than ugly
|
||||||
module-regex ; /^[^\s](meaning)[^\n]*/
|
module-regex ; /^[^\s](meaning)[^\n]*/
|
||||||
|
|
|
||||||
|
|
@ -20,192 +20,190 @@
|
||||||
(add-hook! org-mode (hl-line-mode -1))
|
(add-hook! org-mode (hl-line-mode -1))
|
||||||
(add-hook! org-mode '(narf|enable-tab-width-2
|
(add-hook! org-mode '(narf|enable-tab-width-2
|
||||||
narf|enable-hard-wrap
|
narf|enable-hard-wrap
|
||||||
iimage-mode
|
|
||||||
org-indent-mode
|
org-indent-mode
|
||||||
evil-org-mode))
|
evil-org-mode))
|
||||||
(setq org-directory "~/Dropbox/notes/")
|
(add-hook! org-load 'narf-init-org)
|
||||||
:config
|
|
||||||
(after! org-indent (diminish 'org-indent-mode))
|
|
||||||
(after! iimage (diminish 'iimage-mode))
|
|
||||||
|
|
||||||
(defun narf--org-all-files ()
|
(defun narf--org-all-files (path)
|
||||||
(f-entries org-directory
|
(and (f-ext? path "org") (not (f-same? path (f-expand "inbox.org" org-directory)))))
|
||||||
(lambda (path)
|
|
||||||
(and (f-ext? path "org")
|
|
||||||
(not (f-same? path (f-expand "inbox.org" org-directory)))))
|
|
||||||
t))
|
|
||||||
|
|
||||||
(setq org-project-directory (! (concat org-directory "projects")) ; not an org var
|
(defun narf-init-org ()
|
||||||
org-default-notes-file (! (concat org-directory "notes.org"))
|
(after! org-indent (diminish 'org-indent-mode))
|
||||||
org-agenda-files (narf--org-all-files)
|
(after! iimage (diminish 'iimage-mode))
|
||||||
org-archive-location (! (concat org-directory "/archive/%s::"))
|
|
||||||
org-confirm-babel-evaluate nil
|
|
||||||
org-src-tab-acts-natively 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
|
|
||||||
org-hierarchical-todo-statistics t
|
|
||||||
org-checkbox-hierarchical-statistics t
|
|
||||||
org-tags-column -87
|
|
||||||
org-log-done t
|
|
||||||
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-directory "~/Dropbox/notes/")
|
||||||
org-blank-before-new-entry '((heading . auto) (plain-list-item . auto))
|
(setq org-project-directory (! (concat org-directory "projects")) ; not an org var
|
||||||
org-export-backends '(ascii html latex md opml))
|
org-default-notes-file (! (concat org-directory "notes.org"))
|
||||||
|
org-agenda-files (f-entries org-directory 'narf--org-all-files t)
|
||||||
|
org-archive-location (! (concat org-directory "/archive/%s::"))
|
||||||
|
org-confirm-babel-evaluate nil
|
||||||
|
org-src-tab-acts-natively 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
|
||||||
|
org-hierarchical-todo-statistics t
|
||||||
|
org-checkbox-hierarchical-statistics t
|
||||||
|
org-tags-column -87
|
||||||
|
org-log-done t
|
||||||
|
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))
|
||||||
|
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))
|
(add-to-list 'org-link-frame-setup '(file . find-file))
|
||||||
|
|
||||||
(setq org-tag-alist '(("@home" . ?h)
|
(setq org-tag-alist '(("@home" . ?h)
|
||||||
("@daily" . ?d)
|
("@daily" . ?d)
|
||||||
("@invoices" . ?i)
|
("@invoices" . ?i)
|
||||||
("@personal" . ?p)
|
("@personal" . ?p)
|
||||||
("@learning" . ?l)
|
("@learning" . ?l)
|
||||||
("@dev" . ?v)
|
("@dev" . ?v)
|
||||||
("@writing" . ?w)
|
("@writing" . ?w)
|
||||||
("@projects" . ?r)))
|
("@projects" . ?r)))
|
||||||
|
|
||||||
(setq org-capture-templates
|
(setq org-capture-templates
|
||||||
'(("t" "TODO" entry (file+headline "~/Dropbox/notes/todo.org" "Inbox") "* TODO %? %u\n%i")
|
'(("t" "TODO" entry (file+headline "~/Dropbox/notes/todo.org" "Inbox") "* TODO %? %u\n%i")
|
||||||
("T" "Project TODO" entry (file+headline (narf/project-org-filename) "Tasks") "** TODO %?\n%i" :prepend t)
|
("T" "Project TODO" entry (file+headline (narf/project-org-filename) "Tasks") "** TODO %?\n%i" :prepend t)
|
||||||
("N" "Project Note" entry (file+headline (narf/project-org-filename) "Notes") "** %u %?\n%i")
|
("N" "Project Note" entry (file+headline (narf/project-org-filename) "Notes") "** %u %?\n%i")
|
||||||
("c" "Changelog" entry (file+datetree (narf/project-org-filename)) "** %<%H:%M>: %? :unsorted:\n%i" :prepend t)
|
("c" "Changelog" entry (file+datetree (narf/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)
|
("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")
|
("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)
|
("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)
|
("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)
|
("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)))
|
("e" "Excerpt" entry (file "~/Dropbox/notes/excerpts.org") "* %u %?\n%i" :prepend t)))
|
||||||
|
|
||||||
(setq iimage-mode-image-regex-alist
|
(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)
|
'(("\\(`?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)))
|
("<\\(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
|
(org-babel-do-load-languages 'org-babel-load-languages
|
||||||
'((python . t)
|
'((python . t)
|
||||||
(ruby . t)
|
(ruby . t)
|
||||||
(sh . t)
|
(sh . t)
|
||||||
(emacs-lisp . t)
|
(emacs-lisp . t)
|
||||||
(matlab . t)
|
(matlab . t)
|
||||||
(latex . t)))
|
(latex . t)))
|
||||||
|
|
||||||
(advice-add 'evil-force-normal-state :before 'org-remove-occur-highlights)
|
(advice-add 'evil-force-normal-state :before 'org-remove-occur-highlights)
|
||||||
(advice-add 'org-cycle-hide-drawers :override 'narf/org-cycle-hide-drawers)
|
;; (advice-add 'org-cycle-hide-drawers :override 'narf/org-cycle-hide-drawers)
|
||||||
|
|
||||||
(use-package org-agenda
|
(use-package org-agenda
|
||||||
:config
|
:config
|
||||||
(setq org-agenda-restore-windows-after-quit t
|
(setq org-agenda-restore-windows-after-quit t
|
||||||
org-agenda-custom-commands
|
org-agenda-custom-commands
|
||||||
'(("x" agenda)
|
'(("x" agenda)
|
||||||
("y" agenda*)
|
("y" agenda*)
|
||||||
("w" todo "WAITING")
|
("w" todo "WAITING")
|
||||||
("W" todo-tree "WAITING")
|
("W" todo-tree "WAITING")
|
||||||
("to" todo)
|
("to" todo)
|
||||||
("tp" tags "+Projects")
|
("tp" tags "+Projects")
|
||||||
("tg" tags-todo "+gamedev")
|
("tg" tags-todo "+gamedev")
|
||||||
("tw" tags-tree "+webdev"))))
|
("tw" tags-tree "+webdev"))))
|
||||||
|
|
||||||
(bind! (:map org-mode-map
|
(bind! (:map org-mode-map
|
||||||
"RET" nil
|
"RET" nil
|
||||||
"C-j" nil
|
"C-j" nil
|
||||||
"C-k" nil
|
"C-k" nil
|
||||||
|
|
||||||
:i [remap narf/inflate-space-maybe] 'self-insert-command)
|
:i [remap narf/inflate-space-maybe] 'org-self-insert-command
|
||||||
|
:i "RET" 'org-return-indent)
|
||||||
|
|
||||||
(:map evil-org-mode-map
|
(:map evil-org-mode-map
|
||||||
:ni "A-l" 'org-metaright ; M-j
|
:ni "A-l" 'org-metaright ; M-j
|
||||||
:ni "A-h" 'org-metaleft ; M-h
|
:ni "A-h" 'org-metaleft ; M-h
|
||||||
:ni "A-k" 'org-metaup ; M-k
|
:ni "A-k" 'org-metaup ; M-k
|
||||||
:ni "A-j" 'org-metadown ; M-j
|
:ni "A-j" 'org-metadown ; M-j
|
||||||
:ni "A-l" 'org-shiftmetaright ; M-L
|
:ni "A-l" 'org-shiftmetaright ; M-L
|
||||||
:ni "A-h" 'org-shiftmetaleft ; M-H
|
:ni "A-h" 'org-shiftmetaleft ; M-H
|
||||||
:ni "A-k" 'org-shiftmetaup ; M-K
|
:ni "A-k" 'org-shiftmetaup ; M-K
|
||||||
:ni "A-j" 'org-shiftmetadown ; M-J
|
:ni "A-j" 'org-shiftmetadown ; M-J
|
||||||
|
|
||||||
:ni "<M-left>" 'org-beginning-of-line
|
:ni "<M-left>" 'org-beginning-of-line
|
||||||
:ni "<M-right>" 'org-end-of-line
|
:ni "<M-right>" 'org-end-of-line
|
||||||
:ni "<M-up>" 'org-up-element
|
:ni "<M-up>" 'org-up-element
|
||||||
:ni "<M-down>" 'org-down-element
|
:ni "<M-down>" 'org-down-element
|
||||||
|
|
||||||
:n ", ;" 'helm-org-in-buffer-headings
|
:n ",;" 'helm-org-in-buffer-headings
|
||||||
:n ", l" 'org-insert-link
|
:n ",l" 'org-insert-link
|
||||||
:ni "M-a" 'mark-whole-buffer
|
:ni "M-a" 'mark-whole-buffer
|
||||||
|
|
||||||
:i "C-e" 'org-end-of-line
|
:i "C-e" 'org-end-of-line
|
||||||
:i "C-a" 'org-beginning-of-line
|
:i "C-a" 'org-beginning-of-line
|
||||||
:i ;; Add new header line before this line
|
:i ;; Add new header line before this line
|
||||||
:i "<S-M-return>" 'narf/org-insert-item-before
|
:i "<S-M-return>" 'narf/org-insert-item-before
|
||||||
:i ;; Add new header line after this line
|
:i ;; Add new header line after this line
|
||||||
:i "<M-return>" 'narf/org-insert-item-after
|
:i "<M-return>" 'narf/org-insert-item-after
|
||||||
|
|
||||||
:i "M-b" (λ (narf/org-surround "*")) ; bold
|
:i "M-b" (λ (narf/org-surround "*")) ; bold
|
||||||
:i "M-u" (λ (narf/org-surround "_")) ; underline
|
:i "M-u" (λ (narf/org-surround "_")) ; underline
|
||||||
:i "M-i" (λ (narf/org-surround "/")) ; italics
|
:i "M-i" (λ (narf/org-surround "/")) ; italics
|
||||||
:i "M-`" (λ (narf/org-surround "+")) ; strikethrough
|
:i "M-`" (λ (narf/org-surround "+")) ; strikethrough
|
||||||
|
|
||||||
:v "M-b" "S*"
|
:v "M-b" "S*"
|
||||||
:v "M-u" "S_"
|
:v "M-u" "S_"
|
||||||
:v "M-i" "S/"
|
:v "M-i" "S/"
|
||||||
:v "M-`" "S+"
|
:v "M-`" "S+"
|
||||||
|
|
||||||
:n ",=" 'org-align-all-tags
|
(:prefix ","
|
||||||
:n ",/" 'org-sparse-tree
|
:n "=" 'org-align-all-tags
|
||||||
:n ",?" 'org-tags-view
|
:n "/" 'org-sparse-tree
|
||||||
:n ",a" 'org-attach
|
:n "?" 'org-tags-view
|
||||||
:n ",D" 'org-time-stamp-inactive
|
:n "a" 'org-attach
|
||||||
:n ",T" 'org-show-todo-tree
|
:n "D" 'org-time-stamp-inactive
|
||||||
:n ",d" 'org-time-stamp
|
:n "T" 'org-show-todo-tree
|
||||||
:n ",r" 'org-refile
|
:n "d" 'org-time-stamp
|
||||||
:n ",s" 'org-schedule
|
:n "r" 'org-refile
|
||||||
:n ",t" 'org-todo
|
:n "s" 'org-schedule
|
||||||
:n "gr" 'org-babel-execute-src-block-maybe
|
:n "t" 'org-todo
|
||||||
:m "gh" 'outline-up-heading
|
:n "SPC" 'narf/org-toggle-checkbox
|
||||||
:m "gj" 'org-forward-heading-same-level
|
:n "<return>" 'org-archive-subtree)
|
||||||
:m "gk" 'org-backward-heading-same-level
|
:n "gr" 'org-babel-execute-src-block-maybe
|
||||||
:m "gl" 'outline-next-visible-heading
|
:m "gh" 'outline-up-heading
|
||||||
:n "go" 'org-open-at-point
|
:m "gj" 'org-forward-heading-same-level
|
||||||
:n "gO" 'org-attach-open
|
:m "gk" 'org-backward-heading-same-level
|
||||||
:n "gC-o" 'org-attach-reveal
|
:m "gl" 'outline-next-visible-heading
|
||||||
:n "gI" (λ (if (> (length org-inline-image-overlays) 0)
|
:n "go" 'org-open-at-point
|
||||||
(org-remove-inline-images)
|
:n "gO" 'org-attach-open
|
||||||
(org-display-inline-images nil t (line-beginning-position) (line-end-position))))
|
:n "gC-o" 'org-attach-reveal
|
||||||
:n "gQ" 'org-fill-paragraph
|
:n "gI" (λ (if (> (length org-inline-image-overlays) 0)
|
||||||
:n "ga" 'org-attach
|
(org-remove-inline-images)
|
||||||
:n "gA" 'org-agenda
|
(org-display-inline-images nil t (line-beginning-position) (line-end-position))))
|
||||||
:n "gt" 'org-show-todo-tree
|
:n "gQ" 'org-fill-paragraph
|
||||||
:m "]l" 'org-next-link
|
:n "ga" 'org-attach
|
||||||
:m "[l" 'org-previous-link
|
:n "gA" 'org-agenda
|
||||||
:m "$" 'org-end-of-line
|
:n "gt" 'org-show-todo-tree
|
||||||
:m "^" 'org-beginning-of-line
|
:m "]l" 'org-next-link
|
||||||
:n "<" 'org-metaleft
|
:m "[l" 'org-previous-link
|
||||||
:n ">" 'org-metaright
|
:m "$" 'org-end-of-line
|
||||||
:n "-" 'org-cycle-list-bullet
|
:m "^" 'org-beginning-of-line
|
||||||
:n ",SPC" 'narf/org-toggle-checkbox
|
:n "<" 'org-metaleft
|
||||||
:n ",<return>" 'org-archive-subtree
|
:n ">" 'org-metaright
|
||||||
:n "<S-M-return>" 'narf/org-insert-item-before
|
:n "-" 'org-cycle-list-bullet
|
||||||
:n "<M-return>" 'narf/org-insert-item-after
|
:n "<S-M-return>" 'narf/org-insert-item-before
|
||||||
:n "RET" (λ (cond ((org-at-item-checkbox-p)
|
:n "<M-return>" 'narf/org-insert-item-after
|
||||||
(org-toggle-checkbox))
|
:n "RET" (λ (cond ((org-at-item-checkbox-p)
|
||||||
((org-entry-is-todo-p)
|
(org-toggle-checkbox))
|
||||||
(org-todo 'done))))
|
((org-entry-is-todo-p)
|
||||||
:n [tab] 'org-cycle)
|
(org-todo 'done))))
|
||||||
|
:n [tab] 'org-cycle)
|
||||||
|
|
||||||
(:after org-agenda
|
(:after org-agenda
|
||||||
(:map org-agenda-mode-map
|
(:map org-agenda-mode-map
|
||||||
:e "<escape>" 'org-agenda-Quit
|
:e "<escape>" 'org-agenda-Quit
|
||||||
:e "C-j" 'org-agenda-next-item
|
:e "C-j" 'org-agenda-next-item
|
||||||
:e "C-k" 'org-agenda-previous-item
|
:e "C-k" 'org-agenda-previous-item
|
||||||
:e "C-n" 'org-agenda-next-item
|
:e "C-n" 'org-agenda-next-item
|
||||||
:e "C-p" 'org-agenda-previous-item))))
|
:e "C-p" 'org-agenda-previous-item)))))
|
||||||
|
|
||||||
(provide 'module-org)
|
(provide 'module-org)
|
||||||
;;; module-org.el ends here
|
;;; module-org.el ends here
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue