From f115e70b115e8f0c6380c5917a9649e5b2545444 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sun, 7 Mar 2021 04:05:53 +0000
Subject: jao-org-notes: fix for capture template and keybindings

---
 exwm.org                 | 4 ++--
 init.org                 | 4 ++--
 lib/org/jao-org-notes.el | 2 +-
 org.org                  | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/exwm.org b/exwm.org
index c0c5670..0ffe0cb 100644
--- a/exwm.org
+++ b/exwm.org
@@ -418,8 +418,8 @@
     (pretty-hydra-define jao-hydra-exwm
       (global-map "s-w" :color blue :quit-key "q")
       ("Notes"
-       (("n" org-roam-capture "capture note")
-        ("N" org-roam-find-file-immediate "go to note"))
+       (("n" jao-org-notes-open-or-create "capture note")
+        ("N" jao-org-notes-open "go to note"))
        "Packages"
        (("a" jao-vterm-aptitude "aptitude")
         ("l" jao-exwm-paradox "package list")
diff --git a/init.org b/init.org
index e1b3347..1338a34 100644
--- a/init.org
+++ b/init.org
@@ -4219,8 +4219,8 @@
 
     (pretty-hydra-define jao-hydra-emacs-utils (:color blue :quit-key "q")
       ("Notes"
-       (("n" org-roam-capture "capture note")
-        ("N" org-roam-find-file-immediate "go to note"))
+       (("n" jao-org-notes-open-or-create "capture note")
+        ("N" jao-org-notes-open "go to note"))
        "Packages"
        (("a" jao-vterm-aptitude "aptitude")
         ("l" (progn (jao-afio--goto-scratch) (list-packages)) "package list")
diff --git a/lib/org/jao-org-notes.el b/lib/org/jao-org-notes.el
index 9cc343f..621ac12 100644
--- a/lib/org/jao-org-notes.el
+++ b/lib/org/jao-org-notes.el
@@ -103,7 +103,7 @@
   (insert "\n"))
 
 (defun jao-org-notes--template (k)
-  `(,k "Note" plain (file jao-org-notes-open) "\n- %a "
+  `(,k "Note" plain (file jao-org-notes-open-or-create) "\n- %a "
        :immediate-finish t :jump-to-captured t))
 
 ;;;###autoload
diff --git a/org.org b/org.org
index 0e300ec..993c6b3 100644
--- a/org.org
+++ b/org.org
@@ -211,8 +211,8 @@
 * Notes
   #+begin_src emacs-lisp
     (use-package jao-org-notes
+      :commands (jao-org-notes-setup)
       :config
-      (jao-org-notes-setup "n")
       (major-mode-hydra-define+ org-mode ()
         ("Notes"
          (("i" jao-org-notes-insert-link "insert link")
@@ -221,6 +221,7 @@
           ("v" jao-org-notes-backlinks "show backlinks"))))
       :bind (("C-c n" . jao-org-notes-open-or-create)
              ("C-c N" . jao-org-notes-open)))
+    (jao-org-notes-setup "n")
   #+end_src
 * Links
   #+begin_src emacs-lisp
-- 
cgit v1.2.3