Compare commits

..

4 Commits

4 changed files with 39 additions and 32 deletions

View File

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

View File

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

View File

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

View File

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