diff --git a/emacs/.config/doom/+org.el b/emacs/.config/doom/+org.el index 9f25768..9c930c3 100644 --- a/emacs/.config/doom/+org.el +++ b/emacs/.config/doom/+org.el @@ -6,98 +6,95 @@ (setq +todo-file "~/org/inbox.org") (after! org - (setq org-directory (expand-file-name "~/org/") - org-journal-dir "~/org/journal/" - org-agenda-files (list org-directory) - org-pretty-entities t - org-contacts-files '("~/org/contacts.org") - ; attempt to return todo function to spacemacs - evil-org-key-theme '(textobjects navigation additional insert todo) - ;; show actually italicized text instead of /italicized text/ - org-agenda-block-separator "" - org-fontify-whole-heading-line t - org-fontify-done-headline t - org-fontify-quote-and-verse-blocks t - org-bullets-bullet-list '("#") + (setq org-directory (expand-file-name "~/org/") + org-journal-dir "~/org/journal/" + org-agenda-files (list org-directory) + org-pretty-entities t + org-contacts-files '("~/org/contacts.org") + ; attempt to return todo function to spacemacs + evil-org-key-theme '(textobjects navigation additional insert todo) + ;; show actually italicized text instead of /italicized text/ + org-agenda-block-separator "" + org-fontify-whole-heading-line t + org-fontify-done-headline t + org-fontify-quote-and-verse-blocks t + org-bullets-bullet-list '("#") + org-capture-templates + '(("i" "Send to inbox" entry (file+headline "~/org/inbox.org" "Inbox") + "* TODO %?\n") + ("l" "Send to inbox with link" entry (file+headline "~/org/inbox.org" "Inbox") + "* TODO %?\n %i\n %a") + ("w" "Work diary entry" entry (file "~/org/work_diary.org") + "* %u\n%?\n") + ("n" "Add an idea" entry (file "~/org/ideas.org") + "* %?\nEntered on %U\n")) - org-capture-templates - '( - ("i" "Send to inbox" entry (file+headline "~/org/inbox.org" "Inbox") - "* TODO %?\n") - ("l" "Send to inbox with link" entry (file+headline "~/org/inbox.org" "Inbox") - "* TODO %?\n %i\n %a") - ("w" "Work diary entry" entry (file "~/org/work_diary.org") - "* %u\n%?\n") - ("n" "Add an idea" entry (file "~/org/ideas.org") - "* %?\nEntered on %U\n")) + org-todo-keywords + '((sequence "TODO(t)" "NEXT(n)" "WAITING(w)" "MAYBE(m)" "|" "DONE(d)")) + org-todo-keyword-faces + '((("TODO" . (:foreground "red" :weight bold)) + ("NEXT" . (:foreground "blue")) + ("MAYBE" . (:foreground "sea green")) + ("WAITING" . (:foreground "forest green"))) + ("DONE" . (:foreground "light sea green"))) - org-todo-keywords - '((sequence "TODO(t)" "NEXT(n)" "WAITING(w)" "MAYBE(m)" "|" "DONE(d)")) + org-agenda-span 5 + org-agenda-start-day "1d" - org-todo-keyword-faces - '((("TODO" . (:foreground "red" :weight bold)) - ("NEXT" . (:foreground "blue")) - ("MAYBE" . (:foreground "sea green")) - ("WAITING" . (:foreground "forest green"))) - ("DONE" . (:foreground "light sea green"))) + org-agenda-custom-commands + '(("N" "List all next tasks" ((agenda "" ((org-agenda-span 1))) + (tags "@errand/-DONE") ; should generaly be pretty empty + (tags "@book/NEXT") ; should generaly be pretty empty + (tags "@work/NEXT") + (tags "@home/NEXT") + (tags "@night/NEXT") + (tags "@selectp/NEXT"))) + ("R" "Weekly Review" + ((agenda "" ((org-agenda-span 7))) + (stuck "") ; review stuck projects as designated by org-stuck-projects + (tags "PROJECT/-DONE-MAYBE") ; review all projects + (todo "MAYBE") ; review someday/maybe items + (todo "WAITING")))) ; review waiting items - org-agenda-span 5 - org-agenda-start-day "1d" + org-use-tag-inheritance t; bug in variable below, just turn 'em off + org-tags-exclude-from-injeritance '("PROJECT" "SPRINT") ; PROJECT should not be inheritable - org-agenda-custom-commands - '(("N" "List all next tasks" ((agenda "" ((org-agenda-span 1))) - (tags "@errand/-DONE") ; should generaly be pretty empty - (tags "@book/NEXT") ; should generaly be pretty empty - (tags "@work/NEXT") - (tags "@home/NEXT") - (tags "@night/NEXT") - (tags "@selectp/NEXT"))) - ("R" "Weekly Review" - ((agenda "" ((org-agenda-span 7))) - (stuck "") ; review stuck projects as designated by org-stuck-projects - (tags "PROJECT/-DONE-MAYBE") ; review all projects - (todo "MAYBE") ; review someday/maybe items - (todo "WAITING")))) ; review waiting items + org-stuck-projects + '("+PROJECT/-MAYBE-DONE" ("TODO" "NEXT") nil "\\") - org-use-tag-inheritance nil ; bug in variable below, just turn 'em off - org-tags-exclude-from-inheritance '("PROJECT" "SPRINT") ; PROJECT should not be inheritable + org-tag-alist '(("PROJECT" . ?p) + ("@home" . ?h) + ("@night" . ?n) + ("@selectp" . ?s) + ("@errand" . ?e) + ("@read" . ?r) + ("@work" . ?w) + ("@family" . ?f)) - org-stuck-projects - '("+PROJECT/-MAYBE-DONE" ("TODO" "NEXT") nil "\\") + org-modules '(org-drill + org-clock + org-id + org-info + org-habit + org-protocol + org-annotate-file + org-eval + org-expiry + org-contacts + org-man + org-notmuch + org-collector + org-panel + org-screen + org-toc) - org-tag-alist '(("PROJECT" . ?p) - ("@home" . ?h) - ("@night" . ?n) - ("@selectp" . ?s) - ("@errand" . ?e) - ("@read" . ?r) - ("@work" . ?w) - ("@family" . ?f)) - - org-modules '(org-drill - org-clock - org-id - org-info - org-habit - org-protocol - org-annotate-file - org-eval - org-expiry - org-contacts - org-man - org-notmuch - org-collector - org-panel - org-screen - org-toc) - - ; refile targets - org-refile-targets '(("~/org/todo.org" :maxlevel . 2) - ("~/org/someday.org" :maxlevel . 2) - ("~/org/town.org" :maxlevel . 2) - ("~/org/personal.org" :maxlevel . 2) - ("~/org/elation.org" :maxlevel . 2)))) + ; refile targets + org-refile-targets '(("~/org/todo.org" :maxlevel . 2) + ("~/org/someday.org" :maxlevel . 2) + ("~/org/town.org" :maxlevel . 2) + ("~/org/personal.org" :maxlevel . 2) + ("~/org/elation.org" :maxlevel . 2)))) ;; org-match-sparse-tree ;; ;; org-set-tags-command diff --git a/emacs/.config/doom/config.el b/emacs/.config/doom/config.el index 4f058dd..771d34e 100644 --- a/emacs/.config/doom/config.el +++ b/emacs/.config/doom/config.el @@ -73,6 +73,9 @@ :gi [s-backspace] #'doom/backward-kill-to-bol-and-indent) :leader + (:prefix "j" + :desc "Dumb jump to def" "g" #'dumb-jump-go + :desc "Dumb jump to def" "b" #'dumb-jump-back) (:prefix "f" :desc "Find file in dotfiles" "t" #'+hlissner/find-in-dotfiles :desc "Browse dotfiles" "T" #'+hlissner/browse-dotfiles) @@ -113,61 +116,7 @@ ;; tools/magit (setq magit-repository-directories '(("~/work" . 2)) - magit-save-repository-buffers nil - transient-values '((magit-commit "--gpg-sign=5F6C0EA160557395") - (magit-rebase "--autosquash" "--gpg-sign=5F6C0EA160557395") - (magit-pull "--rebase" "--gpg-sign=5F6C0EA160557395"))) - -;; lang/org -(setq org-directory (expand-file-name "~/org/") - org-journal-dir "~/org/journal/") -;; Some appearance things -(setq org-agenda-block-separator "" - org-fontify-whole-heading-line t - org-fontify-done-headline t - org-fontify-quote-and-verse-blocks t - org-pretty-entities t - org-ellipsis " ▼ " - - ;; The standard unicode characters are usually misaligned depending on the - ;; font. This bugs me. Markdown #-marks for headlines are more elegant. - org-bullets-bullet-list '("#")) - -(after! org - (setq org-capture-templates '(("i" "Send to inbox" entry (file+headline "~/org/inbox.org" "Inbox") "* TODO %?\n") - ("w" "Work diary entry" entry (file "~/org/work_diary.org") - "* %u\n%?\n")) - org-use-tag-inheritance nil - org-tags-exclude-from-inheritance '("PROJECT" "SPRINT") - ;org-stuck-projects '("+PROJECT/-MAYBE-DONE" ("TODO" "NEXT") nil "\\") - ;org-tag-alist '(("PROJECT" . ?p) ("@home" . ?h) ("@night" . ?n) ("@selectp" . ?s) - ; ("@errand" . ?e) ("@read" . ?r) ("@work" . ?w) ("@family" . ?f)) - ;org-modules '(org-drill org-clock org-id org-info org-habit org-protocol org-annotate-file - ; org-eval org-expiry org-contacts org-man org-notmuch org-collector org-panel - ; org-screen org-toc) - - org-refile-targets '(("~/org/todo.org" :maxlevel . 2) - ("~/org/someday.org" :maxlevel . 2) - ("~/org/town.org" :maxlevel . 2) - ("~/org/personal.org" :maxlevel . 2) - ("~/org/elation.org" :maxlevel . 2)) - ) - - (setq org-todo-keywords '((sequence "TODO(t)" "NEXT(n)" "WAITING(w)" "MAYBE(m)" "|" "DONE(d)")))) - -;; Org specific keybindings -(map! :leader - (:prefix "a" - :desc "Org Agenda" "o" #'org-agenda - :desc "Org open link" "l" #'org-open-at-point - :desc "Sync gcal with org" "g" #'org-gcal-sync - :desc "Set task deadline" "d" #'org-deadline - :desc "Schedule task" "s" #'org-schedule - :desc "New journal entry" "j" #'org-journal-new-entry - :desc "Org set property" "p" #'org-set-progerty - :desc "Save all org buffers" "a" #'org-save-all-org-buffers - :desc "Org todo" "t" #'org-todo - :desc "Org set tags" "T" #'org-set-tags-command)) + magit-save-repository-buffers nil) ;;; Setup sending email with msmtp (setq send-mail-function 'sendmail-send-it @@ -175,3 +124,12 @@ mail-specify-envelope-from t message-sendmail-envelope-from 'header mail-envelope-from 'header) + +;; tools/org +(load! "+org") ;; Org mode stuff like todos and rebindings +(load! "+org-gcal") + +;; other +(load! "+mail") ;; Mail stuff +(load! "+ranger") +(load! "+wttrin") ;; Weather config diff --git a/emacs/.config/doom/packages.el b/emacs/.config/doom/packages.el index 6fc5652..0e2f9df 100644 --- a/emacs/.config/doom/packages.el +++ b/emacs/.config/doom/packages.el @@ -47,6 +47,8 @@ (package! ivy-todo) (package! ivy-explorer) (package! ivy-lobsters) +(package! dumb-jump) +(package! beacon) ;; modes! (package! terraform-mode)