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)))
keymap)
nil nil t))))
(embark-define-keymap embark-straight-map
"Keymap for actions for straight.el"
("u" straight-visit-package-website)
("r" straight-get-recipe)
("i" straight-use-package)
("c" straight-check-package)
("F" straight-pull-package)
("f" straight-fetch-package)
("p" straight-push-package)
("n" straight-normalize-package)
("m" straight-merge-package))
(defvar-keymap embark-straight-map
:doc "Keymap for actions for straight.el"
:parent embark-general-map
"u" #'straight-visit-package-website
"r" #'straight-get-recipe
"i" #'straight-use-package
"c" #'straight-check-package
"F" #'straight-pull-package
"f" #'straight-fetch-package
"p" #'straight-push-package
"n" #'straight-normalize-package
"m" #'straight-merge-package)
(add-to-list 'embark-keymap-alist '(straight . embark-straight-map))
(embark-define-keymap embark-password-store-actions
"Keymap for actions for password-store."
("c" password-store-copy)
("f" password-store-copy-field)
("i" password-store-insert)
("I" password-store-generate)
("r" password-store-rename)
("e" password-store-edit)
("k" password-store-remove)
("U" password-store-url))
(defvar-keymap embark-password-store-actions
:doc "Keymap for actions for password-store."
:parent embark-general-map
"c" #'password-store-copy
"f" #'password-store-copy-field
"i" #'password-store-insert
"I" #'password-store-generate
"r" #'password-store-rename
"e" #'password-store-edit
"k" #'password-store-remove
"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
@ -88,13 +90,15 @@ 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)
(embark-define-keymap embark-lsp-identifier-actions
"Keymap for actions on LSP identifiers."
:parent embark-identifier-map
("a" lsp-execute-code-action)
("s" lsp-describe-thing-at-point))
(defun embark-lsp-execute-code-action (_target)
"Ignores the target and calls lsp-execute-code-action."
(call-interactively #'lsp-execute-code-action))
(defvar-keymap embark-lsp-identifier-actions
: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-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

View File

@ -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"
:path "/Library/Java/JavaVirtualMachines/amazon-corretto-11.jdk/Contents/Home"
:default t)
(: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))
(general-def java-mode-map

View File

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

View File

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