diff options
Diffstat (limited to 'config.el')
| -rw-r--r-- | config.el | 62 |
1 files changed, 54 insertions, 8 deletions
@@ -18,7 +18,7 @@ (setq custom-safe-themes t) -(setq doom-font (font-spec :family "Berkeley Mono" :size 12.0)) +(setq doom-font (font-spec :family "Berkeley Mono" :size 13.0)) (setq display-line-numbers-type t) @@ -66,14 +66,21 @@ :hook (prog-mode . eglot-ensure)) +(use-package! eglot-booster + :after eglot + :config (eglot-booster-mode)) + (after! eglot - (cl-defmethod eglot-register-capability - (server (method (eql workspace/didChangeWatchedFiles)) id &key watchers) - nil) + (cl-defmethod eglot-register-capability + ((_server eglot-lsp-server) + (method (eql workspace/didChangeWatchedFiles)) + _id + &key _watchers) + nil) (add-to-list 'eglot-server-programs '((typescript-ts-mode javascript-mode) - . ("oxlint" "--lsp")))) + . ("emacs-lsp-booster" "--" "oxlint" "--lsp")))) (setq eglot-sync-connect nil eglot-connect-timeout 60) @@ -109,7 +116,7 @@ '("oxfmt" "--config=.oxfmtrc.json" "--stdin-filepath" filepath)) (dolist (mode '(html-mode mhtml-mode web-mode css-mode)) - (setf (alist-get mode apheleia-mode-alist) 'oxfmt))) + (setf (alist-get mode apheleia-mode-alist) 'oxfmt))) (use-package! pinentry :config @@ -261,12 +268,49 @@ emms-cache-file (concat doom-cache-dir "emms-cache")) (map! :leader + :prefix "v" + :desc "vc-edit-next-command" "!" #'vc-edit-next-command + :desc "diff-hl-show-hunk" "*" #'diff-hl-show-hunk + :desc "vc-update" "+" #'vc-update + :desc "diff-hl-goto-hunk" "=" #'diff-hl-diff-goto-hunk + :desc "vc-revert" "@" #'vc-revert + :desc "vc-update-change-log" "a" #'vc-update-change-log + ;; ADD b BINDINGS (branch) + :desc "vc-dir" "d" #'vc-dir + :desc "vc-root-diff" "D" #'vc-root-diff + ;; ADD E BINDINGS + :desc "annotate" "g" #'vc-annotate + :desc "ignore" "G" #'vc-ignore + :desc "region history" "h" #'vc-region-history + :desc "register" "i" #'vc-register + :desc "root log incoming" "I" #'vc-root-log-incoming + :desc "print log" "l" #'vc-print-log + :desc "print root log" "L" #'vc-print-root-log + :desc "merge" "m" #'vc-merge + ;; ADD M BINDINGS + :desc "diff revert hunk" "n" #'diff-hl-revert-hunk + :desc "root log outgoing" "O" #'vc-root-log-outgoing + :desc "push" "p" #'vc-push ; originally P + :desc "retrieve tag" "r" #'vc-retrieve-tag + :desc "rename file" "R" #'vc-rename-file + :desc "create tag" "s" #'vc-create-tag + :desc "stage dwim (diff hl)" "S" #'diff-hl-stage-dwim + ;; ADD T BINDINGS + :desc "vc revert" "u" #'vc-revert ; carried over from the original bindings (repeated by @) + :desc "vc next action" "v" #'vc-next-action ; run the next logical action + ;; ADD w BINDINGS + :desc "revision other window" "~" #'vc-revision-other-window) + +(map! + :leader :prefix "g m" :desc "Status" "m" #'majutsu ; default majutsu buffer :desc "Describe" "d" #'majutsu-describe ; equivalent of 'jj describe' :desc "New" "n" #'majutsu-new ; new jj rev :desc "Push" "p" #'majutsu-git-push) ; push to git +(use-package! vc-jj) + (setq org-directory "~/org/") (after! org @@ -296,6 +340,8 @@ org-confirm-babel-evaluate nil) (add-hook 'org-src-mode-hook #'eglot-ensure) +(setq org-element-use-cache nil) + (add-hook 'org-capture-mode-hook #'delete-other-windows) (add-hook 'org-capture-mode-hook (lambda () (set-window-dedicated-p (selected-window) nil))) @@ -487,7 +533,7 @@ org-html-postamble nil)) (map! :leader - :prefix "d" + :prefix ("d" . "dired") :desc "Dired" "d" #'dired :desc "Dired here" "h" #'dired-jump) @@ -550,7 +596,7 @@ org-html-postamble nil)) "u" 'evil-forward-word-end "U" 'evil-forward-WORD-end "y" 'evil-forward-word-begin - "Y" 'evil-forward-word-begin) + "Y" 'evil-forward-WORD-begin) (with-eval-after-load 'evil-ex (define-key evil-ex-completion-map (kbd "C-l") 'left-word) |