From 8f719f331c6b71acb7daf0a96c7bf2e5105fd468 Mon Sep 17 00:00:00 2001 From: User Date: Sat, 20 Jun 2026 21:52:11 +0800 Subject: [PATCH] fix: Correct ibuffer occur grouping, add temperature parameter to Kimi API - Move `occur-mode` and `occur-edit-mode` from "Emacs" to "Search" ibuffer group - Add temperature parameter to Kimi API request - Remove `~` from electric-pair pairs - Change `multiple-cursors` config to use `:custom` - Fix duplicate `holiday` face definition in both base16 themes --- lisp/init-base.el | 7 ++++--- lisp/init-edit.el | 6 +++--- lisp/init-gptel.el | 2 +- lisp/my-base16-dark-theme.el | 1 - lisp/my-base16-light-theme.el | 1 - 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lisp/init-base.el b/lisp/init-base.el index 33a4e95..6152c71 100644 --- a/lisp/init-base.el +++ b/lisp/init-base.el @@ -183,7 +183,9 @@ (mode . grep-mode) (mode . rg-mode) (mode . xref--xref-buffer-mode) - (mode . xref-edit-mode))) + (mode . xref-edit-mode) + (mode . occur-mode) + (mode . occur-edit-mode))) ("Diff" (name . "^*Diff")) ("Emacs" (or (name . "^\\*Help\\*$") @@ -194,8 +196,7 @@ (name . "^*Buffer List*") (name . "\\*discomfort\\*") (mode . calendar-mode) - (mode . grep-mode) - (mode . occur-mode)))))) + (mode . grep-mode)))))) (add-hook 'ibuffer-hook (lambda () (ibuffer-switch-to-saved-filter-groups "Main") diff --git a/lisp/init-edit.el b/lisp/init-edit.el index e389607..2566d2b 100644 --- a/lisp/init-edit.el +++ b/lisp/init-edit.el @@ -13,12 +13,12 @@ (use-package elec-pair :config (setq electric-pair-inhibit-predicate 'electric-pair-conservative-inhibit - electric-pair-pairs (append '((?\~ . ?\~) (?\= . ?\=)) electric-pair-pairs))) + electric-pair-pairs (append '((?\= . ?\=)) electric-pair-pairs))) ;; multiple-cursors (use-package multiple-cursors - :config - (setq mc/insert-numbers-default 1)) + :custom + (mc/insert-numbers-default 1)) ;; crux，实用函数 (use-package crux) diff --git a/lisp/init-gptel.el b/lisp/init-gptel.el index f9c5f1a..a60ced1 100644 --- a/lisp/init-gptel.el +++ b/lisp/init-gptel.el @@ -129,7 +129,7 @@ from the last 1500 characters of the buffer." (auth-source-pick-first-password :host "api.kimi.com" :user "apikey")) :stream t :models '((kimi-for-coding)) - :request-params '(:thinking (:type "disabled")) + :request-params '(:temperature 0.6 :thinking (:type "disabled")) :header (lambda (_) (when-let ((key (gptel--get-api-key))) `(("User-Agent" . "RooCode/3.30.3") diff --git a/lisp/my-base16-dark-theme.el b/lisp/my-base16-dark-theme.el index 3245f86..a18a154 100644 --- a/lisp/my-base16-dark-theme.el +++ b/lisp/my-base16-dark-theme.el @@ -40,7 +40,6 @@ `(holiday ((,class (:underline (:style line :color ,yellow))))) `(cal-china-x-important-holiday-face ((,class (:underline (:style line :color ,red))))) `(cal-china-x-general-holiday-face ((,class (:underline (:style line :color ,yellow))))) - `(holiday ((,class (:underline (:style line :color ,yellow))))) `(markdown-header-face-1 ((,class (:foreground ,orange :height 1.0 :weight normal)))) `(markdown-header-face-2 ((,class (:foreground ,blue :height 1.0 :weight normal)))) `(markdown-header-face-3 ((,class (:foreground ,green :height 1.0 :weight normal)))) diff --git a/lisp/my-base16-light-theme.el b/lisp/my-base16-light-theme.el index b13d150..aefc302 100644 --- a/lisp/my-base16-light-theme.el +++ b/lisp/my-base16-light-theme.el @@ -40,7 +40,6 @@ `(holiday ((,class (:underline (:style line :color ,yellow))))) `(cal-china-x-important-holiday-face ((,class (:underline (:style line :color ,red))))) `(cal-china-x-general-holiday-face ((,class (:underline (:style line :color ,yellow))))) - `(holiday ((,class (:underline (:style line :color ,yellow))))) `(markdown-header-face-1 ((,class (:foreground ,orange :height 1.0 :weight normal)))) `(markdown-header-face-2 ((,class (:foreground ,blue :height 1.0 :weight normal)))) `(markdown-header-face-3 ((,class (:foreground ,green :height 1.0 :weight normal))))