Skip to content

Commit

Permalink
2022-11-24 17:29:17
Browse files Browse the repository at this point in the history
  • Loading branch information
gcclll committed Nov 24, 2022
1 parent 5135e90 commit d1eafb6
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion custom.el
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'(fanyi-providers
'(fanyi-haici-provider fanyi-youdao-thesaurus-provider fanyi-etymon-provider fanyi-longman-provider))
'(package-selected-packages
'(magit restclient dockerfile-mode httprepl devdocs dash-at-point uuidgen link-hint crux hydra web-mode emmet-mode json-mode typescript-mode js2-mode youdao-dictionary fanyi yasnippet-snippets yasnippet markdown-mode evil posframe toggle-one-window winum visual-regexp-steroids visual-regexp wgrep consult-yasnippet consult-projectile consult-org-roam consult-notes consult-ls-git consult-flycheck consult-dir engine-mode flycheck format-all cargo rust-mode lua-mode go-mode php-mode python-mode yaml-imenu yaml-mode persp-projectile perspective git-modes git-timemachine git-gutter blamer diredfl editorconfig move-text symbol-overlay hungry-delete smartparens expand-region nvm fancy-dabbrev scss-mode orderless embark-consult embark all-the-icons-completion marginalia general evil-surround evil-nerd-commenter which-key rainbow-mode rainbow-delimiters highlight-parentheses all-the-icons-dired all-the-icons exec-path-from-shell exec-path-from-shel vterm-toggle multi-vterm vterm window-numbering rime org-roam-ui org-roam org-special-block-extras org-download org-fragtog org-mac-link org-superstar org-appear evil-org svg-tag-mode org-super-agenda treemacs-tab-bar treemacs-persp treemacs-magit treemacs-icons-dired treemacs-projectile treemacs-evil treemacs diminish use-package)))
'(consult-project-extra js-doc toggle-one-window winum visual-regexp-steroids visual-regexp wgrep consult-yasnippet consult-projectile consult-org-roam consult-notes consult-ls-git consult-flycheck consult-dir engine-mode flycheck format-all cargo rust-mode lua-mode go-mode php-mode python-mode yaml-imenu yaml-mode persp-projectile perspective git-modes git-timemachine git-gutter blamer diredfl editorconfig move-text symbol-overlay hungry-delete smartparens expand-region nvm fancy-dabbrev scss-mode orderless embark-consult embark all-the-icons-completion marginalia general evil-surround evil-nerd-commenter which-key rainbow-mode rainbow-delimiters highlight-parentheses all-the-icons-dired all-the-icons exec-path-from-shell exec-path-from-shel vterm-toggle multi-vterm vterm window-numbering rime org-roam-ui org-roam org-special-block-extras org-download org-fragtog org-mac-link org-superstar org-appear evil-org svg-tag-mode org-super-agenda treemacs-tab-bar treemacs-persp treemacs-magit treemacs-icons-dired treemacs-projectile treemacs-evil treemacs diminish use-package)))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
Expand Down
5 changes: 5 additions & 0 deletions site-lisp/config/init-consult.el
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,9 @@

(use-package consult-yasnippet)

(use-package consult-project-extra
:bind
(("C-c p ," . consult-project-extra-find)
("C-c p ." . consult-project-extra-find-other-window)))

(provide 'init-consult)
2 changes: 0 additions & 2 deletions site-lisp/config/init-evil.el
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
(evil-global-set-key 'motion "+" 'org-increase-number-at-point)

(evil-global-set-key 'normal (kbd "gm") 'magit)
(evil-global-set-key 'normal (kbd "gd") 'xref-find-definitions)
(evil-global-set-key 'normal (kbd "gb") 'xref-pop-marker-stack)
(evil-global-set-key 'normal (kbd "gc") 'show-commit-and-preserve-window)

(evil-global-set-key 'normal (kbd "cc") 'evilnc-copy-and-comment-lines)
Expand Down
3 changes: 2 additions & 1 deletion site-lisp/config/init-general.el
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"`" 'multi-vterm-project
)


;; 可以定制 SPC <key1> <key2> ...
(defmacro +general-global-menu! (name infix-key &rest body)
"Create a definer named +general-global-NAME wrapping global-definer.
Expand Down Expand Up @@ -181,6 +180,8 @@
"C-c i y" 'consult-yasnippet
"C-c i t" 'gcl/insert-current-time
"C-c i d" 'gcl/insert-standard-date
"C-c i f" 'js-doc-insert-function-doc
"C-c i F" 'js-doc-insert-file-doc

;; C-c g, git
;; ...
Expand Down
7 changes: 6 additions & 1 deletion site-lisp/config/init-lsp-bridge.el
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@
"C-9" 'lsp-bridge-find-references
"C-0" 'lsp-bridge-rename)

(evil-set-initial-state 'lsp-bridge-ref-mode 'emacs)
(with-eval-after-load 'evil
(evil-global-set-key 'normal (kbd "gd") 'lsp-bridge-jump)
(evil-global-set-key 'normal (kbd "gb") 'lsp-bridge-jump-back)
(evil-global-set-key 'normal (kbd "gf") 'lsp-bridge-find-references)
(evil-set-initial-state 'lsp-bridge-ref-mode 'emacs)
)

(provide 'init-lsp-bridge)
6 changes: 6 additions & 0 deletions site-lisp/config/init-org.el
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,12 @@
(file+head "reference/${title}.org" "#+title: ${title}\n")
:immediate-finish t
:unnarrowed t)
("o" "others" plain "%?"
:if-new
(file+head "others/${title}.org"
"#+title: ${title}\n#+created: %U\n#+filetags: :others:\n#+startup: overview hideblocks")
:immediate-finish t
:unnarrowed t)
("v" "vue" plain "%?"
:if-new
(file+head "vue/${title}.org"
Expand Down
8 changes: 8 additions & 0 deletions site-lisp/config/init-web.el
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,12 @@
;; (add-to-list 'lsp-language-id-configuration '(web-mode . "vue"))
)

;; --- js-doc
(use-package js-doc
:config
(setq js-doc-mail-address user-mail-address
js-doc-author (format "<%s> <%s>" user-full-name js-doc-mail-address)
js-doc-url user-blog-url
js-doc-license "MIT"))

(provide 'init-web)

0 comments on commit d1eafb6

Please sign in to comment.