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

lang/org: refactor & reformatting

Browse source
This commit is contained in:
Henrik Lissner 2020-08-05 18:17:13 -04:00
parent 2c0cbec7c8
commit 80e1e8ff9a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

53
modules/lang/org/config.el
View file

@ -74,6 +74,7 @@ Is relative to `org-directory', unless it is absolute. Is used in Doom's default
(unless org-agenda-files (unless org-agenda-files
(setq org-agenda-files (list org-directory))) (setq org-agenda-files (list org-directory)))
(setq-default (setq-default
;; Different colors for different priority levels
org-agenda-deadline-faces org-agenda-deadline-faces
'((1.001 . error) '((1.001 . error)
(1.0 . org-warning) (1.0 . org-warning)
@ -82,9 +83,8 @@ Is relative to `org-directory', unless it is absolute. Is used in Doom's default
;; Don't monopolize the whole frame just for the agenda ;; Don't monopolize the whole frame just for the agenda
org-agenda-window-setup 'current-window org-agenda-window-setup 'current-window
org-agenda-skip-unavailable-files t org-agenda-skip-unavailable-files t
;; Move the agenda to show the previous 3 days and the next 7 days for a bit ;; Shift the agenda to show the previous 3 days and the next 7 days for
;; better context instead of just the current week which is a bit confusing ;; better context on your week. The past is less important than the future.
;; on, for example, a sunday
org-agenda-span 10 org-agenda-span 10
org-agenda-start-on-weekday nil org-agenda-start-on-weekday nil
org-agenda-start-day "-3d" org-agenda-start-day "-3d"
@ -372,10 +372,7 @@ relative to `org-directory', unless it is an absolute path."
(propertize (abbreviate-file-name (buffer-file-name (buffer-base-buffer))) (propertize (abbreviate-file-name (buffer-file-name (buffer-base-buffer)))
'face 'font-lock-string-face) 'face 'font-lock-string-face)
org-eldoc-breadcrumb-separator org-eldoc-breadcrumb-separator
header-line-format)))) header-line-format)))))
(when (featurep! :editor evil)
(add-hook 'org-capture-mode-hook #'evil-insert-state)))
(defun +org-init-capture-frame-h () (defun +org-init-capture-frame-h ()
@ -969,6 +966,7 @@ compelling reason, so..."
(use-package! evil-org (use-package! evil-org
:when (featurep! :editor evil +everywhere) :when (featurep! :editor evil +everywhere)
:hook (org-mode . evil-org-mode) :hook (org-mode . evil-org-mode)
:hook (org-capture-mode . evil-insert-state)
:init :init
(defvar evil-org-retain-visual-state-on-shift t) (defvar evil-org-retain-visual-state-on-shift t)
(defvar evil-org-special-o/O '(table-row)) (defvar evil-org-special-o/O '(table-row))
@ -984,26 +982,25 @@ compelling reason, so..."
:ni [C-return] #'+org/insert-item-below :ni [C-return] #'+org/insert-item-below
:ni [C-S-return] #'+org/insert-item-above :ni [C-S-return] #'+org/insert-item-above
;; navigate table cells (from insert-mode) ;; navigate table cells (from insert-mode)
:i "C-l" (general-predicate-dispatch 'org-end-of-line :i "C-l" (cmds! (org-at-table-p) #'org-table-next-field
(org-at-table-p) 'org-table-next-field) #'org-end-of-line)
:i "C-h" (general-predicate-dispatch 'org-beginning-of-line :i "C-h" (cmds! (org-at-table-p) #'org-table-previous-field
(org-at-table-p) 'org-table-previous-field) #'org-beginning-of-line)
:i "C-k" (general-predicate-dispatch 'org-up-element :i "C-k" (cmds! (org-at-table-p) #'+org/table-previous-row
(org-at-table-p) '+org/table-previous-row) #'org-up-element)
:i "C-j" (general-predicate-dispatch 'org-down-element :i "C-j" (cmds! (org-at-table-p) #'org-table-next-row
(org-at-table-p) 'org-table-next-row) #'org-down-element)
;; moving/(de|pro)moting subtress & expanding tables (prepend/append columns/rows) :ni "C-S-l" #'org-shiftright
:ni "C-S-l" #'org-shiftright :ni "C-S-h" #'org-shiftleft
:ni "C-S-h" #'org-shiftleft :ni "C-S-k" #'org-shiftup
:ni "C-S-k" #'org-shiftup :ni "C-S-j" #'org-shiftdown
:ni "C-S-j" #'org-shiftdown
;; more intuitive RET keybinds ;; more intuitive RET keybinds
:i [return] (cmd! (org-return electric-indent-mode)) :n [return] #'+org/dwim-at-point
:i "RET" (cmd! (org-return electric-indent-mode)) :n "RET" #'+org/dwim-at-point
:i [return] (cmd! (org-return electric-indent-mode))
:i "RET" (cmd! (org-return electric-indent-mode))
:i [S-return] #'+org/shift-return :i [S-return] #'+org/shift-return
:i "S-RET" #'+org/shift-return :i "S-RET" #'+org/shift-return
:n [return] #'+org/dwim-at-point
:n "RET" #'+org/dwim-at-point
;; more vim-esque org motion keys (not covered by evil-org-mode) ;; more vim-esque org motion keys (not covered by evil-org-mode)
:m "]h" #'org-forward-heading-same-level :m "]h" #'org-forward-heading-same-level
:m "[h" #'org-backward-heading-same-level :m "[h" #'org-backward-heading-same-level
@ -1057,8 +1054,8 @@ compelling reason, so..."
org-list org-pcomplete org-src org-footnote org-macro ob org org-agenda org-list org-pcomplete org-src org-footnote org-macro ob org org-agenda
org-capture org-capture
:preface :preface
;; Set these to nil now so we can detect user changes to them later (and fall ;; Set to nil so we can detect user changes to them later (and fall back on
;; back on defaults otherwise) ;; defaults otherwise).
(defvar org-directory nil) (defvar org-directory nil)
(defvar org-attach-id-dir nil) (defvar org-attach-id-dir nil)
@ -1067,8 +1064,8 @@ compelling reason, so..."
;; Recognize a), A), a., A., etc -- must be set before org is loaded. ;; Recognize a), A), a., A., etc -- must be set before org is loaded.
org-list-allow-alphabetical t) org-list-allow-alphabetical t)
;; Make most of the default modules opt-in, because I sincerely doubt most ;; Make most of the default modules opt-in to lighten its first-time load
;; users use all of them. ;; delay. I sincerely doubt most users use them all.
(defvar org-modules (defvar org-modules
'(;; ol-w3m '(;; ol-w3m
;; ol-bbdb ;; ol-bbdb