emacs/.emacs.d/config/init-completion.el

@@ -58,30 +58,28 @@ targets."
                (_ (key-binding prefix 'accept-default)))
            keymap)
          nil nil t))))
-  (defvar-keymap embark-straight-map
+  (embark-define-keymap embark-straight-map
-    :doc "Keymap for actions for straight.el"
+    "Keymap for actions for straight.el"
-    :parent embark-general-map
+    ("u" straight-visit-package-website)
-    "u" #'straight-visit-package-website
+    ("r" straight-get-recipe)
-    "r" #'straight-get-recipe
+    ("i" straight-use-package)
-    "i" #'straight-use-package
+    ("c" straight-check-package)
-    "c" #'straight-check-package
+    ("F" straight-pull-package)
-    "F" #'straight-pull-package
+    ("f" straight-fetch-package)
-    "f" #'straight-fetch-package
+    ("p" straight-push-package)
-    "p" #'straight-push-package
+    ("n" straight-normalize-package)
-    "n" #'straight-normalize-package
+    ("m" straight-merge-package))
-    "m" #'straight-merge-package)
   (add-to-list 'embark-keymap-alist '(straight . embark-straight-map))
-  (defvar-keymap embark-password-store-actions
+  (embark-define-keymap embark-password-store-actions
-    :doc "Keymap for actions for password-store."
+    "Keymap for actions for password-store."
-    :parent embark-general-map
+    ("c" password-store-copy)
-    "c" #'password-store-copy
+    ("f" password-store-copy-field)
-    "f" #'password-store-copy-field
+    ("i" password-store-insert)
-    "i" #'password-store-insert
+    ("I" password-store-generate)
-    "I" #'password-store-generate
+    ("r" password-store-rename)
-    "r" #'password-store-rename
+    ("e" password-store-edit)
-    "e" #'password-store-edit
+    ("k" password-store-remove)
-    "k" #'password-store-remove
+    ("U" password-store-url))
-    "U" #'password-store-url)
   (add-to-list 'embark-keymap-alist '(password-store . embark-password-store-actions))
   ;; Add identifiers in LSP-mode as their own target type
   (with-eval-after-load 'lsp-mode
@@ -90,15 +88,13 @@ targets."
         (when-let ((sym (embark-target-identifier-at-point)))
           (cons 'lsp-identifier (cdr sym)))))
     (add-to-list 'embark-target-finders 'embark-target-lsp-identifier-at-point)
-    (defun embark-lsp-execute-code-action (_target)
+    (embark-define-keymap embark-lsp-identifier-actions
-      "Ignores the target and calls lsp-execute-code-action."
+      "Keymap for actions on LSP identifiers."
-      (call-interactively #'lsp-execute-code-action))
+      :parent embark-identifier-map
-    (defvar-keymap embark-lsp-identifier-actions
+      ("a" lsp-execute-code-action)
-      :doc "Keymap for actions on LSP identifiers"
+      ("s" lsp-describe-thing-at-point))
-      :parent embark-general-map
-      "a" #'embark-lsp-execute-code-action
-      "h" #'lsp-describe-thing-at-point)
     (add-to-list 'embark-keymap-alist '(lsp-identifier . embark-lsp-identifier-actions))
+    (add-to-list 'embark-target-injection-hooks '(lsp-execute-code-action embark--ignore-target))
     (add-to-list 'embark-target-injection-hooks '(lsp-describe-thing-at-point embark--ignore-target)))
   (add-to-list 'embark-target-injection-hooks '(xref-find-references embark--ignore-target))
   :general

emacs/.emacs.d/config/init-java.el

@@ -8,10 +8,10 @@
   :custom
   (lsp-java-maven-download-sources t)
   (lsp-java-configuration-runtimes '[(:name "JavaSE-11"
-                                            :path "/Library/Java/JavaVirtualMachines/amazon-corretto-11.jdk/Contents/Home"
+                                            :path "/Library/Java/JavaVirtualMachines/amazon-corretto-11.jdk"
                                             :default t)
                                      (:name "JavaSE-17"
-                                            :path "/Library/Java/JavaVirtualMachines/amazon-corretto-17.jdk/Contents/Home")]))
+                                            :path "/Library/Java/JavaVirtualMachines/amazon-corretto-17.jdk")]))
 
 (defvar java-debug-map (make-sparse-keymap))
 (general-def java-mode-map

emacs/.emacs.d/config/init-org.el

@@ -11,6 +11,7 @@
   (add-hook 'org-mode-hook (lambda () (require 'org-attach)))
   :custom
   (org-agenda-files `(,(expand-file-name "~/org/todo.org")
+                      ,(expand-file-name "~/org/deft/unifydb.org")
                       ,(expand-file-name "~/org/lola-gcal.org")
                       ,(expand-file-name "~/org/personal-gcal.org")
                       ,(expand-file-name "~/org/j-n-gcal.org")))
@@ -21,8 +22,8 @@
                         "|"
                         "DONE(d)"
                         "CANCELLED(c)")))
-  (org-capture-templates `(("s" "Spotify task" entry
+  (org-capture-templates `(("l" "Lola task" entry
-                            (file+headline ,(expand-file-name "~/org/todo.org") "Spotify")
+                            (file+headline ,(expand-file-name "~/org/todo.org") "Lola")
                             "* TODO %i%?")
                            ("p" "Personal task" entry
                             (file+headline ,(expand-file-name "~/org/todo.org") "Personal")
@@ -66,8 +67,6 @@
   :custom
   (org-super-agenda-groups `((:name "In progress"
                                     :todo "IN PROGRESS")
-                             (:name "Spotify"
-                                    :tag "@spotify")
                              (:name "Lola"
                                     :tag "@lola")
                              (:name "unifyDB"

homebrew/Brewfile

@@ -23,7 +23,6 @@ brew "node"
 brew "pandoc"
 brew "pass"
 brew "pinentry-mac"
-brew "pipx"
 brew "plantuml"
 brew "pyenv"
 brew "python@3.9"
@@ -51,4 +50,3 @@ cask "rectangle"
 cask "slack"
 cask "spotify"
 cask "syncthing"
-cask "the-unarchiver"