Skip to content

Commit ef9fbb6

Browse files
committed
feat(notes): migrate from org-roam to denote
1 parent 6a845c7 commit ef9fbb6

File tree

4 files changed

+126
-88
lines changed

4 files changed

+126
-88
lines changed

local/straight/versions/default.el

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121")
2222
("chezmoi.el" . "1389782f8c0780c7e66f8e77b10345ba1f4eabae")
2323
("citar" . "2c0547db57f2fb30ff071d126b256287a4e9452c")
24-
("citar-org-roam" . "761eed66782fdbb6d65749098caa42ba43e8441d")
2524
("citeproc-el" . "290320fc579f886255f00d7268600df7fa5cc7e8")
2625
("clang-format" . "bce0bb4ca17ecb6e6927074920945cef2a78f5b6")
2726
("closql" . "909752e2aa946bd91b27a1813982e2b20ae27dde")
@@ -33,7 +32,7 @@
3332
("consult" . "e5406f282f76076d10440037ecd3460fb280706c")
3433
("consult-eglot" . "db9d41c9812a5a8a7b9a22fa7f3c314e37584d41")
3534
("consult-lsp" . "f8db3252c0daa41225ba4ed1c0d178b281cd3e90")
36-
("consult-org-roam" . "2ca42a1c1641a29f1447d35be01bd1fda368a9e2")
35+
("consult-notes" . "006b20977cc27aec4b5aca14c13824f5df0ab8cc")
3736
("consult-project-extra" . "9fdf45fa40471900b0b158d73c4b1521a13d47ef")
3837
("corfu" . "130098094c446d6f3c019b5d1804f7805317b177")
3938
("corfu-terminal" . "501548c3d51f926c687e8cd838c5865ec45d03cc")
@@ -45,6 +44,7 @@
4544
("dap-mode" . "a31f2496605d076d50d49393116f77fbb29f2631")
4645
("dash.el" . "6db80c711ce947f6c6fa11e5c2257fff2c79d139")
4746
("datetime" . "dc905e671a1de19da9c601de611a8913c58d6df1")
47+
("denote" . "82cee0ce0dea63cc479b2a0d936b741c396a0fda")
4848
("diff-hl" . "b5651f1c57b42e0f38e01a8fc8c7df9bc76d5d38")
4949
("dirvish" . "119f9f59a618bb7b476c93e9ab1d7542c5c1df41")
5050
("disaster" . "16bba9afb92aacf06c088c29ba47813b65a80d87")
@@ -84,7 +84,6 @@
8484
("emacs-test-simple" . "8b191842318bb05da74052025192d32ebebb033a")
8585
("emacs-undo-fu" . "0e74116fd5c7797811a91ba4eadef50d67523eb6")
8686
("emacs-undo-fu-session" . "a6c4f73bc22401fd36e0f2fd4fe058bb28566d84")
87-
("emacs-web-server" . "347c30494d3bcfc79de35e54538f92f4e4a46ecd")
8887
("emacs-websocket" . "40c208eaab99999d7c1e4bea883648da24c03be3")
8988
("emacs-which-key" . "4d20bc852545a2e602f59084a630f888542052b1")
9089
("emacs-xkcd" . "80011da2e7def8f65233d4e0d790ca60d287081d")
@@ -180,8 +179,6 @@
180179
("org-modern" . "afa7d44282d62dbba84afec2a1a6c2a3ee41e7b9")
181180
("org-msg" . "055de4abf611c5d5e12c770fe149c1861b402817")
182181
("org-present" . "4ec04e1b77dea76d7c30066ccf3200d2e0b7bee9")
183-
("org-roam" . "5c06471c3a11348342719fd9011486455adeb701")
184-
("org-roam-ui" . "5ac74960231db0bf7783c2ba7a19a60f582e91ab")
185182
("ox-hugo" . "cb1b6cfd7b080e889352150416c1725f11ba937a")
186183
("ox-pandoc" . "0f758517f512e375825679541b5d905be40342eb")
187184
("page-break-lines" . "5e9ed86bb56fd076b12ae7adaf40eeaa09aed4c5")

modules/me-biblio.el

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -47,40 +47,6 @@
4747
(remove-hook 'server-after-make-frame-hook
4848
#'+citar--set-symbols-once-h)))))))
4949

50-
;; If `org-roam' is not active, there is no need to install `citar-org-roam'
51-
(unless (and (memq 'me-notes minemacs-modules)
52-
(not (memq 'org-roam minemacs-disabled-packages)))
53-
(push 'citar-org-roam minemacs-disabled-packages))
54-
55-
(use-package citar-org-roam
56-
:straight t
57-
:after citar org-roam
58-
:demand t
59-
:commands +org-roam-node-from-cite
60-
:config
61-
;; Modified form: jethrokuan.github.io/org-roam-guide/
62-
(defun +org-roam-node-from-cite (entry-key)
63-
"Create an Org-Roam node from a bibliography reference."
64-
(interactive (list (citar-select-ref)))
65-
(let ((title (citar-format--entry
66-
"${author editor} (${date urldate}) :: ${title}"
67-
(citar-get-entry entry-key))))
68-
(org-roam-capture- :templates
69-
`(("r" "reference" plain
70-
"%?"
71-
:if-new (file+head "references/${citekey}.org"
72-
,(concat
73-
":properties:\n"
74-
":roam_refs: [cite:@${citekey}]\n"
75-
":end:\n"
76-
"#+title: ${title}\n"))
77-
:immediate-finish t
78-
:unnarrowed t))
79-
:info (list :citekey entry-key)
80-
:node (org-roam-node-create :title title)
81-
:props '(:finalize find-file))))
82-
(citar-org-roam-mode 1))
83-
8450
(use-package citar-embark
8551
:straight t
8652
:after citar embark

modules/me-notes.el

Lines changed: 22 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,64 +8,37 @@
88

99
;;; Code:
1010

11-
(use-package org-roam
11+
;; Useful resources:
12+
;; https://takeonrules.com/2022/10/01/exploring-the-denote-emacs-package/
13+
;; https://takeonrules.com/2022/10/02/migration-plan-for-org-roam-notes-to-denote/
14+
;; https://github.com/bitspook/notes-migrator
15+
16+
(use-package denote
1217
:straight t
1318
:init
1419
(+map! :infix "n"
15-
"f" #'org-roam-node-find
16-
"r" #'org-roam-ref-find
17-
"i" #'org-roam-node-insert
18-
"R" #'org-roam-node-random
19-
"B" #'org-roam-buffer-display-dedicated)
20+
"o" #'denote-open-or-create
21+
"j" #'denote-journal-extras-new-or-existing-entry
22+
"J" #'denote-journal-extras-new-entry
23+
"l" #'denote-add-links
24+
"L" #'denote-add-missing-links
25+
"b" #'denote-show-backlinks-buffer)
2026
:custom
21-
(org-roam-node-display-template (concat "${title:*} " (propertize "${tags:20}" 'face 'org-tag)))
22-
:config
23-
(org-roam-db-autosync-mode 1))
24-
25-
(use-package org-roam-protocol
26-
:after org-roam
27-
:demand t
28-
:custom
29-
(org-roam-protocol-store-links t)
30-
;; Add this as bookmarklet in your browser
31-
;; javascript:location.href='org-protocol://roam-ref?template=r&ref=%27+encodeURIComponent(location.href)+%27&title=%27+encodeURIComponent(document.title)+%27&body=%27+encodeURIComponent(window.getSelection())
32-
(org-roam-capture-ref-templates
33-
'(("r" "ref" plain "%?"
34-
:if-new (file+head "web/%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+created: %U\n\n${body}\n")
35-
:unnarrowed t)))
36-
:config
37-
;; Save a local snapshot of the captured web page using "single-file-cli"
38-
(advice-add
39-
'org-roam-protocol-open-ref :after
40-
(defun +org-roam-protocol--single-file-snapshot-a (info)
41-
(+single-file
42-
(plist-get info :ref)
43-
(+file-name-incremental
44-
(expand-file-name
45-
(concat "web/snapshots/" (+clean-file-name (plist-get info :title)) ".html")
46-
org-roam-directory))))))
27+
(denote-prompts '(title keywords)) ; These are the minimum viable prompts for notes
28+
(denote-file-type 'org) ; I love org-mode format; reading ahead I'm setting this
29+
(denote-date-prompt-use-org-read-date t)) ; And `org-read-date' is an amazing bit of tech
4730

48-
(use-package org-roam-ui
31+
(use-package consult-notes
4932
:straight t
33+
:commands consult-notes consult-notes-search-in-all-notes
5034
:init
51-
(+map! "nu" #'org-roam-ui-open))
52-
53-
(use-package consult-org-roam
54-
:straight t
55-
:init
56-
(+map! :infix "n"
57-
"s" #'consult-org-roam-search
58-
"l" #'consult-org-roam-forward-links
59-
"b" #'consult-org-roam-backlinks
60-
"F" #'consult-org-roam-file-find)
35+
(fmakunbound 'consult-notes-org-roam-mode)
6136
:custom
62-
(consult-org-roam-grep-func #'consult-ripgrep)
63-
(consult-org-roam-buffer-narrow-key ?r) ; custom narrow key for `consult-buffer'
64-
(consult-org-roam-buffer-after-buffers t)
37+
(consult-notes-file-dir-sources `(("Notes" "n" ,denote-directory))) ; Set notes dir(s), see below
38+
(consult-notes-denote-files-function #'denote-directory-text-only-files) ; Search only for text files in denote dir
6539
:config
66-
(consult-org-roam-mode 1)
67-
;; Eventually suppress previewing for certain functions
68-
(consult-customize consult-org-roam-forward-links :preview-key (kbd "M-.")))
40+
(consult-notes-denote-mode 1)
41+
(consult-notes-org-headings-mode 1))
6942

7043

7144
(provide 'me-notes)

modules/obsolete/me-org-roam.el

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
;;; me-org-roam.el --- Org roam -*- lexical-binding: t; -*-
2+
3+
;; Copyright (C) 2022-2023 Abdelhak Bougouffa
4+
5+
;; Author: Abdelhak Bougouffa (concat "abougouffa" "@" "fedora" "project" "." "org")
6+
7+
;;; Commentary:
8+
9+
;;; Code:
10+
11+
(use-package org-roam
12+
:straight t
13+
:init
14+
(+map! :infix "n"
15+
"f" #'org-roam-node-find
16+
"r" #'org-roam-ref-find
17+
"i" #'org-roam-node-insert
18+
"R" #'org-roam-node-random
19+
"B" #'org-roam-buffer-display-dedicated)
20+
:custom
21+
(org-roam-node-display-template (concat "${title:*} " (propertize "${tags:20}" 'face 'org-tag)))
22+
:config
23+
(org-roam-db-autosync-mode 1))
24+
25+
(use-package org-roam-protocol
26+
:after org-roam
27+
:demand t
28+
:custom
29+
(org-roam-protocol-store-links t)
30+
;; Add this as bookmarklet in your browser
31+
;; javascript:location.href='org-protocol://roam-ref?template=r&ref=%27+encodeURIComponent(location.href)+%27&title=%27+encodeURIComponent(document.title)+%27&body=%27+encodeURIComponent(window.getSelection())
32+
(org-roam-capture-ref-templates
33+
'(("r" "ref" plain "%?"
34+
:if-new (file+head "web/%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+created: %U\n\n${body}\n")
35+
:unnarrowed t)))
36+
:config
37+
;; Save a local snapshot of the captured web page using "single-file-cli"
38+
(advice-add
39+
'org-roam-protocol-open-ref :after
40+
(defun +org-roam-protocol--single-file-snapshot-a (info)
41+
(+single-file
42+
(plist-get info :ref)
43+
(+file-name-incremental
44+
(expand-file-name
45+
(concat "web/snapshots/" (+clean-file-name (plist-get info :title)) ".html")
46+
org-roam-directory))))))
47+
48+
(use-package org-roam-ui
49+
:straight t
50+
:init
51+
(+map! "nu" #'org-roam-ui-open))
52+
53+
(use-package consult-org-roam
54+
:straight t
55+
:init
56+
(+map! :infix "n"
57+
"s" #'consult-org-roam-search
58+
"l" #'consult-org-roam-forward-links
59+
"b" #'consult-org-roam-backlinks
60+
"F" #'consult-org-roam-file-find)
61+
:custom
62+
(consult-org-roam-grep-func #'consult-ripgrep)
63+
(consult-org-roam-buffer-narrow-key ?r) ; custom narrow key for `consult-buffer'
64+
(consult-org-roam-buffer-after-buffers t)
65+
:config
66+
(consult-org-roam-mode 1)
67+
;; Eventually suppress previewing for certain functions
68+
(consult-customize consult-org-roam-forward-links :preview-key (kbd "M-.")))
69+
70+
(use-package citar-org-roam
71+
:straight t
72+
:after citar org-roam
73+
:demand t
74+
:commands +org-roam-node-from-cite
75+
:config
76+
;; Modified form: jethrokuan.github.io/org-roam-guide/
77+
(defun +org-roam-node-from-cite (entry-key)
78+
"Create an Org-Roam node from a bibliography reference."
79+
(interactive (list (citar-select-ref)))
80+
(let ((title (citar-format--entry
81+
"${author editor} (${date urldate}) :: ${title}"
82+
(citar-get-entry entry-key))))
83+
(org-roam-capture- :templates
84+
`(("r" "reference" plain
85+
"%?"
86+
:if-new (file+head "references/${citekey}.org"
87+
,(concat
88+
":properties:\n"
89+
":roam_refs: [cite:@${citekey}]\n"
90+
":end:\n"
91+
"#+title: ${title}\n"))
92+
:immediate-finish t
93+
:unnarrowed t))
94+
:info (list :citekey entry-key)
95+
:node (org-roam-node-create :title title)
96+
:props '(:finalize find-file))))
97+
(citar-org-roam-mode 1))
98+
99+
100+
(provide 'obsolete/me-org-roam)
101+
102+
;;; me-org-roam.el ends here

0 commit comments

Comments
 (0)