emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Restore org module

Browse source
This commit is contained in:
Henrik Lissner 2015-07-22 17:35:04 +02:00
parent d050b90c69
commit fd9390f864
2 changed files with 163 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

2
init.el
View file

@ -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]*/

60
modules/module-org.el
View file

@ -20,24 +20,21 @@
(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
(defun narf--org-all-files (path)
(and (f-ext? path "org") (not (f-same? path (f-expand "inbox.org" org-directory)))))
(defun narf-init-org ()
(after! org-indent (diminish 'org-indent-mode)) (after! org-indent (diminish 'org-indent-mode))
(after! iimage (diminish 'iimage-mode)) (after! iimage (diminish 'iimage-mode))
(defun narf--org-all-files () (setq org-directory "~/Dropbox/notes/")
(f-entries 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 (setq org-project-directory (! (concat org-directory "projects")) ; not an org var
org-default-notes-file (! (concat org-directory "notes.org")) org-default-notes-file (! (concat org-directory "notes.org"))
org-agenda-files (narf--org-all-files) org-agenda-files (f-entries org-directory 'narf--org-all-files t)
org-archive-location (! (concat org-directory "/archive/%s::")) org-archive-location (! (concat org-directory "/archive/%s::"))
org-confirm-babel-evaluate nil org-confirm-babel-evaluate nil
org-src-tab-acts-natively t org-src-tab-acts-natively t
@ -57,9 +54,8 @@
(sequence "DOING(s)" "PENDING(p)") (sequence "DOING(s)" "PENDING(p)")
(sequence "|" "CANCELLED(c)")) (sequence "|" "CANCELLED(c)"))
org-mobile-directory "~/Dropbox/Apps/MobileOrg" org-mobile-directory "~/Dropbox/Apps/MobileOrg"
org-mobile-inbox-for-pull (! (expand-file-name "mobile.org" org-directory))) org-mobile-inbox-for-pull (! (expand-file-name "mobile.org" org-directory))
org-src-fontify-natively t
(setq org-src-fontify-natively t
org-blank-before-new-entry '((heading . auto) (plain-list-item . auto)) org-blank-before-new-entry '((heading . auto) (plain-list-item . auto))
org-export-backends '(ascii html latex md opml)) org-export-backends '(ascii html latex md opml))
@ -99,7 +95,7 @@
(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
@ -119,7 +115,8 @@
"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
@ -136,8 +133,8 @@
: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
@ -157,16 +154,19 @@
: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 "t" 'org-todo
:n "SPC" 'narf/org-toggle-checkbox
:n "<return>" 'org-archive-subtree)
:n "gr" 'org-babel-execute-src-block-maybe :n "gr" 'org-babel-execute-src-block-maybe
:m "gh" 'outline-up-heading :m "gh" 'outline-up-heading
:m "gj" 'org-forward-heading-same-level :m "gj" 'org-forward-heading-same-level
@ -189,8 +189,6 @@
:n "<" 'org-metaleft :n "<" 'org-metaleft
:n ">" 'org-metaright :n ">" 'org-metaright
:n "-" 'org-cycle-list-bullet :n "-" 'org-cycle-list-bullet
:n ",SPC" 'narf/org-toggle-checkbox
:n ",<return>" 'org-archive-subtree
:n "<S-M-return>" 'narf/org-insert-item-before :n "<S-M-return>" 'narf/org-insert-item-before
:n "<M-return>" 'narf/org-insert-item-after :n "<M-return>" 'narf/org-insert-item-after
:n "RET" (λ (cond ((org-at-item-checkbox-p) :n "RET" (λ (cond ((org-at-item-checkbox-p)
@ -205,7 +203,7 @@
: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