oni-core.el

@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2023.0615.233447
+;; Version: 2023.0525.151855
 ;; Package-Requires: (oni-data-dir oni-embrace oni-hydra expand-region multiple-cursors gcmh diminish ws-butler which-key insert-char-preview mixed-pitch ace-window vertico marginalia orderless consult embark docstr mini-frame)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -432,8 +432,6 @@ _s_: String list"
 (global-set-key (kbd "M-8") (keymap-lookup global-map "C-x 8"))
 (global-set-key (kbd "C-x 8") (lambda () (interactive) (error "Use M-8 instead")))
 
-(global-set-key (kbd "M-8 l") "λ")
-
 (defun oni-core-related-files ()
   "Return a list of files related to the current buffer."
   (let* ((jumpers related-files-jumpers)

oni-grep.el

@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2023.0615.232817
+;; Version: 2021.1123.003553
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -47,7 +47,5 @@
 
 (add-to-list 'grep-find-ignored-directories ".cask")
 
-(add-hook 'grep-mode-hook 'hl-line-mode)
-
 (provide 'oni-grep)
 ;;; oni-grep.el ends here

oni-org/oni-org.el

@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2023.0621.002708
+;; Version: 2023.0613.234632
 ;; Package-Requires: (oni-yasnippet oni-alert oni-hydra org org-bullets org-edna diminish all-the-icons olivetti form-feed org-pretty-table)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -1162,25 +1162,7 @@ This is done by adding a ‘:hidden t’ header argument to the code block."
                                                          ,(/ (length text) 2)))))
           text))
 
-(defmacro oni-org--map-put (collection key value)
+(setf (map-elt org-agenda-custom-commands "o")
-  "The result of ‘(setf (map-elt ...) ...)’ on a list.
-Trying to byte-compile the above form doesn't work at the moment.
-This is a temporary hack to make sure I don't have to repeat this
-same code all the time."
-  (declare (indent 2))
-  (let ((key-name (gensym))
-        (value-name (gensym)))
-    `(let ((,key-name ,key)
-           (,value-name ,value))
-       (condition-case nil
-           (with-no-warnings
-             (map-put! ,collection ,key-name ,value-name nil))
-         (map-not-inplace
-          (setq ,collection
-                (map-insert ,collection ,key-name ,value-name))
-          ,value-name)))))
-
-(oni-org--map-put org-agenda-custom-commands "o"
       '("Overview" ((tags-todo "TODO=\"WAITING\""
                                ((org-agenda-overriding-header (oni-org--center-align "Waiting"))))
                     (tags-todo "TODO=\"WIP\""
@@ -1199,7 +1181,7 @@ same code all the time."
                                ((org-agenda-max-todos 5)
                                 (org-agenda-overriding-header (oni-org--center-align "Listen")))))))
 
-(oni-org--map-put org-agenda-custom-commands "t"
+(setf (map-elt org-agenda-custom-commands "t")
       '("To Do" ((tags-todo "TODO=\"WAITING\"+#todo"
                             ((org-agenda-overriding-header (oni-org--center-align "Waiting To Do"))))
                  (tags-todo "TODO=\"WIP\"+#todo"
@@ -1207,7 +1189,7 @@ same code all the time."
                  (tags-todo "TODO=\"TODO\"+#todo"
                             ((org-agenda-overriding-header (oni-org--center-align "To Do")))))))
 
-(oni-org--map-put org-agenda-custom-commands "r"
+(setf (map-elt org-agenda-custom-commands "r")
       '("Reading" ((tags-todo "TODO=\"WAITING\"+#reading"
                               ((org-agenda-overriding-header (oni-org--center-align "Waiting To Read"))))
                    (tags-todo "TODO=\"WIP\"+#reading"
@@ -1215,7 +1197,7 @@ same code all the time."
                    (tags-todo "TODO=\"TODO\"+#reading"
                               ((org-agenda-overriding-header (oni-org--center-align "To Read")))))))
 
-(oni-org--map-put org-agenda-custom-commands "w"
+(setf (map-elt org-agenda-custom-commands "w")
       '("Watching" ((tags-todo "TODO=\"WAITING\"+#watching"
                                ((org-agenda-overriding-header (oni-org--center-align "Waiting To Watch"))))
                     (tags-todo "TODO=\"WIP\"+#watching"
@@ -1223,7 +1205,7 @@ same code all the time."
                     (tags-todo "TODO=\"TODO\"+#watching"
                                ((org-agenda-overriding-header (oni-org--center-align "To Watch")))))))
 
-(oni-org--map-put org-agenda-custom-commands "l"
+(setf (map-elt org-agenda-custom-commands "l")
       '("Listening" ((tags-todo "TODO=\"WAITING\"+#listening"
                                 ((org-agenda-overriding-header (oni-org--center-align "Waiting To Listen To"))))
                      (tags-todo "TODO=\"WIP\"+#listening"
@@ -1231,7 +1213,7 @@ same code all the time."
                      (tags-todo "TODO=\"TODO\"+#listening"
                                 ((org-agenda-overriding-header (oni-org--center-align "To Listen To")))))))
 
-(oni-org--map-put org-capture-templates "sE"
+(setf (map-elt org-capture-templates "sE")
       '("Questions for Emacs packages" plain (function ignore)
         "- Do I want to integrate this in my configuration?
   - %?
@@ -1242,31 +1224,31 @@ same code all the time."
         :empty-lines 1
         :immediate-finish t
         :jump-to-captured t))
-(oni-org--map-put org-capture-templates-contexts "sE"
+(setf (map-elt org-capture-templates-contexts "sE")
       '(((in-mode . "org-mode"))))
 
-(oni-org--map-put org-capture-templates "se"
+(setf (map-elt org-capture-templates "se")
       '("Questions for Emacs articles" plain (function ignore)
         "- What can I add to my config from this?
   - %?"
         :empty-lines 1
         :immediate-finish t
         :jump-to-captured t))
-(oni-org--map-put org-capture-templates-contexts "se"
+(setf (map-elt org-capture-templates-contexts "se")
       '(((in-mode . "org-mode"))))
 
-(oni-org--map-put org-capture-templates "s"
+(setf (map-elt org-capture-templates "s")
       '("Snippets"))
-(oni-org--map-put org-capture-templates-contexts "s"
+(setf (map-elt org-capture-templates-contexts "s")
       '(((in-mode . "org-mode"))))
 
-(oni-org--map-put org-capture-templates "t"
+(setf (map-elt org-capture-templates "t")
       '("A simple TODO item." entry (file "") "* TODO %?
 :PROPERTIES:
 :CREATED:  %U
 :END:"))
 
-(oni-org--map-put org-capture-templates "U"
+(setf (map-elt org-capture-templates "U")
       '("A TODO capture from the browser." entry (file "") "* TODO %:description
 :PROPERTIES:
 :CREATED:  %U