Improve org-roam-dailies by zaeph · Pull Request #978 · org-roam/org-roam

zaeph · 2020-07-27T08:58:00Z

org-roam-scratch is a rewrite of org-roam-dailies which strives to implement useful behaviours from org-journal. The rationale is that org-journal can be a little inflexible (cf. bastibe/org-journal#278), and we wouldn't want to hijack its functions to do something that it wasn't designed to do, especially since we'd only be using a subset of the features.

Therefore, the project is indebted to @bastibe, and will strive to incorporate the ephemeral scratchings as defined by @andymatuschak in his Taxonomy of Note Types, and as demonstrated in a livestream he did.

zaeph · 2020-07-28T07:33:57Z

Re: default variable change

org-roam/org-roam-dailies.el

Lines 42 to 45 in ed8ed27

    
           '(("d" "daily" entry (function org-roam-capture--get-point) 
        
              "* %?" 
        
              :file-name "%<%Y-%m-%d>" 
        
              :head "#+title: %<%Y-%m-%d>"))

I think it makes more sense to have org-roam-dailies-today and co. be 'entry templates by default in order to replicate the traditional behaviour associated with org-capture. I'm going to write separate commands like org-roam-dailies-find-today to only go to the file, since I do not believe it's necessary to use org-capture in that scenario.

Mind you, it's still be possible to use 'plain templates with org-roam-dailies, and to have them return immediately with :immediate-finish t, but placing the cursor at an appropriate place would be complicated.

zaeph · 2020-07-29T00:10:39Z

PR is almost ready. I still need to define a rule for considering a file as a daily note. I'm thinking of using org-roam-dailies--file-to-date as a predicate. This way, people could have daily notes in multiple directories, and wouldn't have to declare those directories explicitly. There would be false positives with regular notes including a timestamp, but those would be limited. Other option is to add a metadata-tag for dailies which would contain the date.

…I'll think about this tomorrow.

zaeph · 2020-07-30T22:39:13Z

PR is almost done. I just need to edit the changelog and a couple of other minor stuff.

org-roam-capture.el

jethrokuan

Everything else looks fine for now, will have to think about how to decouple things from org-roam-capture.

org-roam-capture.el

zaeph · 2020-08-07T09:53:41Z

Here's a quick demo of the new features:
https://youtu.be/1q9x2aZCJJ4

lhindir · 2020-09-27T23:13:05Z

Anything holding this up? It's kind of weird to see one of the few demo videos and then find out it's for unmerged features :)

zaeph · 2020-09-29T03:41:43Z

I'm still bogged down in work, and I'd rather not announce any other ETA that I won't be able to meet. That being said, I'm growing more antsy with the days to come back and merge this, so it shouldn't be too-too long.

Mimics ‘org-roam-capture--file-name-default’ and ‘org-roam-capture-ref--file-name-default’.

zaeph · 2020-11-10T02:53:59Z

I've fixed the defcustom template in 0f81f5a.

Here are example templates:

(setq org-roam-dailies-capture-templates

      '(("d" "default" plain
         #'org-roam-capture--get-point
         "%?"
         :file-name "daily/%<%Y-%m-%d>"
         :head "#+title: %<%Y-%m-%d>\n\n"
         :unnarrowed t)

        ("a" "alternative template" entry
         #'org-roam-capture--get-point
         "* %?"
         :file-name "daily/%<%Y-%m-%d>"
         :head "#+title: %<%Y-%m-%d>\n\n* Foo"
         :olp ("Foo"))))

There are subtle difference (notably plain vs entry), but I think it's fairly powerful.

@jethrokuan I've elected to keep org-roam-dailies-capture--file-name-default and org-roam-dailies-capture--header-default for now because also have org-roam-capture--file-name-default and org-roam-capture--header-default. If we need to drop the former in former of a clever pcase, we might as well remove the others, and I'd rather do that in a separate PR, if need be.

zaeph · 2020-11-10T02:57:28Z

I'll review everything in the morning, but I think we'll be good for a merge.

jethrokuan · 2020-11-10T03:04:21Z

@jethrokuan I've elected to keep org-roam-dailies-capture--file-name-default and org-roam-dailies-capture--header-default for now because also have org-roam-capture--file-name-default and org-roam-capture--header-default. If we need to drop the former in former of a clever pcase, we might as well remove the others, and I'd rather do that in a separate PR, if need be.

sure, I'll drop them in a later PR.

zaeph · 2020-11-10T11:06:21Z

Code is ready in 4ee1606.

I'm working on the doc to mention the new features (also those in #1239).

It was a nice alternative to the hack we have with :file-name, but it isn’t all that necessarty for now. I’ll review this when working on org-roam-flow, since it’ll make better use of folders.

Otherwise, it clashes with the blurb which mentions isolation.

Also standardise the hyphenation to ‘daily-note’.

zaeph added the 1. enhancement Requests to add new functionality label Jul 27, 2020

zaeph added this to the 1.2.2 milestone Jul 27, 2020

zaeph self-assigned this Jul 27, 2020

zaeph marked this pull request as draft July 27, 2020 08:58

zaeph changed the title ~~(feat): Implement org-roam-scratch~~ Implement org-roam-scratch Jul 27, 2020

zaeph force-pushed the scratch branch 3 times, most recently from cca187e to 92ca9f2 Compare July 27, 2020 18:29

zaeph mentioned this pull request Jul 28, 2020

Functions for navigating to next/previous day #379

Closed

zaeph force-pushed the scratch branch 2 times, most recently from a66a747 to 8585995 Compare July 28, 2020 23:25

zaeph marked this pull request as ready for review July 28, 2020 23:25

zaeph requested a review from jethrokuan July 29, 2020 00:00

zaeph force-pushed the scratch branch 2 times, most recently from 129e391 to e201367 Compare July 29, 2020 00:05

zaeph force-pushed the scratch branch 2 times, most recently from e197547 to 291b2be Compare July 29, 2020 23:55

zaeph mentioned this pull request Jul 31, 2020

Remove harcoded key-bindings and move them to user-config bastibe/org-journal#278

Closed

progfolio reviewed Jul 31, 2020

View reviewed changes

org-roam-capture.el Outdated Show resolved Hide resolved

zaeph changed the title ~~Implement org-roam-scratch~~ Improve org-roam-dailies Aug 1, 2020

zaeph force-pushed the scratch branch from faf5d9b to 5fb2ec8 Compare August 2, 2020 16:49

jethrokuan reviewed Aug 5, 2020

View reviewed changes

org-roam-capture.el Show resolved Hide resolved

zaeph force-pushed the scratch branch from 7fbf340 to 63a2fb7 Compare August 5, 2020 14:15

plantarum mentioned this pull request Sep 15, 2020

Exclude backup files (i.e., *.org~*) when navigating notes #1106

Merged

zaeph added this to the 1.2.3 milestone Nov 7, 2020

zaeph force-pushed the scratch branch from bac221d to c0170ef Compare November 7, 2020 21:18

zaeph and others added 2 commits November 8, 2020 15:34

(feat): Overhaul org-roam-dailies

ee5020a

Use standard structure

a0f22c0

zaeph force-pushed the scratch branch from edaa533 to a0f22c0 Compare November 8, 2020 14:34

zaeph added 4 commits November 9, 2020 14:25

Drop -default variables for the templates

dc3c699

Revive --file-name-default for ORD

6b27d16

Mimics ‘org-roam-capture--file-name-default’ and ‘org-roam-capture-ref--file-name-default’.

Revive --header-default for ORD

e4e55a5

Fix defcustom

0f81f5a

zaeph added 2 commits November 10, 2020 12:02

Fix default template and defcustom form

4467196

Merge branch 'master' into scratch

4ee1606

zaeph added 10 commits November 10, 2020 12:30

Remove :dir-name

f30104a

It was a nice alternative to the hack we have with :file-name, but it isn’t all that necessarty for now. I’ll review this when working on org-roam-flow, since it’ll make better use of folders.

Add prefer-future arg to find-date

fc071c4

Change command to function

fd8d8f1

Reword docstrings

433744c

Standardise hyphenation

5b3085a

doc: Update bookmarklet for orp

918c705

doc: Update blurb for org-journal to mention org-roam-dailies

b7f6920

doc: Change suggested path for org-journal

360ed82

Otherwise, it clashes with the blurb which mentions isolation.

doc: Fill ‘Daily-notes’ section

41edd71

Also standardise the hyphenation to ‘daily-note’.

doc: Reword

f61f158

zaeph merged commit 4f6eb28 into master Nov 10, 2020

zaeph deleted the scratch branch November 10, 2020 13:31

This was referenced Nov 10, 2020

Restore :dir-name for org-roam-dailies-capture-templates #1245

Closed

Daily templates with :olp option and "Heading not found on level 1" #1275

Closed

github-actions bot locked as resolved and limited conversation to collaborators Jun 7, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Improve org-roam-dailies#978

Improve org-roam-dailies#978
zaeph merged 18 commits intomasterfrom
scratch

zaeph commented Jul 27, 2020

Uh oh!

zaeph commented Jul 28, 2020

Uh oh!

zaeph commented Jul 29, 2020

Uh oh!

zaeph commented Jul 30, 2020

Uh oh!

Uh oh!

jethrokuan left a comment

Uh oh!

Uh oh!

zaeph commented Aug 7, 2020

Uh oh!

lhindir commented Sep 27, 2020

Uh oh!

zaeph commented Sep 29, 2020

Uh oh!

zaeph commented Nov 10, 2020

Uh oh!

zaeph commented Nov 10, 2020

Uh oh!

jethrokuan commented Nov 10, 2020

Uh oh!

zaeph commented Nov 10, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

zaeph commented Jul 27, 2020

Uh oh!

zaeph commented Jul 28, 2020

Uh oh!

zaeph commented Jul 29, 2020

Uh oh!

zaeph commented Jul 30, 2020

Uh oh!

Uh oh!

jethrokuan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

zaeph commented Aug 7, 2020

Uh oh!

lhindir commented Sep 27, 2020

Uh oh!

zaeph commented Sep 29, 2020

Uh oh!

zaeph commented Nov 10, 2020

Uh oh!

zaeph commented Nov 10, 2020

Uh oh!

jethrokuan commented Nov 10, 2020

Uh oh!

zaeph commented Nov 10, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants