Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Org GTD 3.0 mega-PR #124

Merged
merged 90 commits into from
May 4, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
1f6ac48
fix: run org-gtd--decorate-item in org-gtd-inbox-processing
mbeutelspacher Feb 26, 2023
5731418
Update test.yml
Trevoke Mar 1, 2023
17fd20f
fix: decorate all elements in a project
DerBeutlin Feb 26, 2023
2966f28
fix: mapping in correct order
mbeutelspacher Mar 6, 2023
865068e
Merge pull request #116 from DerBeutlin/fix/decorate-items
Trevoke Mar 8, 2023
fdc13dc
fix cond statement in custom agenda prefix
Trevoke Mar 8, 2023
9f73c69
Factor out inbox/default file initialization
cdlm Feb 13, 2023
89a0cf2
Ensure inbox file exists
cdlm Feb 13, 2023
2c87dae
Convert to full-fledged capture templates
cdlm Feb 13, 2023
9efbe52
Missing dependency
cdlm Feb 14, 2023
a026471
Avoid org-gtd-customize depending on org-gtd-files
cdlm Feb 14, 2023
d5d54c3
Cleanup uses of org-gtd--inbox-file
cdlm Feb 15, 2023
69c6689
Simplify overkill refactoring
cdlm Feb 19, 2023
770d399
Surface one-off organizing actions
Trevoke Feb 28, 2023
4266bad
fix missing line of code in inbox processing action
Trevoke Mar 1, 2023
19e3bd8
inbox-processing -> process
Trevoke Mar 6, 2023
dda6e13
tests pass again, which I hear matters
Trevoke Mar 8, 2023
2cd194d
refactor - move customize options
Trevoke Mar 10, 2023
3037ee6
Sketched new flow using temp processing buffer
Trevoke Mar 14, 2023
e9a00fe
adjust fixture file
Trevoke Mar 23, 2023
c23b96d
possibly more idiomatic buffer name template
Trevoke Mar 23, 2023
3319251
move defcustom declarations closer to the code
Trevoke Mar 23, 2023
196be5e
update agenda prototypes with dynamic date search
Trevoke Mar 24, 2023
f0d7f1b
wip - upgrading processing code
Trevoke Mar 24, 2023
00055d9
paving the way for clean single and batch clarifying
Trevoke Mar 27, 2023
09344fd
down to 6 failing tests
Trevoke Apr 1, 2023
197064d
down to fixing error flow
Trevoke Apr 3, 2023
240045b
last failing test, the big one
Trevoke Apr 3, 2023
b1d5f90
stupid blank lines in wip buffer
Trevoke Apr 3, 2023
cd07226
WIP (I hate myself)
Trevoke Apr 3, 2023
e2da90c
error display works as intended
Trevoke Apr 3, 2023
beda5cc
update documentation todo
Trevoke Apr 3, 2023
a9f1361
Merge branch 'org-gtd-3' into more-flexible-organization
Trevoke Apr 3, 2023
1de5c58
append org-gtd-directory to org-agenda-files
Trevoke Apr 3, 2023
ae3ff3d
add a forgotten test file
Trevoke Apr 3, 2023
b009301
refactor to allow todo-keywords to be dynamic
Trevoke Apr 7, 2023
75e5d48
can customize TODO/NEXT/etc. keywords
Trevoke Apr 7, 2023
644c258
add backward compatibility for ensure-list
Trevoke Apr 7, 2023
88406c4
some linting
Trevoke Apr 7, 2023
5fb5e04
declare this as 3.0 version; fix autoload issue
Trevoke Apr 9, 2023
2073131
support emacs 27 better
Trevoke Apr 9, 2023
1300c21
fix package autoloading, use new calendar implementation
Trevoke Apr 10, 2023
2d97101
hopefully fix 27.2 test failure
Trevoke Apr 11, 2023
bf191f6
First pass of function to upgrade calendar items to v3
Trevoke Apr 11, 2023
abc074a
Show horizons buffer on clarify if option is true
Trevoke Apr 11, 2023
04e0db9
respect option to show or not the horizons buffer
Trevoke Apr 11, 2023
b1d7605
compatibility with emacs 27.2
Trevoke Apr 12, 2023
b94085f
Incubate no longer uses SCHEDULED
Trevoke Apr 12, 2023
27032e5
Move delegated items away from SCHEDULED property
Trevoke Apr 12, 2023
430e6aa
ensure clarifying "knowledge" works
Trevoke Apr 17, 2023
8336595
sometimes I wonder how my tests work locally at all
Trevoke Apr 17, 2023
c97fa93
clean up kbd macros in processing test
Trevoke Apr 17, 2023
4b8e683
extract "capture-and-process" and "clarify" as functions
Trevoke Apr 17, 2023
5fbe386
if you don't commit new files, you're gonna have a bad time
Trevoke Apr 17, 2023
aad6d09
clean up helper code a little
Trevoke Apr 17, 2023
58dd0b7
add test for trash processing
Trevoke Apr 17, 2023
a6f159e
New decoration hook for choosing areas of focus
Trevoke Apr 17, 2023
d1f78ce
Update README.org
Trevoke Apr 19, 2023
c189cb7
Add sample doom config
chookity-pokk Apr 19, 2023
b98a8e6
Bring sample doom config into documentation / info file
Trevoke Apr 20, 2023
a6aca52
Merge branch 'chookity-pokk-update-readme'
Trevoke Apr 20, 2023
4fc2a0f
Merge branch 'master' into more-flexible-organization
Trevoke Apr 20, 2023
4603129
put sponsor request in README
Trevoke Apr 20, 2023
ffeacde
Merge branch 'master' into more-flexible-organization
Trevoke Apr 20, 2023
e175979
simplify logic: only one transient prefix now
Trevoke Apr 20, 2023
2c5104d
heavy linting effort
Trevoke Apr 21, 2023
f5cc056
more linting, start area of focus review agenda
Trevoke Apr 22, 2023
f6a5bba
signal error if area not in list
Trevoke Apr 22, 2023
b4e0c8c
try to use buttercup's :var tool
Trevoke Apr 23, 2023
45b6a0d
Prepare agenda for area of focus review
Trevoke Apr 24, 2023
17787cb
Toggle horizons buffer
Trevoke Apr 24, 2023
e2ddaed
Make flow for organizing a habit
Trevoke Apr 24, 2023
8b95c25
fix broken test
Trevoke Apr 25, 2023
e643350
Insert project templates while clarifying
Trevoke Apr 25, 2023
19658de
add functions to programmatically add GTD tasks
Trevoke Apr 25, 2023
3dd2b27
lint and rename hooks to org-gtd-organize-hooks
Trevoke Apr 26, 2023
6566106
move some functions from agenda namespace to GTD namespaces
Trevoke Apr 27, 2023
168f042
Update organize-hooks, allow easy customization
Trevoke Apr 28, 2023
3e73c10
discriminate more about when area of focus gets set
Trevoke Apr 28, 2023
dce739d
engage with all NEXT, by @-context
Trevoke Apr 30, 2023
b42a7bd
clean up logic for TODO/NEXT keywords on project tasks
Trevoke Apr 30, 2023
d4b03f2
keep track of implementation details
Trevoke May 1, 2023
a9630b1
Simplify file/refile target management
Trevoke May 1, 2023
e06d310
better data organization
Trevoke May 1, 2023
b613ed1
move habits to their own tree
Trevoke May 1, 2023
88015dd
implement 'review stuck bits' commands
Trevoke May 2, 2023
8b1778e
remove obsolete call; at this point, a drop in the sea
Trevoke May 2, 2023
7e448e8
Add org-gtd-oops to see missed events
Trevoke May 4, 2023
0814252
And this is why we have tests
Trevoke May 4, 2023
53a258e
add warning for 3.0.0beta
Trevoke May 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bring sample doom config into documentation / info file
  • Loading branch information
Trevoke committed Apr 20, 2023
commit b98a8e6b71dc80c7e9ac00154c1b0e073cf48ea8
21 changes: 1 addition & 20 deletions README.org
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
* NOTICE
This is org-gtd 2.0.0.
This is org-gtd 2.0.0.

Check documentation in [[doc/]] if you're upgrading. Please report all defects as Github issues.

Expand All @@ -15,25 +15,6 @@ For a comprehensive instruction manual, see the documentation.
Either the info file or in the [[doc/]] directory of the repository.
Upgrade information is also available therein.

* Doom Config

#+BEGIN_SRC elisp
(use-package! org-gtd
:after org
:config
(org-edna-mode)
(setq org-edna-use-inheritance t)
(map! :leader
(:prefix ("d" . "org-gtd")
:desc "Capture" "c" #'org-gtd-capture
:desc "Engage" "e" #'org-gtd-engage
:desc "Process inbox" "p" #'org-gtd-process-inbox
:desc "Show all next" "n" #'org-gtd-show-all-next
:desc "Stuck projects" "s" #'org-gtd-show-stuck-projects))
(map! :map org-gtd-process-map
:desc "Choose" "C-c c" #'org-gtd-choose))
#+END_SRC

* Directory tree
- =dev= :: used as a jail environment. Spin up with ~$ HOME="dev/" emacs~.
- =doc= :: where the documentation lives
Expand Down
20 changes: 19 additions & 1 deletion doc/org-gtd.org
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,25 @@ For other keybindings, do what you need. My bindings use ~C-c d~ as a prefix, i.
- ~C-c d e~ :: ~org-gtd-engage~

etc.

*** Sample Doom Emacs Config
If you are a Doom Emacs user, then your configuration may look something like this:

#+BEGIN_SRC elisp
(use-package! org-gtd
:after org
:config
(org-edna-mode)
(setq org-edna-use-inheritance t)
(map! :leader
(:prefix ("d" . "org-gtd")
:desc "Capture" "c" #'org-gtd-capture
:desc "Engage" "e" #'org-gtd-engage
:desc "Process inbox" "p" #'org-gtd-process-inbox
:desc "Show all next" "n" #'org-gtd-show-all-next
:desc "Stuck projects" "s" #'org-gtd-show-stuck-projects))
(map! :map org-gtd-process-map
:desc "Choose" "C-c c" #'org-gtd-choose))
#+END_SRC
* Using Org GTD
:PROPERTIES:
:DESCRIPTION: How Org GTD maps to the GTD flow
Expand Down
24 changes: 24 additions & 0 deletions doc/org-gtd.texi
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ Configuring
* Required configuration of sub-packages::
* configuration options for org-gtd::
* Recommended key bindings::
* Sample Doom Emacs Config::


Using Org GTD
Expand Down Expand Up @@ -457,6 +458,7 @@ Finally, add this to your config:
* Required configuration of sub-packages::
* configuration options for org-gtd::
* Recommended key bindings::
* Sample Doom Emacs Config::
@end menu

@node The easy way
Expand Down Expand Up @@ -548,6 +550,28 @@ For other keybindings, do what you need. My bindings use @code{C-c d} as a prefi

etc.

@node Sample Doom Emacs Config
@subsection Sample Doom Emacs Config

If you are a Doom Emacs user, then your configuration may look something like this:

@lisp
(use-package! org-gtd
:after org
:config
(org-edna-mode)
(setq org-edna-use-inheritance t)
(map! :leader
(:prefix ("d" . "org-gtd")
:desc "Capture" "c" #'org-gtd-capture
:desc "Engage" "e" #'org-gtd-engage
:desc "Process inbox" "p" #'org-gtd-process-inbox
:desc "Show all next" "n" #'org-gtd-show-all-next
:desc "Stuck projects" "s" #'org-gtd-show-stuck-projects))
(map! :map org-gtd-process-map
:desc "Choose" "C-c c" #'org-gtd-choose))
@end lisp

@node Using Org GTD
@chapter Using Org GTD

Expand Down
123 changes: 75 additions & 48 deletions org-gtd.info
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Configuring
* Required configuration of sub-packages::
* configuration options for org-gtd::
* Recommended key bindings::
* Sample Doom Emacs Config::


Using Org GTD
Expand Down Expand Up @@ -462,6 +463,7 @@ File: org-gtd.info, Node: Configuring, Prev: Installing, Up: Setting up Org G
* Required configuration of sub-packages::
* configuration options for org-gtd::
* Recommended key bindings::
* Sample Doom Emacs Config::


File: org-gtd.info, Node: The easy way, Next: Required configuration of sub-packages, Up: Configuring
Expand Down Expand Up @@ -574,7 +576,7 @@ File: org-gtd.info, Node: configuration options for org-gtd, Next: Recommended
to ‘read-string’.


File: org-gtd.info, Node: Recommended key bindings, Prev: configuration options for org-gtd, Up: Configuring
File: org-gtd.info, Node: Recommended key bindings, Next: Sample Doom Emacs Config, Prev: configuration options for org-gtd, Up: Configuring

1.4.4 Recommended key bindings
------------------------------
Expand All @@ -596,6 +598,30 @@ a prefix, i.e.:

etc.


File: org-gtd.info, Node: Sample Doom Emacs Config, Prev: Recommended key bindings, Up: Configuring

1.4.5 Sample Doom Emacs Config
------------------------------

If you are a Doom Emacs user, then your configuration may look something
like this:

(use-package! org-gtd
:after org
:config
(org-edna-mode)
(setq org-edna-use-inheritance t)
(map! :leader
(:prefix ("d" . "org-gtd")
:desc "Capture" "c" #'org-gtd-capture
:desc "Engage" "e" #'org-gtd-engage
:desc "Process inbox" "p" #'org-gtd-process-inbox
:desc "Show all next" "n" #'org-gtd-show-all-next
:desc "Stuck projects" "s" #'org-gtd-show-stuck-projects))
(map! :map org-gtd-process-map
:desc "Choose" "C-c c" #'org-gtd-choose))


File: org-gtd.info, Node: Using Org GTD, Next: Troubleshooting, Prev: Setting up Org GTD, Up: Top

Expand Down Expand Up @@ -1021,53 +1047,54 @@ project.

Tag Table:
Node: Top736
Node: Setting up Org GTD2331
Node: Summary2751
Node: Upgrading6199
Node: 220 <- 2106558
Ref: respect org-mode's org-reverse-note-order variable6684
Node: 210 <- 2007384
Ref: Update org-edna trigger7529
Node: 200 <- 11x8298
Ref: Configuration8424
Ref: Example upgrade9816
Ref: Relevant commands with new names12756
Ref: heading states (TODO etc)12973
Ref: Differentiating GTD types of items13132
Ref: Multiple refile targets14499
Ref: Key bindings15351
Node: Installing15628
Node: use-package15923
Node: Manually16135
Node: Configuring16501
Node: The easy way16757
Node: Required configuration of sub-packages17326
Ref: org-edna17574
Node: configuration options for org-gtd17992
Ref: I don't care just let me start using it18242
Ref: Tell me all the levers I can pull18831
Node: Recommended key bindings21902
Node: Using Org GTD22630
Node: Adding things to the inbox23312
Node: Processing the inbox24127
Node: Projects26827
Node: Modify an existing project28163
Node: Quick action29107
Node: Trash29522
Node: Calendar29842
Node: Delegate30180
Node: Single action30602
Node: Archive30908
Node: Incubate31371
Node: Engaging with your GTD items31876
Node: Interacting with org-agenda33013
Node: Cleaning up / archiving completed work33884
Node: Multiple files / refile targets34738
Node: New project heading35081
Node: Other headings35523
Node: Troubleshooting36108
Node: Projects without a NEXT item36326
Node: I can't create a project when clarifying an inbox item!36996
Node: Setting up Org GTD2360
Node: Summary2780
Node: Upgrading6228
Node: 220 <- 2106587
Ref: respect org-mode's org-reverse-note-order variable6713
Node: 210 <- 2007413
Ref: Update org-edna trigger7558
Node: 200 <- 11x8327
Ref: Configuration8453
Ref: Example upgrade9845
Ref: Relevant commands with new names12785
Ref: heading states (TODO etc)13002
Ref: Differentiating GTD types of items13161
Ref: Multiple refile targets14528
Ref: Key bindings15380
Node: Installing15657
Node: use-package15952
Node: Manually16164
Node: Configuring16530
Node: The easy way16815
Node: Required configuration of sub-packages17384
Ref: org-edna17632
Node: configuration options for org-gtd18050
Ref: I don't care just let me start using it18300
Ref: Tell me all the levers I can pull18889
Node: Recommended key bindings21960
Node: Sample Doom Emacs Config22721
Node: Using Org GTD23579
Node: Adding things to the inbox24261
Node: Processing the inbox25076
Node: Projects27776
Node: Modify an existing project29112
Node: Quick action30056
Node: Trash30471
Node: Calendar30791
Node: Delegate31129
Node: Single action31551
Node: Archive31857
Node: Incubate32320
Node: Engaging with your GTD items32825
Node: Interacting with org-agenda33962
Node: Cleaning up / archiving completed work34833
Node: Multiple files / refile targets35687
Node: New project heading36030
Node: Other headings36472
Node: Troubleshooting37057
Node: Projects without a NEXT item37275
Node: I can't create a project when clarifying an inbox item!37945

End Tag Table

Expand Down