1 files changed, 55 insertions, 22 deletions

@@ -203,6 +203,16 @@ If LIST is non-nil, return the result as a list instead of a string."
         (when (org-at-heading-p) (org-align-tags))))))
 
 
+;;; Misc.
+
+(defun org-clock-in-or-out (prefix)
+  "If clocked in, clock out.  Otherwise, clock in."
+  (interactive "P")
+  (if (org-clocking-p)
+      (org-clock-out prefix)
+    (org-clock-in prefix)))
+
+
 ;;; Faces
 
 (defface org-bold '((t (:weight bold)))
@@ -225,10 +235,12 @@ If LIST is non-nil, return the result as a list instead of a string."
   :custom-face
   (org-level-1 ((t :inherit fixed-pitch
                    :weight bold
-                   :height 1.2)))
+                   :slant italic
+                   :height 1.0)))
   (org-level-2 ((t :inherit fixed-pitch
                    :weight bold
-                   :height 1.1)))
+                   :slant italic
+                   :height 1.0)))
   (org-level-3 ((t :inherit fixed-pitch
                    :weight bold
                    :height 1.0)))
@@ -299,17 +311,20 @@ If LIST is non-nil, return the result as a list instead of a string."
                               (sequence "|" "CANCELED(k@)")
                               (sequence "MEETING(m)"))
           org-use-fast-todo-selection 'auto
-          org-use-speed-commands t)
+          org-use-speed-commands t
+          org-element-use-cache nil)
   ;; Keys
   (keymap-set org-mode-map "C-M-k" #'kill-paragraph)
   (keymap-set org-mode-map "C-M-t" #'transpose-paragraphs)
   (keymap-set org-mode-map "RET" #'+org-return-dwim)
   (keymap-set org-mode-map "S-<return>" #'+org-table-copy-down|+org-return-dwim)
+  (keymap-unset org-mode-map "C-'" t)
+  (keymap-unset org-mode-map "C-," t)
   ;; Hooks
   (add-hook 'org-mode-hook
             (defun org-mode@setup ()
               (when (require 'visual-fill-column nil t)
-                (setq-local visual-fill-column-extra-text-width '(8 . 8))
+                (setq-local visual-fill-column-extra-text-width '(2 . 2))
                 (visual-fill-column-mode))
               (variable-pitch-mode)
               (turn-off-auto-fill)
@@ -325,19 +340,17 @@ If LIST is non-nil, return the result as a list instead of a string."
    'org-mode
    `(;; List markers => org-indent
      (,(concat
-        "^[     ]*\\(\\(?:[-+]\\|\\(?:[0-9]+\\|[A-Za-z]\\)[.)]\\)"
-        "\\(?:[         ]+\\|$\\)\\)"
+        "^[     ]*\\(\\(?:[-+]\\|\\(?:[0-9]+\\|[A-Za-z]\\)[.)]\\)"
+        "\\(?:[         ]+\\|$\\)\\)"
         "\\(?:\\[@\\(?:start:\\)?\\([0-9]+\\|[A-Za-z]\\)\\]"
-        "[      ]*\\)?"
+        "[      ]*\\)?"
         "\\(?:\\(\\[[ X-]\\]\\)"
-        "\\(?:[         ]+\\|$\\)\\)?")
+        "\\(?:[         ]+\\|$\\)\\)?")
       0 'org-indent))))
 
 (use-package org-clock
-  :bind (("M-<f9>" . org-clock-out)
-         :map org-mode-map
-         ("<f8>" . org-clock-in)
-         ("<f9>" . org-clock-out))
+  :bind (:map org-mode-map
+              ("<f8>" . org-clock-in-or-out))
   :config
   (setopt org-clock-clocked-in-display 'mode-line
           global-mode-string
@@ -355,13 +368,11 @@ If LIST is non-nil, return the result as a list instead of a string."
           org-agenda-skip-scheduled-if-done t
           org-agenda-span 10
           org-agenda-block-separator ?─
-          org-agenda-time-grid
-          '((daily today require-timed)
-            (800 1000 1200 1400 1600 1800 2000)
-            " ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄")
-          org-agenda-current-time-string
-          "← now ─────────────────────────────────────────────────"
-          org-agenda-include-diary nil ; I use the org-diary features
+          org-agenda-time-grid '((daily today require-timed)
+                                 (800 1000 1200 1400 1600 1800 2000)
+                                 " ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄")
+          org-agenda-current-time-string "← now ───────────────"
+          org-agenda-include-diary t ; I use the org-diary features
           org-agenda-todo-ignore-deadlines 'near
           org-agenda-todo-ignore-scheduled 'future
           org-agenda-include-deadlines t
@@ -371,7 +382,29 @@ If LIST is non-nil, return the result as a list instead of a string."
           org-agenda-skip-file-regexp "sync-conflict"
           org-agenda-inhibit-startup t
           org-agenda-sticky t
-          org-agenda-follow-indirect t)
+          org-agenda-follow-indirect t
+          org-stuck-projects '("TODO=\"WAIT\""
+                               ("TODO" "NEXT")
+                               nil
+                               "")
+          org-agenda-custom-commands
+          `(("c" "Click Here Digital To-do"
+             ((agenda "" ((org-agenda-overriding-header "Tasks")
+                          (org-agenda-span 'fortnight)
+                          (org-agenda-start-day "+0")
+                          (org-agenda-skip-function
+                           '(org-agenda-skip-subtree-if 'todo
+                                                        '("WAIT" "MCKENZIE" "RACHEL")))))
+              (stuck "" ((org-agenda-overriding-header "Waiting"))))
+             ((org-agenda-files ',(list (progn (require 'chd)
+                                               (chd/ "inbox-chd.org"))))))))
+  ;; Speedup agenda generation
+  ;; https://orgmode.org/manual/Speeding-Up-Your-Agendas.html
+  ;; https://orgmode.org/worg/agenda-optimization.html
+  (setopt org-agenda-dim-blocked-tasks nil
+          org-agenda-inhibit-startup t
+          org-agenda-use-tag-inheritance nil
+          org-agenda-ignore-properties '(effort appt stats category))
   ;; Hooks and advice
   (add-hook 'org-agenda-mode-hook #'truncate-lines-local-mode)
   (add-hook 'org-agenda-mode-hook #'hl-line-mode)
@@ -440,6 +473,7 @@ effect for exporting link types)."
   :custom-face
   (org-modern-label ((t :inherit fixed-pitch
                         :height 1.0)))
+  :hook (org-mode-hook)
   :config
   (setopt org-modern-star nil
           org-modern-list '((43 . "◦")
@@ -449,8 +483,7 @@ effect for exporting link types)."
           org-modern-hide-stars nil
           org-tags-column 0
           org-modern-keyword nil
-          org-modern-table nil)
-  (global-org-modern-mode))
+          org-modern-table nil))
 
 (use-package org-taskwise
   :after org