(emacs) migrate to org-roam v2

d12frosted · May 10, 2021 · 87d23cd · 87d23cd
1 parent 15660cd
commit 87d23cd
Show file tree

Hide file tree

Showing 8 changed files with 198 additions and 214 deletions.
diff --git a/bin/vulpea-test b/bin/vulpea-test
diff --git a/emacs/.dir-locals.el b/emacs/.dir-locals.el
@@ -4,6 +4,7 @@
                      (elisp-lint-indent-specs . ((vulpea-utils-with-file . 1)
                                                  (vulpea-utils-with-note . 1)
                                                  (org-roam-with-file . 2)
+                                                 (org-with-point-at . 1)
                                                  (org-element-map . 2)
                                                  (file-templates-set . defun)
                                                  (leader-def . 0)

diff --git a/emacs/lisp/init-elpa.el b/emacs/lisp/init-elpa.el
@@ -105,6 +105,16 @@ ORIG-FN is called with ARGS and retried
             :around
             #'elpa-straight-with-retry)
 
+
+;; overrides
+
+(straight-override-recipe
+ '(org-roam
+   :type git
+   :host github
+   :repo "org-roam/org-roam"
+   :branch "v2"))
+
 
 ;; use-package
 

diff --git a/emacs/lisp/init-vino.el b/emacs/lisp/init-vino.el
@@ -41,7 +41,8 @@
   :straight (vino
              :type git
              :host github
-             :repo "d12frosted/vino")
+             :repo "d12frosted/vino"
+             :branch "feature/org-roam-v2")
   :defer t
   :general
   (leader-def

diff --git a/emacs/lisp/init-vulpea.el b/emacs/lisp/init-vulpea.el
@@ -48,7 +48,8 @@
   :straight (vulpea
              :type git
              :host github
-             :repo "d12frosted/vulpea")
+             :repo "d12frosted/vulpea"
+             :branch "feature/org-roam-v2")
   :general
   (leader-def
     "n" '(nil :which-key "vulpea...")
@@ -65,8 +66,7 @@
     "na" '(vulpea-alias-add :which-key "alias")
     "nA" '(vulpea-alias-delete :which-key "unalias"))
   :commands (vulpea-setup)
-  :hook ((after-init . vulpea-setup)
-         (before-save . vulpea-pre-save-hook))
+  :hook ((before-save . vulpea-pre-save-hook))
   :init
   (add-to-list 'window-buffer-change-functions #'vulpea-setup-buffer))
 
@@ -143,7 +143,7 @@
   (setq
    org-tag-persistent-alist '(("FOCUS" . ?f)
                               ("PROJECT" . ?p))
-   org-tags-exclude-from-inheritance '("PROJECT"))
+   org-use-tag-inheritance nil)
   :config
   ;; open directory links in `dired'
   (add-to-list 'org-file-apps '(directory . emacs))
@@ -298,11 +298,8 @@
 
 
 (use-package org-roam
-  :straight (org-roam
-             :type git
-             :host github
-             :repo "org-roam/org-roam")
   :defer t
+  :commands (org-roam-setup)
   :init
   (setq
    org-roam-directory vulpea-directory
@@ -323,9 +320,7 @@
    org-roam-graph-executable (executable-find "neato")
    org-roam-graph-extra-config '(("overlap" . "false")))
   :config
-  ;; v2 support
-  (when (fboundp 'org-roam-setup)
-    (org-roam-setup)))
+  (org-roam-setup))
 
 
 

diff --git a/emacs/lisp/lib-vulpea-agenda.el b/emacs/lisp/lib-vulpea-agenda.el
@@ -336,7 +336,7 @@ Refer to `org-agenda-prefix-format' for more information."
   (let* ((file-name (when buffer-file-name
                       (file-name-sans-extension
                        (file-name-nondirectory buffer-file-name))))
-         (title (car-safe (org-roam--extract-titles-title)))
+         (title (vulpea-buffer-prop-get "title"))
          (category (org-get-category))
          (result
           (or (if (and

diff --git a/emacs/lisp/lib-vulpea-buffer-prop.el b/emacs/lisp/lib-vulpea-buffer-prop.el