From 7886138f5b9de80756e2513b4fdbe79cce33d269 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Sun, 15 Sep 2019 13:17:35 +0900 Subject: [PATCH 1/4] Add support for org-journal Signed-off-by: Rudi Grinberg --- modules/config/default/+evil-bindings.el | 7 ++++++- modules/lang/org/config.el | 14 +++++++++++++- modules/lang/org/packages.el | 3 +++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 72a093a8e..a9a973d4f 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -707,7 +707,12 @@ :desc "Search org agenda headlines" "h" #'+default/org-notes-headlines :desc "Find file in notes" "n" #'+default/find-in-notes :desc "Browse notes" "N" #'+default/browse-notes - :desc "Org store link" "l" #'org-store-link) + :desc "Org store link" "l" #'org-store-link + + (:when (featurep! :lang org +journal) + (:prefix ("j" . "journal") + :desc "New Entry" "j" #'org-journal-new-entry + :desc "Search Forever" "s" #'org-journal-search-forever))) ;;; o --- open (:prefix-map ("o" . "open") diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index cad487db1..cdf7149f6 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -901,4 +901,16 @@ compelling reason, so..." org-clock-cancel) (org-clock-load)) :config - (add-hook 'kill-emacs-hook #'org-clock-save))) + (add-hook 'kill-emacs-hook #'org-clock-save)) + + (use-package! org-journal + :when (featurep! +journal) + :config + (map! :map org-journal-search-mode-map + :localleader + "n" #'org-journal-search-next + "p" #'org-journal-search-prev) + (map! :map org-journal-mode-map + :localleader + "n" #'org-journal-open-next-entry + "p" #'org-journal-open-previous-entry))) diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index b085c68b7..db46d566e 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -49,3 +49,6 @@ (package! centered-window :recipe (:host github :repo "anler/centered-window-mode")) (package! org-tree-slide) (package! ox-reveal)) + +(when (featurep! +journal) + (package! org-journal)) From 594e38fd47c7f7263efe595c288480b36ed1ac47 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 18 Sep 2019 13:29:06 +0900 Subject: [PATCH 2/4] Move org-journal config to contrib Signed-off-by: Rudi Grinberg --- modules/lang/org/config.el | 14 +------------- modules/lang/org/contrib/journal.el | 13 +++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 modules/lang/org/contrib/journal.el diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index cdf7149f6..cad487db1 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -901,16 +901,4 @@ compelling reason, so..." org-clock-cancel) (org-clock-load)) :config - (add-hook 'kill-emacs-hook #'org-clock-save)) - - (use-package! org-journal - :when (featurep! +journal) - :config - (map! :map org-journal-search-mode-map - :localleader - "n" #'org-journal-search-next - "p" #'org-journal-search-prev) - (map! :map org-journal-mode-map - :localleader - "n" #'org-journal-open-next-entry - "p" #'org-journal-open-previous-entry))) + (add-hook 'kill-emacs-hook #'org-clock-save))) diff --git a/modules/lang/org/contrib/journal.el b/modules/lang/org/contrib/journal.el new file mode 100644 index 000000000..e8506a0c9 --- /dev/null +++ b/modules/lang/org/contrib/journal.el @@ -0,0 +1,13 @@ +;;; lang/org/contrib/journal.el -*- lexical-binding: t; -*- + +(use-package! org-journal + :when (featurep! +journal) + :config + (map! :map org-journal-search-mode-map + :localleader + "n" #'org-journal-search-next + "p" #'org-journal-search-prev) + (map! :map org-journal-mode-map + :localleader + "n" #'org-journal-open-next-entry + "p" #'org-journal-open-previous-entry)) From aa1d2f5d51781bc4d52004106b66bb2c45e1b5a3 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 18 Sep 2019 13:29:51 +0900 Subject: [PATCH 3/4] org-journal: defer config Signed-off-by: Rudi Grinberg --- modules/lang/org/contrib/journal.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/lang/org/contrib/journal.el b/modules/lang/org/contrib/journal.el index e8506a0c9..56b4d2249 100644 --- a/modules/lang/org/contrib/journal.el +++ b/modules/lang/org/contrib/journal.el @@ -1,6 +1,7 @@ ;;; lang/org/contrib/journal.el -*- lexical-binding: t; -*- (use-package! org-journal + :defer t :when (featurep! +journal) :config (map! :map org-journal-search-mode-map From baf9b3bc874fbe0de2d583fb9c3f514fbfdea66c Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 18 Sep 2019 13:30:26 +0900 Subject: [PATCH 4/4] Use cookie for journal feature check The :when option in the use-package clause is then removed Signed-off-by: Rudi Grinberg --- modules/lang/org/contrib/journal.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/org/contrib/journal.el b/modules/lang/org/contrib/journal.el index 56b4d2249..ee9be68b3 100644 --- a/modules/lang/org/contrib/journal.el +++ b/modules/lang/org/contrib/journal.el @@ -1,8 +1,8 @@ ;;; lang/org/contrib/journal.el -*- lexical-binding: t; -*- +;;;###if (featurep! +journal) (use-package! org-journal :defer t - :when (featurep! +journal) :config (map! :map org-journal-search-mode-map :localleader