From af50dc200cb88df58b69d2592f7780dc91c0d5eb Mon Sep 17 00:00:00 2001 From: Zedhugh Chen Date: Thu, 27 Oct 2022 01:27:20 +0800 Subject: [PATCH] remove init-tools.el --- init.el | 4 +- lisp/init-keybindings.el | 21 ++++++++++ lisp/init-rime.el | 26 +++++++++++++ lisp/init-sdcv.el | 22 +++++++++++ lisp/init-tools.el | 84 ---------------------------------------- lisp/init-yasnippet.el | 30 ++++++++++++++ 6 files changed, 102 insertions(+), 85 deletions(-) create mode 100644 lisp/init-rime.el create mode 100644 lisp/init-sdcv.el delete mode 100644 lisp/init-tools.el create mode 100644 lisp/init-yasnippet.el diff --git a/init.el b/init.el index 474e57e..5a276d8 100644 --- a/init.el +++ b/init.el @@ -111,7 +111,9 @@ If freezing sometimes, decrease it. If stuttering, increase it.") (require 'init-theme) (require 'init-vertico) (require 'init-keybindings) -(require 'init-tools) +(require 'init-rime) +(require 'init-sdcv) +(require 'init-yasnippet) (require 'init-ibuffer) (require 'init-which-key) (require 'init-editorconfig) diff --git a/lisp/init-keybindings.el b/lisp/init-keybindings.el index ca452e6..1e97579 100644 --- a/lisp/init-keybindings.el +++ b/lisp/init-keybindings.el @@ -1,5 +1,26 @@ ;; -*- coding: utf-8; lexical-binding: t; -*- +(require 'lazy-load) + +;;; expand-region +(lazy-load-local-keys + '(("v" . er/expand-region)) + creature/map "expand-region") + + +;;; rg +(lazy-load-global-keys + '(("C-c s" . rg-menu)) + "rg") + + +;;; avy +(lazy-load-local-keys + '(("jl" . avy-goto-line) + ("jw" . avy-goto-word-1)) + creature/map "avy") + + ;;; mwim (lazy-load-global-keys '(("C-a" . mwim-beginning-of-code-or-line) diff --git a/lisp/init-rime.el b/lisp/init-rime.el new file mode 100644 index 0000000..7c897c3 --- /dev/null +++ b/lisp/init-rime.el @@ -0,0 +1,26 @@ +;; -*- coding: utf-8; lexical-binding: t; -*- + +(require 'lazy-load) +(require 'rime) + + +(setq default-input-method "rime") +(setq rime-show-candidate 'posframe) +(setq rime-posframe-style 'simple) +(setq rime-posframe-fixed-position t) +(setq rime-disable-predicates + '(rime-predicate-prog-in-code-p + rime-predicate-hydra-p)) + +(lazy-load-set-keys + '(("M-i" . rime-force-enable)) + rime-mode-map) + +(lazy-load-set-keys + '(("M-i" . rime-inline-ascii) + ("M-o" . rime--backspace) + ("M-h" . rime--escape)) + rime-active-mode-map) + + +(provide 'init-rime) diff --git a/lisp/init-sdcv.el b/lisp/init-sdcv.el new file mode 100644 index 0000000..24d547a --- /dev/null +++ b/lisp/init-sdcv.el @@ -0,0 +1,22 @@ +;; -*- coding: utf-8; lexical-binding: t; -*- + +(require 'lazy-load) + + +(lazy-load-local-keys + '(("s" . sdcv-search-pointer)) + creature/map "sdcv") + +(with-eval-after-load 'sdcv + (setq sdcv-dictionary-data-dir (file-truename "~/.stardict/dic/")) + (setq sdcv-dictionary-simple-list + '("牛津英汉双解美化版" + "朗道英汉字典5.0" + "朗道汉英字典5.0")) + (setq sdcv-dictionary-complete-list + '("牛津英汉双解美化版" + "朗道英汉字典5.0" + "朗道汉英字典5.0"))) + + +(provide 'init-sdcv) diff --git a/lisp/init-tools.el b/lisp/init-tools.el deleted file mode 100644 index 1be0231..0000000 --- a/lisp/init-tools.el +++ /dev/null @@ -1,84 +0,0 @@ -;; -*- coding: utf-8; lexical-binding: t; -*- - -(require 'lazy-load) - - -(lazy-load-local-keys - '(("s" . sdcv-search-pointer)) - creature/map "sdcv") - -(with-eval-after-load 'sdcv - (setq sdcv-dictionary-data-dir (file-truename "~/.stardict/dic/")) - (setq sdcv-dictionary-simple-list - '("牛津英汉双解美化版" - "朗道英汉字典5.0" - "朗道汉英字典5.0")) - (setq sdcv-dictionary-complete-list - '("牛津英汉双解美化版" - "朗道英汉字典5.0" - "朗道汉英字典5.0"))) - - -(require 'yasnippet) -(require 'yasnippet-snippets) - -(defun fix-lisp-comment-snippets () - "Fix strange behavior about comment snippets in lisp." - (setq-local comment-start ";;")) - -(add-hook 'emacs-lisp-mode-hook #'fix-lisp-comment-snippets) - -(add-hook 'prog-mode-hook #'yas-minor-mode) - - -(lazy-load-global-keys - '(("w" . aya-create) - ("TAB" . aya-expand) - ("SPC" . aya-expand-from-history) - ("d" . aya-delete-from-history) - ("c" . aya-clear-history) - ("n" . aya-next-in-history) - ("p" . aya-previous-in-history) - ("s" . aya-persist-snippet) - ("o" . aya-open-line)) - "auto-yasnippet" "C-c C-y") - - -(require 'rime) - -(setq default-input-method "rime") -(setq rime-show-candidate 'posframe) -(setq rime-posframe-style 'simple) -(setq rime-posframe-fixed-position t) -(setq rime-disable-predicates - '(rime-predicate-prog-in-code-p - rime-predicate-hydra-p)) - -(lazy-load-set-keys - '(("M-i" . rime-force-enable)) - rime-mode-map) - -(lazy-load-set-keys - '(("M-i" . rime-inline-ascii) - ("M-o" . rime--backspace) - ("M-h" . rime--escape)) - rime-active-mode-map) - - -(lazy-load-local-keys - '(("v" . er/expand-region)) - creature/map "expand-region") - - -(lazy-load-global-keys - '(("C-c s" . rg-menu)) - "rg") - - -(lazy-load-local-keys - '(("jl" . avy-goto-line) - ("jw" . avy-goto-word-1)) - creature/map "avy") - - -(provide 'init-tools) diff --git a/lisp/init-yasnippet.el b/lisp/init-yasnippet.el new file mode 100644 index 0000000..c65e931 --- /dev/null +++ b/lisp/init-yasnippet.el @@ -0,0 +1,30 @@ +;; -*- coding: utf-8; lexical-binding: t; -*- + +(require 'lazy-load) +(require 'yasnippet) +(require 'yasnippet-snippets) + + +(defun fix-lisp-comment-snippets () + "Fix strange behavior about comment snippets in lisp." + (setq-local comment-start ";;")) + +(add-hook 'emacs-lisp-mode-hook #'fix-lisp-comment-snippets) + +(add-hook 'prog-mode-hook #'yas-minor-mode) + + +(lazy-load-global-keys + '(("w" . aya-create) + ("TAB" . aya-expand) + ("SPC" . aya-expand-from-history) + ("d" . aya-delete-from-history) + ("c" . aya-clear-history) + ("n" . aya-next-in-history) + ("p" . aya-previous-in-history) + ("s" . aya-persist-snippet) + ("o" . aya-open-line)) + "auto-yasnippet" "C-c C-y") + + +(provide 'init-yasnippet)