Add new org cagture and fix diary

1 files changed, 39 insertions, 28 deletions

diff --git a/init.el b/init.el
index 87322f4..fab96da 100644
--- a/init.el
+++ b/init.el
@@ -133,6 +133,7 @@ Should be one of `:white-split', `:modified' or `:default'")
   (setq isearch-lax-whitespace t)
   (setq isearch-regexp-lax-whitespace t)
   (setq search-whitespace-regexp "[ \t\r\n]+")
+  (setq isearch-lazy-count t)
 
   ;; Set the initial gnus file.
   (setq gnus-init-file (expand-file-name "gnus.el" user-emacs-directory))
@@ -405,7 +406,7 @@ https://yannherklotz.com"))
 
 (use-package diary-lib
   :custom
-  (diary-file (ymh/expand-org-file "diary"))
+  (diary-file (ymh/expand-org-file "archive/diary"))
   (diary-date-forms diary-iso-date-forms)
   (diary-comment-start ";;")
   (diary-comment-end "")
@@ -658,7 +659,14 @@ https://yannherklotz.com"))
           ("m" "Meeting" entry (id "3d358b7c-e192-42f1-97ec-fd99cf8256b0")
            "* %? :meeting:
 %^{Meeting}T
-" :empty-lines 1))))
+" :empty-lines 1)
+          ("b" "Bookmarks for links")
+          ("bl" "Bookmark interesting items" item (file+headline ,(ymh/expand-org-file "links.org") "Interesting links")
+           "- %?
+")
+          ("br" "Bookmark for future reading" item (file+headline ,(ymh/expand-org-file "links.org") "To read")
+           "- %?
+"))))
 
 (use-package org-habit
   :after org)
@@ -1033,7 +1041,7 @@ https://yannherklotz.com"))
 (use-package hungry-delete
   :ensure t
   :custom
-  (hungry-delete-join-reluctantly t)
+  (hungry-delete-join-reluctantly t "Leave a space when hungry deleting.")
   :init
   (global-hungry-delete-mode))
 
@@ -1108,30 +1116,32 @@ https://yannherklotz.com"))
 
 (use-package elfeed
   :ensure t
+  :custom
+  (elfeed-feeds
+   '(("https://archlinux.org/feeds/news/" linux news)
+     ("https://haskellweekly.news/haskell-weekly.atom" haskell news)
+     ("https://planet.emacsen.org/atom.xml" emacs news)
+     ("https://feeds.feedburner.com/XahsEmacsBlog" blog emacs)
+     ("https://pragmaticemacs.com/feed" blog emacs)
+     ("https://sachachua.com/blog/feed" blog emacs)
+     ("http://comonad.com/reader/feed/" blog haskell)
+     ("https://blog.sumtypeofway.com/rss/" blog haskell)
+     ("https://drewdevault.com/blog/index.xml" blog opensource)
+     ("https://citizen428.net/index.xml" blog opensource)
+     ("https://dataswamp.org/~solene/rss.xml" blog opensource)
+     ("https://yannherklotz.com/index.xml" blog yann)
+     ("https://www.math.columbia.edu/~woit/wordpress/?feed=atom" blog math)
+     ("https://terrytao.wordpress.com/feed/" blog math)
+     ("https://mathbabe.org/feed/" blog math)
+     ("https://lamington.wordpress.com/feed/atom/" blog math)
+     ("https://totallydisconnected.wordpress.com/feed/atom/" blog math)
+     ("https://blogs.ethz.ch/kowalski/category/blogroll/feed/" blog math)
+     ("https://sbseminar.wordpress.com/feed/" blog math)
+     ("https://krystalguo.com/?feed=rss2" blog math)
+     ("https://scottaaronson.blog/?feed=rss2" blog math)
+     ("https://hnrss.org/frontpage" news)))
   :init
-  (setq-default elfeed-search-filter "@1-month-ago +unread ")
-  (setq elfeed-feeds
-        '(("https://archlinux.org/feeds/news/" linux news)
-          ("https://haskellweekly.news/haskell-weekly.atom" haskell news)
-          ("https://planet.emacsen.org/atom.xml" emacs news)
-          ("https://feeds.feedburner.com/XahsEmacsBlog" blog emacs)
-          ("https://pragmaticemacs.com/feed" blog emacs)
-          ("https://sachachua.com/blog/feed" blog emacs)
-          ("http://comonad.com/reader/feed/" blog haskell)
-          ("https://blog.sumtypeofway.com/rss/" blog haskell)
-          ("https://drewdevault.com/blog/index.xml" blog opensource)
-          ("https://citizen428.net/index.xml" blog opensource)
-          ("https://dataswamp.org/~solene/rss.xml" blog opensource)
-          ("https://yannherklotz.com/index.xml" blog yann)
-          ("https://www.math.columbia.edu/~woit/wordpress/?feed=atom" blog math)
-          ("https://terrytao.wordpress.com/feed/" blog math)
-          ("https://mathbabe.org/feed/" blog math)
-          ("https://lamington.wordpress.com/feed/atom/" blog math)
-          ("https://totallydisconnected.wordpress.com/feed/atom/" blog math)
-          ("https://blogs.ethz.ch/kowalski/category/blogroll/feed/" blog math)
-          ("https://sbseminar.wordpress.com/feed/" blog math)
-          ("https://krystalguo.com/?feed=rss2" blog math)
-          ("https://scottaaronson.blog/?feed=rss2" blog math))))
+  (setq-default elfeed-search-filter "@1-month-ago +unread "))
 
 (use-package markdown-mode
   :ensure t)
@@ -1150,7 +1160,7 @@ https://yannherklotz.com"))
               ("d" . darkroom-mode))
 ;;  :hook (text-mode . darkroom-tentative-mode)
   :custom
-  (darkroom-text-scale-increase 1))
+  (darkroom-text-scale-increase 1 "Increase the size of the text less."))
 
 (use-package org-ql
   :ensure t)
@@ -1265,7 +1275,8 @@ https://yannherklotz.com"))
 (use-package bbdb
   :ensure t
   :custom
-  (bbdb-phone-style 'none))
+  (bbdb-phone-style 'none "Remove American style for phone numbers.")
+  (bbdb-file (ymh/expand-org-file "bbdb") "Sync bbdb file in org repository."))
 
 (use-package bbdb-vcard
   :ensure t)