From ddd2ba4905d20fa899a864185d86612744c05d20 Mon Sep 17 00:00:00 2001 From: User Date: Thu, 2 Jul 2026 17:36:06 +0800 Subject: [PATCH] style: Convert tabs to spaces across Emacs config --- init.el | 4 +- lisp/fix-dirvish-preview.el | 2 +- lisp/init-base.el | 190 +++++++++++++++++----------------- lisp/init-completion.el | 46 ++++---- lisp/init-dashboard.el | 14 +-- lisp/init-dired.el | 76 +++++++------- lisp/init-edit.el | 52 +++++----- lisp/init-elpa.el | 2 +- lisp/init-exwm.el | 54 +++++----- lisp/init-gptel.el | 8 +- lisp/init-kbd-func.el | 52 +++++----- lisp/init-kbd.el | 8 +- lisp/init-org.el | 88 ++++++++-------- lisp/init-package.el | 52 +++++----- lisp/init-prog.el | 4 +- lisp/init-segmentation.el | 16 +-- lisp/init-startup.el | 5 +- lisp/init-terminal-kbd.el | 2 +- lisp/init-terminal-package.el | 28 ++--- lisp/init-terminal-startup.el | 2 + lisp/init-ui.el | 34 +++--- lisp/init-window.el | 20 ++-- lisp/my-dark-theme.el | 2 +- lisp/my-light-theme.el | 2 +- 24 files changed, 384 insertions(+), 379 deletions(-) diff --git a/init.el b/init.el index 15fd42c..28794c2 100644 --- a/init.el +++ b/init.el @@ -1,4 +1,4 @@ -;;; init.el --- init.el -*- lexical-binding: t -*- +;;; init.el --- init.el -*- lexical-binding: t -*- ;;; Commentary: ;; trogloxene's Emacs @@ -6,7 +6,7 @@ ;;; Code: (add-to-list 'load-path - (expand-file-name (concat user-emacs-directory "lisp"))) + (expand-file-name (concat user-emacs-directory "lisp"))) (setq custom-file (expand-file-name "custom.el" user-emacs-directory)) (load custom-file t) diff --git a/lisp/fix-dirvish-preview.el b/lisp/fix-dirvish-preview.el index f0e98ef..05bd933 100644 --- a/lisp/fix-dirvish-preview.el +++ b/lisp/fix-dirvish-preview.el @@ -1,4 +1,4 @@ -;;; fix-dirvish-preview.el --- fix dirvish preview on windows -*- lexical-binding: t -*- +;;; fix-dirvish-preview.el --- fix dirvish preview on windows -*- lexical-binding: t -*- ;;; Commentary: ;; Fix video-mtn preview issue on Windows diff --git a/lisp/init-base.el b/lisp/init-base.el index 19d0c66..085bee2 100644 --- a/lisp/init-base.el +++ b/lisp/init-base.el @@ -38,7 +38,7 @@ :demand t :hook (emacs-startup . (lambda () - (unless (server-running-p) + (unless (server-running-p) (server-mode 1))))) ;; recentf，最近打开的文件 @@ -50,9 +50,9 @@ (setq recentf-max-saved-items 30) :config (if *is-android* - (add-to-list 'recentf-exclude "~/storage/shared/my-org-note/journal/.*\\.org\\'") - (add-to-list 'recentf-exclude "~/org/my-org-note/journal/.*\\.org\\'") - (add-to-list 'recentf-exclude "~/org/my-org-note/20260509T232442==agenda--all-my-todos__org\\.org")) + (add-to-list 'recentf-exclude "~/storage/shared/my-org-note/journal/.*\\.org\\'") + (add-to-list 'recentf-exclude "~/org/my-org-note/journal/.*\\.org\\'") + (add-to-list 'recentf-exclude "~/org/my-org-note/20260509T232442==agenda--all-my-todos__org\\.org")) (add-to-list 'recentf-exclude "~/.emacs.d/emms/history") (add-to-list 'recentf-exclude "~/.emacs.d/bookmarks"))) @@ -62,13 +62,13 @@ (after-init . savehist-mode) :init (setq enable-recursive-minibuffers t - history-length 50 - savehist-additional-variables '(mark-ring - global-mark-ring - search-ring - regexp-search-ring - extended-command-history) - savehist-autosave-interval 300)) + history-length 50 + savehist-additional-variables '(mark-ring + global-mark-ring + search-ring + regexp-search-ring + extended-command-history) + savehist-autosave-interval 300)) ;; saveplace，保存光标位置 (use-package saveplace @@ -107,105 +107,105 @@ (use-package ibuffer :config (setq ibuffer-saved-filter-groups - '(("Main" - ("App" (mode . exwm-mode)) - ("Scratch" (or - (name . "^*scratch"))) - ("eww" (or - (mode . eww-mode) - (mode . eww-bookmark-mode) - (mode . eww-buffers-mode) - (mode . eww-history-mode))) - ("Calc" (or - (mode . calc-mode) - (mode . calc-trail-mode))) - ("Shell" (or - (mode . eshell-mode) - (mode . eat-mode) - (mode . vterm-mode))) - ("Scripts" (or + '(("Main" + ("App" (mode . exwm-mode)) + ("Scratch" (or + (name . "^*scratch"))) + ("eww" (or + (mode . eww-mode) + (mode . eww-bookmark-mode) + (mode . eww-buffers-mode) + (mode . eww-history-mode))) + ("Calc" (or + (mode . calc-mode) + (mode . calc-trail-mode))) + ("Shell" (or + (mode . eshell-mode) + (mode . eat-mode) + (mode . vterm-mode))) + ("Scripts" (or (mode . shell-script-mode) (mode . shell-mode) (mode . sh-mode) (mode . lua-mode) (mode . bat-mode))) - ("Config" (or - (mode . conf-mode) - (mode . conf-desktop-mode) - (mode . conf-toml-mode) - (mode . conf-xdefaults-mode))) - ("Elisp" (mode . emacs-lisp-mode)) - ("Scheme" (or - (mode . scheme-mode))) - ("Geiser" (or - (name . "^Geiser") - (mode . geiser-repl-mode) - (mode . geiser-debug-mode) - (mode . geiser-messages-mode) - (mode . geiser-debug-mode) - (mode . geiser-doc-mode) - (mode . geiser-autodoc-mode))) - ("gptel" (or - (name . "^\\*gptel"))) - ("Common-lisp" (or - (mode . common-lisp-mode) - (mode . lisp-mode))) - ("Sly" (or - (mode . lisp-data-mode) - (mode . sly-db-mode) - (mode . sly-mrepl-mode) - (name . "\\*sly-compilation\\*") - (name . "^\\*img-cache\\*"))) - ("Text" (or - (mode . org-mode) - (mode . markdown-mode) - (name . "^\\*\\[D\\] FILE backlinks for"))) - ("Help" (or - (mode . help-mode) - (mode . helpful-mode))) - ("Info" (or - (name . "^\\*info"))) - ("Magit" (or + ("Config" (or + (mode . conf-mode) + (mode . conf-desktop-mode) + (mode . conf-toml-mode) + (mode . conf-xdefaults-mode))) + ("Elisp" (mode . emacs-lisp-mode)) + ("Scheme" (or + (mode . scheme-mode))) + ("Geiser" (or + (name . "^Geiser") + (mode . geiser-repl-mode) + (mode . geiser-debug-mode) + (mode . geiser-messages-mode) + (mode . geiser-debug-mode) + (mode . geiser-doc-mode) + (mode . geiser-autodoc-mode))) + ("gptel" (or + (name . "^\\*gptel"))) + ("Common-lisp" (or + (mode . common-lisp-mode) + (mode . lisp-mode))) + ("Sly" (or + (mode . lisp-data-mode) + (mode . sly-db-mode) + (mode . sly-mrepl-mode) + (name . "\\*sly-compilation\\*") + (name . "^\\*img-cache\\*"))) + ("Text" (or + (mode . org-mode) + (mode . markdown-mode) + (name . "^\\*\\[D\\] FILE backlinks for"))) + ("Help" (or + (mode . help-mode) + (mode . helpful-mode))) + ("Info" (or + (name . "^\\*info"))) + ("Magit" (or (mode . magit-blame-mode) (mode . magit-cherry-mode) (mode . magit-diff-mode) (mode . magit-log-mode) (mode . magit-process-mode) (mode . magit-status-mode) - (mode . magit-revision-mode) - (mode . magit-refs-mode))) - ("Directories" (or - (mode . dired-mode) - (name . "^*dirvish"))) - ("Grep" (or - (mode . grep-mode) - (mode . rg-mode) - (mode . xref--xref-buffer-mode) - (mode . xref-edit-mode) - (mode . occur-mode) - (mode . occur-edit-mode))) - ("Diff" (name . "^*Diff")) - ("Emacs" (or + (mode . magit-revision-mode) + (mode . magit-refs-mode))) + ("Directories" (or + (mode . dired-mode) + (name . "^*dirvish"))) + ("Grep" (or + (mode . grep-mode) + (mode . rg-mode) + (mode . xref--xref-buffer-mode) + (mode . xref-edit-mode) + (mode . occur-mode) + (mode . occur-edit-mode))) + ("Diff" (name . "^*Diff")) + ("Emacs" (or (name . "^\\*Help\\*$") (name . "^\\*Custom.*") (name . "^\\*EMMS Playlist\\*") (name . "^\\*Messages\\*$") - (name . "*Chinese-word-segmentation*") - (name . "^*Buffer List*") - (name . "\\*discomfort\\*") - (mode . calendar-mode) - (mode . grep-mode) - (mode . proced-mode) - (mode . syncthing-mode)))))) + (name . "*Chinese-word-segmentation*") + (name . "^*Buffer List*") + (name . "\\*discomfort\\*") + (mode . calendar-mode) + (mode . grep-mode) + (mode . proced-mode) + (mode . syncthing-mode)))))) (add-hook 'ibuffer-hook - (lambda () (ibuffer-switch-to-saved-filter-groups "Main") - (unless (eq ibuffer-sorting-mode 'alphabetic) - (ibuffer-do-sort-by-alphabetic)))) + (lambda () (ibuffer-switch-to-saved-filter-groups "Main") + (unless (eq ibuffer-sorting-mode 'alphabetic) + (ibuffer-do-sort-by-alphabetic)))) (setq ibuffer-show-empty-filter-groups nil - ibuffer-use-other-window t - ibuffer-default-sorting-mode 'filename)) + ibuffer-use-other-window t + ibuffer-default-sorting-mode 'filename)) (use-package simple :straight nil @@ -213,8 +213,8 @@ (after-init . size-indication-mode) (after-init . column-number-mode) :config - (setq kill-whole-line t ;kill-line删除换行符 - set-mark-command-repeat-pop t)) ;更方便地pop mark + (setq kill-whole-line t ;kill-line删除换行符 + set-mark-command-repeat-pop t)) ;更方便地pop mark ;; 滚动 (unless *is-mac* @@ -224,10 +224,10 @@ (after-init . pixel-scroll-precision-mode) :init (setq scroll-preserve-screen-position t - scroll-conservatively 101) + scroll-conservatively 101) :config (advice-add 'pixel-scroll-precision :around - (lambda (orig event) + (lambda (orig event) (cl-letf (((symbol-function 'device-class) (lambda (&rest _) 'mouse))) (funcall orig event)))))) diff --git a/lisp/init-completion.el b/lisp/init-completion.el index 2dfb7a4..072fce1 100644 --- a/lisp/init-completion.el +++ b/lisp/init-completion.el @@ -1,4 +1,4 @@ -;;; init-completion.el --- completion config -*- lexical-binding: t -*- +;;; init-completion.el --- completion config -*- lexical-binding: t -*- ;;; Commentary: @@ -26,9 +26,9 @@ (cond (*is-windows* (setq consult-locate-args (encode-coding-string "es.exe -i -p -r" 'gbk) - consult-ripgrep-args (encode-coding-string - "rg --null --line-buffered --color=never --max-columns=1000 --path-separator / --smart-case --no-heading --line-number" - 'gbk)) + consult-ripgrep-args (encode-coding-string + "rg --null --line-buffered --color=never --max-columns=1000 --path-separator / --smart-case --no-heading --line-number" + 'gbk)) (add-to-list 'process-coding-system-alist '("es" gbk . gbk))) (*is-mac* (setq consult-locate-args "mdfind -name")) @@ -40,18 +40,18 @@ ;; set some buffer filter (setq consult-buffer-filter - (cl-union consult-buffer-filter - '("^\\*dirvish" - "^PREVIEW" - "^\\*helpful" - "^\\*Help" - "Diff" - "straight" - "\\*Messages\\*" - "\\*Chinese-word-segmentation\\*" - "\\*gptel-reasoning\\*" - "\\*gptel-log\\*") - :test 'equal))) + (cl-union consult-buffer-filter + '("^\\*dirvish" + "^PREVIEW" + "^\\*helpful" + "^\\*Help" + "Diff" + "straight" + "\\*Messages\\*" + "\\*Chinese-word-segmentation\\*" + "\\*gptel-reasoning\\*" + "\\*gptel-log\\*") + :test 'equal))) ;; embark，快捷指令 (use-package embark @@ -127,7 +127,7 @@ targets." (add-hook 'eglot-managed-mode-hook (lambda () (when (derived-mode-p 'scheme-mode) - (setq-local completion-at-point-functions + (setq-local completion-at-point-functions (remq 'eglot-completion-at-point completion-at-point-functions)))))) @@ -137,7 +137,7 @@ targets." (corfu-quit consult-completion-in-region) :bind (:map corfu-map - ("M-d" . corfu-popupinfo-documentation)) + ("M-d" . corfu-popupinfo-documentation)) :custom (corfu-auto t) (corfu-auto-prefix 2) @@ -147,10 +147,10 @@ targets." (corfu-auto-delay 0.2) (corfu-popupinfo-delay '(0.4 . 0.2)) (global-corfu-modes '((not erc-mode - circe-mode - help-mode - gud-mode - vterm-mode) + circe-mode + help-mode + gud-mode + vterm-mode) t)) :hook (after-init . global-corfu-mode) @@ -165,7 +165,7 @@ targets." (local-set-key (kbd "TAB") 'completion-at-point))) :bind (:map corfu-map - ("RET" . nil))) + ("RET" . nil))) (if (not (and (display-graphic-p) (>= emacs-major-version 31))) diff --git a/lisp/init-dashboard.el b/lisp/init-dashboard.el index dd6e06d..052be6a 100644 --- a/lisp/init-dashboard.el +++ b/lisp/init-dashboard.el @@ -9,15 +9,15 @@ :hook after-init :config (setq dashboard-banner-logo-title (format "%s" emacs-version) - dashboard-banner-ascii " ##### # # # # ####### # # # ##### ##### \n# # ## # # # # ## ## # # # # # # \n# # # # # # # # # # # # # # # \n# #### # # # # # ##### # # # # # # ##### \n# # # # # # # # # # ####### # # \n# # # ## # # # # # # # # # # # \n ##### # # ##### ####### # # # # ##### ##### " - dashboard-startup-banner 'ascii - dashboard-footer-messages '("hello") - dashboard-center-content t - dashboard-navigation-cycle t - dashboard-items '((recents . 8) + dashboard-banner-ascii " ##### # # # # ####### # # # ##### ##### \n# # ## # # # # ## ## # # # # # # \n# # # # # # # # # # # # # # # \n# #### # # # # # ##### # # # # # # ##### \n# # # # # # # # # # ####### # # \n# # # ## # # # # # # # # # # # \n ##### # # ##### ####### # # # # ##### ##### " + dashboard-startup-banner 'ascii + dashboard-footer-messages '("hello") + dashboard-center-content t + dashboard-navigation-cycle t + dashboard-items '((recents . 8) (bookmarks . 5) (projects . 5)) - dashboard-item-shortcuts '((recents . "r") (bookmarks . "b") (projects . "p") (agenda . "a") (registers . "e"))) + dashboard-item-shortcuts '((recents . "r") (bookmarks . "b") (projects . "p") (agenda . "a") (registers . "e"))) (dashboard-setup-startup-hook)) (provide 'init-dashboard) diff --git a/lisp/init-dired.el b/lisp/init-dired.el index bf2c6da..a15249b 100644 --- a/lisp/init-dired.el +++ b/lisp/init-dired.el @@ -9,19 +9,19 @@ :config (when *is-mac* (setq insert-directory-program "gls" - dired-use-ls-dired t)) + dired-use-ls-dired t)) (setq dired-dwim-target t - dired-listing-switches - "-l --almost-all --human-readable --group-directories-first --no-group" - dired-recursive-deletes 'always - dired-recursive-copies 'always - dired-mouse-drag-files t - mouse-drag-and-drop-region-cross-program t - dired-compress-file-default-suffix ".zip" - dired-kill-when-opening-new-dired-buffer nil - dired-auto-revert-buffer t - dired-create-destination-dirs 'ask - dired-create-destination-dirs-on-trailing-dirsep t) + dired-listing-switches + "-l --almost-all --human-readable --group-directories-first --no-group" + dired-recursive-deletes 'always + dired-recursive-copies 'always + dired-mouse-drag-files t + mouse-drag-and-drop-region-cross-program t + dired-compress-file-default-suffix ".zip" + dired-kill-when-opening-new-dired-buffer nil + dired-auto-revert-buffer t + dired-create-destination-dirs 'ask + dired-create-destination-dirs-on-trailing-dirsep t) (put 'dired-find-alternate-file 'disabled nil)) ;; dirvish @@ -41,15 +41,15 @@ (if *is-android* (setq dirvish-default-layout nil - dirvish-layout-recipes '((1 0.6))) + dirvish-layout-recipes '((1 0.6))) (setq dirvish-default-layout nil - dirvish-layout-recipes '((1 0.15 0.45)))) + dirvish-layout-recipes '((1 0.15 0.45)))) (setq dirvish-use-mode-line t - dirvish-mode-line-format '(:left (sort omit symlink) :right (free-space index)) - dirvish-attributes '(file-time file-size) - dirvish-yank-sources 'session - dirvish-hide-cursor nil) + dirvish-mode-line-format '(:left (sort omit symlink) :right (free-space index)) + dirvish-attributes '(file-time file-size) + dirvish-yank-sources 'session + dirvish-hide-cursor nil) :custom (dirvish-quick-access-entries @@ -94,20 +94,20 @@ (dirvish dirvish-vc transient) :demand t :config - (transient-define-suffix dirvish-toggle-gitignore () - "Toggle `dired-gitignore-mode' in current Dirvish buffer." - :description - (lambda () - (format "Gitignore filter (%s)" - (if dired-gitignore-mode - (propertize "+" 'face 'transient-value) - (propertize "-" 'face 'transient-inactive-value)))) - :transient t - (interactive) - (dired-gitignore-mode 'toggle)) + (transient-define-suffix dirvish-toggle-gitignore () + "Toggle `dired-gitignore-mode' in current Dirvish buffer." + :description + (lambda () + (format "Gitignore filter (%s)" + (if dired-gitignore-mode + (propertize "+" 'face 'transient-value) + (propertize "-" 'face 'transient-inactive-value)))) + :transient t + (interactive) + (dired-gitignore-mode 'toggle)) - (transient-append-suffix 'dirvish-vc-menu "v" - '("i" dirvish-toggle-gitignore))) + (transient-append-suffix 'dirvish-vc-menu "v" + '("i" dirvish-toggle-gitignore))) ;; trashed (use-package trashed @@ -115,24 +115,24 @@ (trashed) :config (setq trashed-action-confirmer 'y-or-n-p - trashed-use-header-line t - trashed-sort-key '("Date deleted" . t) - trashed-date-format "%Y-%m-%d %H:%M:%S")) + trashed-use-header-line t + trashed-sort-key '("Date deleted" . t) + trashed-date-format "%Y-%m-%d %H:%M:%S")) ;; discomfort，挂载硬盘 (when *is-linux* (use-package debase :straight (debase :type git - :host codeberg - :repo "emacs-weirdware/debase")) + :host codeberg + :repo "emacs-weirdware/debase")) (use-package discomfort :commands discomfort :straight (discomfort :type git - :host codeberg - :repo "emacs-weirdware/discomfort"))) + :host codeberg + :repo "emacs-weirdware/discomfort"))) (provide 'init-dired) diff --git a/lisp/init-edit.el b/lisp/init-edit.el index 18689b4..9055767 100644 --- a/lisp/init-edit.el +++ b/lisp/init-edit.el @@ -1,4 +1,4 @@ -;;; init-edit.el --- edit and navigate -*- lexical-binding: t -*- +;;; init-edit.el --- edit and navigate -*- lexical-binding: t -*- ;;; Commentary: @@ -13,7 +13,7 @@ (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 @@ -22,20 +22,20 @@ (mc/always-run-for-all t) :init (setq mc/cmds-to-run-once - '(god-mode-all - hydra-multiple-cursors/body - hydra-multiple-cursors/mc/edit-lines - hydra-multiple-cursors/mc/insert-numbers - hydra-multiple-cursors/mc/mark-all-dwim - hydra-multiple-cursors/mc/mark-next-like-this - hydra-multiple-cursors/mc/mark-next-like-this-symbol - hydra-multiple-cursors/mc/mark-next-like-this-word - hydra-multiple-cursors/mc/mark-previous-like-this - hydra-multiple-cursors/mc/mark-previous-like-this-symbol - hydra-multiple-cursors/mc/mark-previous-like-this-word - hydra-multiple-cursors/mc/unmark-next-like-this - hydra-multiple-cursors/mc/unmark-previous-like-this - hydra-multiple-cursors/nil))) + '(god-mode-all + hydra-multiple-cursors/body + hydra-multiple-cursors/mc/edit-lines + hydra-multiple-cursors/mc/insert-numbers + hydra-multiple-cursors/mc/mark-all-dwim + hydra-multiple-cursors/mc/mark-next-like-this + hydra-multiple-cursors/mc/mark-next-like-this-symbol + hydra-multiple-cursors/mc/mark-next-like-this-word + hydra-multiple-cursors/mc/mark-previous-like-this + hydra-multiple-cursors/mc/mark-previous-like-this-symbol + hydra-multiple-cursors/mc/mark-previous-like-this-word + hydra-multiple-cursors/mc/unmark-next-like-this + hydra-multiple-cursors/mc/unmark-previous-like-this + hydra-multiple-cursors/nil))) ;; crux，实用函数 (use-package crux) @@ -50,7 +50,7 @@ (use-package undo-fu :config (setq undo-in-region t - undo-fu-allow-undo-in-region t)) + undo-fu-allow-undo-in-region t)) (use-package undo-fu-session :hook @@ -60,8 +60,8 @@ (use-package vundo :init (setq undo-limit 800000 - undo-strong-limit 1200000 - undo-outer-limit 12000000)) + undo-strong-limit 1200000 + undo-outer-limit 12000000)) ;; expand-region，快速展开选中 (use-package expand-region @@ -89,15 +89,15 @@ :config (unless (or *is-android* (not use-package-always-defer)) (which-key-enable-god-mode-support)) (setq god-mode-enable-function-key-translation nil - god-exempt-major-modes - (cl-union '(diff-mode exwm-mode) god-exempt-major-modes :test 'equal) - god-mode-lighter-string "THANK-GOD-MODE") + god-exempt-major-modes + (cl-union '(diff-mode exwm-mode) god-exempt-major-modes :test 'equal) + god-mode-lighter-string "THANK-GOD-MODE") (defun my-sync-god-mode-lighter-face (&rest _) (set-face-attribute 'god-mode-lighter nil - :inherit 'isearch-fail - :background (face-attribute 'mode-line :background nil t) - :weight 'bold)) + :inherit 'isearch-fail + :background (face-attribute 'mode-line :background nil t) + :weight 'bold)) (my-sync-god-mode-lighter-face) (add-hook 'enable-theme-functions #'my-sync-god-mode-lighter-face) @@ -106,7 +106,7 @@ 'relative t))) (unless (or (eq display-line-numbers desired) (bound-and-true-p olivetti-mode)) - (setq display-line-numbers desired)))) + (setq display-line-numbers desired)))) (add-hook 'post-command-hook #'my-sync-line-numbers-with-god-mode)) (provide 'init-edit) diff --git a/lisp/init-elpa.el b/lisp/init-elpa.el index 4242525..b11fc47 100644 --- a/lisp/init-elpa.el +++ b/lisp/init-elpa.el @@ -1,4 +1,4 @@ -;;; init-elpa.el --- package manager -*- lexical-binding: t -*- +;;; init-elpa.el --- package manager -*- lexical-binding: t -*- ;;; Commentary: diff --git a/lisp/init-exwm.el b/lisp/init-exwm.el index f5c2907..b716f01 100644 --- a/lisp/init-exwm.el +++ b/lisp/init-exwm.el @@ -1,4 +1,4 @@ -;;; init-exwm.el --- exwm config -*- lexical-binding: t -*- +;;; init-exwm.el --- exwm config -*- lexical-binding: t -*- ;;; Commentary: @@ -58,7 +58,7 @@ ?\M-] ?\s-[ ?\s-] - ?\s- + ?\s- XF86AudioLowerVolume XF86AudioRaiseVolume XF86AudioMute @@ -75,7 +75,7 @@ ([?\s-s] . desktop-environment-screenshot-part) ([?\s-w] . exwm-workspace-switch) ([?\s-o] . other-window) - ([?\s-m] . exwm-layout-toggle-mode-line) + ([?\s-m] . exwm-layout-toggle-mode-line) ([?\s-`] . (lambda () (interactive) (exwm-workspace-switch-create 0))) ,@(mapcar (lambda (i) `(,(kbd(format "s-%d" i)) . @@ -85,25 +85,25 @@ (number-sequence 0 9)))) (setq exwm-input-simulation-keys - `((,(kbd "C-f") . [right]) - (,(kbd "C-b") . [left]) - (,(kbd "C-p") . [up]) - (,(kbd "C-n") . [down]) - (,(kbd "C-a") . [home]) - (,(kbd "C-e") . [end]) - (,(kbd "M-f") . [C-right]) - (,(kbd "A-f") . [C-right]) - (,(kbd "M-b") . [C-left]) - (,(kbd "A-b") . [C-left]) - (,(kbd "C-d") . [delete]) - (,(kbd "C-k") . [S-end delete]) - (,(kbd "M-") . ,(kbd "C-")) - (,(kbd "M-d") . ,(kbd "C-")) - (,(kbd "M-w") . [?\C-c]) - (,(kbd "C-y") . [?\C-v]) - (,(kbd "C-w") . [?\C-x]) - (,(kbd "C-/") . [?\C-z]) - (,(kbd "C-?") . ,(kbd "C-S-z")))) + `((,(kbd "C-f") . [right]) + (,(kbd "C-b") . [left]) + (,(kbd "C-p") . [up]) + (,(kbd "C-n") . [down]) + (,(kbd "C-a") . [home]) + (,(kbd "C-e") . [end]) + (,(kbd "M-f") . [C-right]) + (,(kbd "A-f") . [C-right]) + (,(kbd "M-b") . [C-left]) + (,(kbd "A-b") . [C-left]) + (,(kbd "C-d") . [delete]) + (,(kbd "C-k") . [S-end delete]) + (,(kbd "M-") . ,(kbd "C-")) + (,(kbd "M-d") . ,(kbd "C-")) + (,(kbd "M-w") . [?\C-c]) + (,(kbd "C-y") . [?\C-v]) + (,(kbd "C-w") . [?\C-x]) + (,(kbd "C-/") . [?\C-z]) + (,(kbd "C-?") . ,(kbd "C-S-z")))) (defun my-exwm-update-class () (exwm-workspace-rename-buffer exwm-class-name)) @@ -128,21 +128,21 @@ "import -window root ~/Pictures/screenshot-$(date +%Y%m%d-%H%M%S).png") (desktop-environment-screenshot-partial-command "import ~/Pictures/screenshot-$(date +%Y%m%d-%H%M%S).png")) - + (use-package xdg-launcher :demand t :after exwm :straight (xdg-launcher :type git - :host github - :repo "emacs-exwm/xdg-launcher") + :host github + :repo "emacs-exwm/xdg-launcher") :bind (("s-SPC" . xdg-launcher-run-app)) :init (with-eval-after-load 'consult (unless (memq 'xdg-launcher-consult-source consult-buffer-sources) - (setq consult-buffer-sources - (append consult-buffer-sources '(xdg-launcher-consult-source))))))) + (setq consult-buffer-sources + (append consult-buffer-sources '(xdg-launcher-consult-source))))))) (when *is-mac* ;; launcher diff --git a/lisp/init-gptel.el b/lisp/init-gptel.el index 08d99ec..d52ac63 100644 --- a/lisp/init-gptel.el +++ b/lisp/init-gptel.el @@ -1,4 +1,4 @@ -;;; init-gptel.el --- ai -*- lexical-binding: t -*- +;;; init-gptel.el --- ai -*- lexical-binding: t -*- ;;; Commentary: @@ -7,8 +7,8 @@ (use-package gptel :config (setq gptel-log-level t - gptel-default-mode 'org-mode - gptel-include-reasoning "*gptel-reasoning*") + gptel-default-mode 'org-mode + gptel-include-reasoning "*gptel-reasoning*") (add-hook 'gptel-post-response-functions 'gptel-end-of-response) (add-hook 'gptel-post-stream-hook 'gptel-auto-scroll) (setq gptel-prompt-prefix-alist '((markdown-mode . "## User: ") (org-mode . "** User: ") (text-mode . "## User: "))) @@ -137,7 +137,7 @@ explanations, no quotes, no punctuation, no file extension." :models '((kimi-for-coding)) :request-params '(:temperature 0.6 :thinking (:type "disabled")) :header (lambda (_) - (when-let* ((key (gptel--get-api-key))) + (when-let* ((key (gptel--get-api-key))) `(("User-Agent" . "RooCode/3.30.3") ("HTTP-Referer" . "https://github.com/RooVetGit/Roo-Cline") ("X-Title" . "Roo Code") diff --git a/lisp/init-kbd-func.el b/lisp/init-kbd-func.el index 2ad6b19..d4b495c 100644 --- a/lisp/init-kbd-func.el +++ b/lisp/init-kbd-func.el @@ -1,4 +1,4 @@ -;;; init-kbd-func.el --- functions for keybindings -*- lexical-binding: t -*- +;;; init-kbd-func.el --- functions for keybindings -*- lexical-binding: t -*- ;;; Commentary: @@ -55,11 +55,11 @@ otherwise toggle global-jinx-mode." (fboundp 'w32-shell-execute)) (shell-command-to-string (encode-coding-string - (replace-regexp-in-string "/" "\\\\" - (format "explorer.exe %s" - (file-name-directory - (expand-file-name file)))) - 'gbk)) + (replace-regexp-in-string "/" "\\\\" + (format "explorer.exe %s" + (file-name-directory + (expand-file-name file)))) + 'gbk)) (call-process (pcase system-type ('darwin "open") ('cygwin "cygstart") @@ -93,7 +93,7 @@ otherwise toggle global-jinx-mode." "Return the path of current denote journal if it exists, otherwise return nil." (require 'denote-journal) (let* ((internal-date - (denote-journal--date-in-interval-p (or date (current-time)) interval)) + (denote-journal--date-in-interval-p (or date (current-time)) interval)) (files (denote-journal--get-entry internal-date interval))) (if files (denote-journal-select-file-prompt files)))) @@ -134,9 +134,9 @@ otherwise toggle global-jinx-mode." "Publish blog , git add/commit/push , generate commit message." (interactive) (let* ((blog-dir (or directory - (if *is-windows* - "h:/emacs/hugo/this-is-my-blog/" - "~/org/hugo/this-is-my-blog/"))) + (if *is-windows* + "h:/emacs/hugo/this-is-my-blog/" + "~/org/hugo/this-is-my-blog/"))) (timestamp (format-time-string "%Y-%m-%d %H:%M:%S")) (default-directory blog-dir)) (message "Adding files...") @@ -146,15 +146,15 @@ otherwise toggle global-jinx-mode." (message "Pushing to remote...") (let ((exit-code (eshell-command "git push"))) (if (eq exit-code t) - (message "Push may have failed or nothing to push, check *Messages* buffer for details") - (message "Push successfully %s" timestamp))))) + (message "Push may have failed or nothing to push, check *Messages* buffer for details") + (message "Push successfully %s" timestamp))))) (defun my-blog-preview () "Save and preview blog." (interactive) (save-buffer) (let ((default-directory (if *is-windows* - "h:/emacs/hugo/this-is-my-blog/" + "h:/emacs/hugo/this-is-my-blog/" "~/org/hugo/this-is-my-blog/"))) (start-process "hugo-server" "*hugo-server*" "hugo" "server" "-D" "--bind" "0.0.0.0" "--port" "1313") @@ -172,8 +172,8 @@ otherwise toggle global-jinx-mode." (when (eq major-mode 'org-mode) (setq-local header-line-format nil mode-line-format nil - cursor-type 'hbar - olivetti-body-width 100) + cursor-type 'hbar + olivetti-body-width 100) (blink-cursor-mode -1) (cnfonts-increase-fontsize 3) (hl-line-mode 'toggle) @@ -258,17 +258,17 @@ argument)." (consult-ripgrep (project-root proj)))) (defun consult-colors-emacs (color) - "Show a list of all supported colors for a particular frame. + "Show a list of all supported colors for a particular frame. You can insert the name (default), or insert or kill the hexadecimal or RGB value of the selected COLOR." - (interactive - (list (consult--read (list-colors-duplicates (defined-colors)) - :prompt "Emacs color: " - :require-match t - :category 'color - :history '(:input consult-colors-history)))) - (insert color)) + (interactive + (list (consult--read (list-colors-duplicates (defined-colors)) + :prompt "Emacs color: " + :require-match t + :category 'color + :history '(:input consult-colors-history)))) + (insert color)) (defun fix-theme-colors () "Fix invalid color name in theme files." @@ -303,9 +303,9 @@ value of the selected COLOR." "Kill and restart fcitx5, to fix random issues in exwm." (interactive) (if (zerop (shell-command "pgrep fcitx5")) - (progn - (eshell-command "pkill fcitx5") - (eshell-command "fcitx5 -d")) + (progn + (eshell-command "pkill fcitx5") + (eshell-command "fcitx5 -d")) (eshell-command "fcitx5 -d")))) (provide 'init-kbd-func) diff --git a/lisp/init-kbd.el b/lisp/init-kbd.el index 4568f94..4fe9697 100644 --- a/lisp/init-kbd.el +++ b/lisp/init-kbd.el @@ -196,10 +196,10 @@ ;; eat (general-def (eat-semi-char-mode-map - eat-line-mode-map - eat-char-mode-map - eat-eshell-semi-char-mode-map - eat-eshell-char-mode-map) + eat-line-mode-map + eat-char-mode-map + eat-eshell-semi-char-mode-map + eat-eshell-char-mode-map) "M-[" nil "M-]" nil) diff --git a/lisp/init-org.el b/lisp/init-org.el index fb78c96..c567322 100644 --- a/lisp/init-org.el +++ b/lisp/init-org.el @@ -13,11 +13,11 @@ :init (setq org-directory - (cond - (*is-windows* "h:/emacs/my-org-note") - (*is-mac* "~/org/my-org-note") - (*is-linux* "~/org/my-org-note") - (*is-android* "~/storage/shared/my-org-note"))) + (cond + (*is-windows* "h:/emacs/my-org-note") + (*is-mac* "~/org/my-org-note") + (*is-linux* "~/org/my-org-note") + (*is-android* "~/storage/shared/my-org-note"))) :config (defvar org-hide-space-keywords @@ -35,28 +35,28 @@ (defun my-org-electric-pair-fix () (setq-local electric-pair-inhibit-predicate - (lambda (char) + (lambda (char) (or (eq char ?<) (electric-pair-default-inhibit char))))) ;; log默认放入drawer中 (setq org-log-done t - org-log-into-drawer t) + org-log-into-drawer t) ;; 不要在capture时设置bookmark (setq org-bookmark-names-plist nil) ;; 设置todo关键字 (setq org-todo-keywords - (quote ((sequence "TODO(t)" "SOMEDAY(S)" "STARTED(s)" "WAITING(w)" "|" "DONE(d!/!)" "CANCELLED(c@/!)") - (sequence "IDKY(i)" "|" "KNOWN(k)" "CANCELLED(c@/!)")))) + (quote ((sequence "TODO(t)" "SOMEDAY(S)" "STARTED(s)" "WAITING(w)" "|" "DONE(d!/!)" "CANCELLED(c@/!)") + (sequence "IDKY(i)" "|" "KNOWN(k)" "CANCELLED(c@/!)")))) ;; agenda相关 (setq org-agenda-files `(,(concat org-directory "/20260509T232442==agenda--all-my-todos__org.org"))) (setq org-agenda-span 'day) (setq org-agenda-skip-function-global - '(org-agenda-skip-entry-if 'todo '("COMMENT")))) + '(org-agenda-skip-entry-if 'todo '("COMMENT")))) ;; phscroll，优化表格换行 (use-package phscroll @@ -84,13 +84,13 @@ :init (setq denote-directory org-directory) (setq denote-org-store-link-to-heading 'context - denote-prompts '(title signature keywords)) + denote-prompts '(title signature keywords)) (setq denote-title-history nil - denote-signature-history - '("note" "project" "fun" "wisdom" "article" "data" "metanote" "agenda" "journal" "archive") - denote-known-keywords - '("emacs") - denote-title-history nil)) + denote-signature-history + '("note" "project" "fun" "wisdom" "article" "data" "metanote" "agenda" "journal" "archive") + denote-known-keywords + '("emacs") + denote-title-history nil)) ;; denote-org (use-package denote-org) @@ -98,8 +98,8 @@ ;; denote-lint (use-package denote-lint :straight '(denote-lint :type git - :host github - :repo "Andsy10/denote-lint") + :host github + :repo "Andsy10/denote-lint") :config (setq org-link-elisp-confirm-function nil)) @@ -131,12 +131,12 @@ (org-mode . org-link-preview-region) :config (setq-default org-download-image-dir "./images/" - org-download-heading-lvl nil) + org-download-heading-lvl nil) (setq org-download-dragndrop t - org-download-method 'directory - org-image-actual-width nil - org-download-image-html-width 600 - org-return-follows-link t)) + org-download-method 'directory + org-image-actual-width nil + org-download-image-html-width 600 + org-return-follows-link t)) ;; org-ql (use-package org-ql) @@ -153,22 +153,22 @@ (org-agenda-finalize . disable-truncate-lines) :config (setq org-agenda-custom-commands - '(("qd" "TODO entries sort by closed time" + '(("qd" "TODO entries sort by closed time" ((org-ql-block '(closed) ((org-ql-block-header "Closed TODOs") (org-super-agenda-groups '((:auto-ts t))))))) - ("qs" "SOMEDAYs" + ("qs" "SOMEDAYs" ((org-ql-block '(todo "SOMEDAY") ((org-ql-block-header "SOMEDAYs") (org-super-agenda-groups '((:auto-ts t))))))) - ("qS" "STARTEDs" + ("qS" "STARTEDs" ((org-ql-block '(todo "STARTED") ((org-ql-block-header "STARTEDs") (org-super-agenda-groups '((:auto-ts t))))))) - ("qt" "TODOs sort by start time" + ("qt" "TODOs sort by start time" ((org-ql-block '(todo) ((org-ql-block-header "TODOs") (org-super-agenda-groups @@ -178,13 +178,13 @@ ((org-ql-block-header "all TODOs") (org-super-agenda-groups '((:name "started" :todo "STARTED") - (:name "waiting" :todo "WAITING") + (:name "waiting" :todo "WAITING") (:name "priority = A" :priority "A") (:name "priority = B" :priority "B") (:name "priority = C" :priority "C") (:name "other priority" :priority< "C") (:name "someday" :todo "SOMEDAY") - (:name "I dont know yet" :todo "IDKY")))))))))) + (:name "I dont know yet" :todo "IDKY")))))))))) ;; capture (use-package org-capture @@ -192,18 +192,18 @@ :config (setq my-org-capture-file (concat org-directory "/20260509T232442==agenda--all-my-todos__org.org")) (setq org-capture-templates - `(("t" "TODO" entry - (file+headline ,my-org-capture-file "Something to do") + `(("t" "TODO" entry + (file+headline ,my-org-capture-file "Something to do") "* TODO %<%m-%d> %?\n%T" :empty-lines 1) - ("s" "STARTED" entry - (file+headline ,my-org-capture-file "Something to do") + ("s" "STARTED" entry + (file+headline ,my-org-capture-file "Something to do") "* STARTED %<%m-%d> %?\n%T" :empty-lines 1) - ("S" "SOMEDAY" entry - (file+headline ,my-org-capture-file "Something to do") - "* SOMEDAY %<%m-%d> %?\n%T" :empty-lines 1) - ("i" "IDKY" entry - (file+headline ,my-org-capture-file "Something to know") - "* IDKY %<%m-%d> %?\n%T" :empty-lines 1)))) + ("S" "SOMEDAY" entry + (file+headline ,my-org-capture-file "Something to do") + "* SOMEDAY %<%m-%d> %?\n%T" :empty-lines 1) + ("i" "IDKY" entry + (file+headline ,my-org-capture-file "Something to know") + "* IDKY %<%m-%d> %?\n%T" :empty-lines 1)))) ;; hugo (use-package ox-hugo @@ -214,7 +214,7 @@ See `org-capture-templates' for more information." (let* ((title (read-from-minibuffer "Post Title: ")) ;Prompt to enter the post title (fname (org-hugo-slug title))) - (mapconcat #'identity + (mapconcat #'identity `( ,(concat "* TODO " title) ":PROPERTIES:" @@ -230,9 +230,9 @@ See `org-capture-templates' for more information." ;; and that it has a "Blog Ideas" heading. It can even be a ;; symlink pointing to the actual location of all-posts.org! (file+headline ,(if *is-windows* - "h:/emacs/hugo/this-is-my-blog/all-blog.org" - "~/org/hugo/this-is-my-blog/all-blog.org") - "Blog Ideas") + "h:/emacs/hugo/this-is-my-blog/all-blog.org" + "~/org/hugo/this-is-my-blog/all-blog.org") + "Blog Ideas") (function org-hugo-new-subtree-post-capture-template))))) ;; presentation @@ -257,7 +257,7 @@ See `org-capture-templates' for more information." holiday-other-holidays '((holiday-fixed 2 14 "情人节") (holiday-fixed 4 1 "愚人节") (holiday-fixed 12 25 "圣诞节") - (holiday-fixed 6 7 "高考") + (holiday-fixed 6 7 "高考") (holiday-float 5 0 2 "母亲节") (holiday-float 6 0 3 "父亲节") (holiday-float 11 4 4 "感恩节")) diff --git a/lisp/init-package.el b/lisp/init-package.el index 275393c..ba014ef 100644 --- a/lisp/init-package.el +++ b/lisp/init-package.el @@ -6,7 +6,7 @@ ;; keycast，按键广播 (if use-package-always-defer - (use-package keycast)) + (use-package keycast)) ;; anzu，显示isearch匹配数字 (use-package anzu @@ -68,9 +68,9 @@ _a_ : all dwim (#x3000 . #x303F) (#xFF00 . #xFFEF) (#x20000 . #x2A6DF))) - (let ((start (car range)) + (let ((start (car range)) (end (cdr range))) - (dotimes (i (- end start)) + (dotimes (i (- end start)) (modify-syntax-entry (+ start i) "_" jinx--syntax-table)))))) (use-package consult-jinx @@ -85,16 +85,16 @@ _a_ : all dwim (use-package eat :straight (eat :type git - :host codeberg - :repo "akib/emacs-eat" - :files ("*.el" - ("term" "term/*.el") - "*.texi" - "*.ti" - ("terminfo/e" "terminfo/e/*") - ("terminfo/65" "terminfo/65/*") - ("integration" "integration/*") - (:exclude ".dir-locals.el" "*-tests.el"))) + :host codeberg + :repo "akib/emacs-eat" + :files ("*.el" + ("term" "term/*.el") + "*.texi" + "*.ti" + ("terminfo/e" "terminfo/e/*") + ("terminfo/65" "terminfo/65/*") + ("integration" "integration/*") + (:exclude ".dir-locals.el" "*-tests.el"))) :hook (eshell-load . eat-eshell-mode) (eshell-load . eat-eshell-visual-command-mode) @@ -116,7 +116,7 @@ _a_ : all dwim (consult-customize consult-source-buffer :hidden t :default nil) (add-to-list 'consult-buffer-sources persp-consult-source)) (setq switch-to-prev-buffer-skip - (lambda (win buff bury-or-kill) + (lambda (win buff bury-or-kill) (or (not (persp-is-current-buffer buff)) (cl-some (lambda (re) (string-match-p re (buffer-name buff))) consult-buffer-filter)))) @@ -136,7 +136,7 @@ _a_ : all dwim (use-package ediff :config (setq ediff-window-setup-function 'ediff-setup-windows-plain - ediff-split-window-function 'split-window-horizontally)) + ediff-split-window-function 'split-window-horizontally)) ;; diff-hl (use-package diff-hl @@ -150,19 +150,19 @@ _a_ : all dwim :config (setq project-switch-commands (assq-delete-all 'project-vc-dir project-switch-commands)) (setq project-switch-commands - (seq-uniq (append project-switch-commands - '((magit-project-status "Magit" ?v) - (eat-project "Eat" ?E) - (project-query-replace-regexp "Query Replace" ?R) - (consult-ripgrep "Ripgrep" ?r) - (consult-project-buffer "Buffers" ?b) - (project-ibuffer "Ibuffer" ?i)))))) + (seq-uniq (append project-switch-commands + '((magit-project-status "Magit" ?v) + (eat-project "Eat" ?E) + (project-query-replace-regexp "Query Replace" ?R) + (consult-ripgrep "Ripgrep" ?r) + (consult-project-buffer "Buffers" ?b) + (project-ibuffer "Ibuffer" ?i)))))) (use-package project-ibuffer :straight (project-ibuffer :type git - :host github - :repo "Andsy10/project-ibuffer")) + :host github + :repo "Andsy10/project-ibuffer")) ;; emms (use-package emms @@ -171,7 +171,7 @@ _a_ : all dwim :config (emms-all) (setq emms-player-list '(emms-player-vlc) - emms-info-functions '(emms-info-native)) + emms-info-functions '(emms-info-native)) (emms-history-load)) ;; tokei @@ -217,7 +217,7 @@ _a_ : all dwim 'proced-format-alist '(custom user pid ppid sess tree pcpu pmem rss start time state (args comm))) (setq proced-low-memory-usage-threshold 0.025 - proced-medium-memory-usage-threshold 0.125)) + proced-medium-memory-usage-threshold 0.125)) ;; syncthing (use-package syncthing diff --git a/lisp/init-prog.el b/lisp/init-prog.el index caf996b..fed4bc1 100644 --- a/lisp/init-prog.el +++ b/lisp/init-prog.el @@ -1,4 +1,4 @@ -;;; init-prog.el --- programming -*- lexical-binding: t -*- +;;; init-prog.el --- programming -*- lexical-binding: t -*- ;;; Commentary: @@ -62,7 +62,7 @@ (markdown-mode . visual-line-mode) :init (setq markdown-command "multimarkdown" - markdown-fontify-code-blocks-natively t)) + markdown-fontify-code-blocks-natively t)) (use-package edit-indirect) diff --git a/lisp/init-segmentation.el b/lisp/init-segmentation.el index c5345d9..f4eb426 100644 --- a/lisp/init-segmentation.el +++ b/lisp/init-segmentation.el @@ -14,17 +14,17 @@ (cond (*is-windows* (add-to-list 'load-path "h:/emacs/emacs-chinese-word-segmentation/") ;设置为进程调用方式 - (setq cns-process-type 'shell) ;设置可执行文件路径 + (setq cns-process-type 'shell) ;设置可执行文件路径 (setq cns-prog "h:/emacs/emacs-chinese-word-segmentation/cnws.exe") ;设置字典目录 (setq cns-dict-directory "h:/emacs/emacs-chinese-word-segmentation/cppjieba/dict") ;直接设置进程命令，绕过 Windows shell 检测 (setq cns-process-shell-command - (format "%s %s %s %s %s %s" - cns-prog - (concat (file-name-as-directory cns-dict-directory) "jieba.dict.utf8") - (concat (file-name-as-directory cns-dict-directory) "hmm_model.utf8") - (concat (file-name-as-directory cns-dict-directory) "user.dict.utf8") - (concat (file-name-as-directory cns-dict-directory) "idf.utf8") - (concat (file-name-as-directory cns-dict-directory) "stop_words.utf8")))) + (format "%s %s %s %s %s %s" + cns-prog + (concat (file-name-as-directory cns-dict-directory) "jieba.dict.utf8") + (concat (file-name-as-directory cns-dict-directory) "hmm_model.utf8") + (concat (file-name-as-directory cns-dict-directory) "user.dict.utf8") + (concat (file-name-as-directory cns-dict-directory) "idf.utf8") + (concat (file-name-as-directory cns-dict-directory) "stop_words.utf8")))) (t (add-to-list 'load-path "~/emacs-stuff/emacs-chinese-word-segmentation/") diff --git a/lisp/init-startup.el b/lisp/init-startup.el index c729742..98991a4 100644 --- a/lisp/init-startup.el +++ b/lisp/init-startup.el @@ -1,4 +1,4 @@ -;;; init-startup.el --- startup settings -*- lexical-binding: t -*- +;;; init-startup.el --- startup settings -*- lexical-binding: t -*- ;;; Commentary: @@ -89,6 +89,9 @@ ;; 优化换行规则 (setq word-wrap-by-category t) +;; 禁用制表符 +(setq-default indent-tabs-mode nil) + ;; 修改mac键位 (when *is-mac* (setq mac-command-modifier 'meta) diff --git a/lisp/init-terminal-kbd.el b/lisp/init-terminal-kbd.el index 92bd064..6d948e8 100644 --- a/lisp/init-terminal-kbd.el +++ b/lisp/init-terminal-kbd.el @@ -1,4 +1,4 @@ -;;; init-terminal-kbd.el --- keybindings -*- lexical-binding: t -*- +;;; init-terminal-kbd.el --- keybindings -*- lexical-binding: t -*- ;;; Commentary: diff --git a/lisp/init-terminal-package.el b/lisp/init-terminal-package.el index 20dedb8..2fff585 100644 --- a/lisp/init-terminal-package.el +++ b/lisp/init-terminal-package.el @@ -35,13 +35,13 @@ (after-init . savehist-mode) :init (setq enable-recursive-minibuffers t - history-length 50 - savehist-additional-variables '(mark-ring - global-mark-ring - search-ring - regexp-search-ring - extended-command-history) - savehist-autosave-interval 300)) + history-length 50 + savehist-additional-variables '(mark-ring + global-mark-ring + search-ring + regexp-search-ring + extended-command-history) + savehist-autosave-interval 300)) (use-package saveplace :hook @@ -74,13 +74,13 @@ (use-package savehist :init (setq enable-recursive-minibuffers t - history-length 50 - savehist-additional-variables '(mark-ring - global-mark-ring - search-ring - regexp-search-ring - extended-command-history) - savehist-autosave-interval 300) + history-length 50 + savehist-additional-variables '(mark-ring + global-mark-ring + search-ring + regexp-search-ring + extended-command-history) + savehist-autosave-interval 300) (savehist-mode)) ;; saveplace，保存光标位置 diff --git a/lisp/init-terminal-startup.el b/lisp/init-terminal-startup.el index b14b2e8..c7c75a2 100644 --- a/lisp/init-terminal-startup.el +++ b/lisp/init-terminal-startup.el @@ -81,6 +81,8 @@ (setq word-wrap-by-category t) +(setq-default indent-tabs-mode nil) + (setq kill-whole-line t) (provide 'init-terminal-startup) diff --git a/lisp/init-ui.el b/lisp/init-ui.el index d9bba55..e11f5b1 100644 --- a/lisp/init-ui.el +++ b/lisp/init-ui.el @@ -18,11 +18,11 @@ ;; 把主题加载延迟到frame创建之后，防止daemon模式下宏不能正常展开 (if (and (daemonp) (not *is-android*)) (add-hook 'after-make-frame-functions - (lambda (frame) - (with-selected-frame frame - (load-theme 'my-dark t)))) + (lambda (frame) + (with-selected-frame frame + (load-theme 'my-dark t)))) (if *is-android* - (load-theme 'my-light t) + (load-theme 'my-light t) (load-theme 'my-dark t)))) ;; 行号 @@ -31,8 +31,8 @@ (after-init . global-display-line-numbers-mode) :config (setq display-line-numbers-type '2 - display-line-numbers-grow-only t - display-line-numbers-width-start 4)) + display-line-numbers-grow-only t + display-line-numbers-width-start 4)) ;; org-mode美化 (use-package olivetti @@ -87,12 +87,12 @@ (persp-mode . display-time-mode) :config (setq display-time-default-load-average nil - display-time-string-forms - '((propertize - (concat - (propertize (format-time-string " %I:%M") 'face 'display-time-date-and-time) - (propertize (format-time-string "-%p") 'face 'font-lock-comment-face)) - 'help-echo (format-time-string "%A, %B %d, %Y")))))) + display-time-string-forms + '((propertize + (concat + (propertize (format-time-string " %I:%M") 'face 'display-time-date-and-time) + (propertize (format-time-string "-%p") 'face 'font-lock-comment-face)) + 'help-echo (format-time-string "%A, %B %d, %Y")))))) ;; 安装cnfonts，修复中英文对齐 (use-package cnfonts @@ -100,11 +100,11 @@ (after-init . cnfonts-mode) :init (setq cnfonts-personal-fontnames - '(("Sarasa Fixed TC") ;英文 - ("Sarasa Fixed TC") ;中文 - nil ;ext-B - nil ;symbol - nil)) ;装饰 + '(("Sarasa Fixed TC") ;英文 + ("Sarasa Fixed TC") ;中文 + nil ;ext-B + nil ;symbol + nil)) ;装饰 :config (cnfonts--select-profile "profile1")) diff --git a/lisp/init-window.el b/lisp/init-window.el index 25b1003..df3383b 100644 --- a/lisp/init-window.el +++ b/lisp/init-window.el @@ -16,7 +16,7 @@ popper-group-by-directory :hook (after-init . popper-mode) - + :init (setq popper-reference-buffers '("\\*Messages\\*" @@ -38,17 +38,17 @@ "\\*Edit Annotation.*\\*" "\\*Flutter\\*" "\\*Ibuffer\\*" - "^\\*Finder-" + "^\\*Finder-" "Buffers\\*$" "^\\*Geiser" "\\*gptel-Kimi-Code\\*" - "^\\*sly" + "^\\*sly" "\\*gptel-agent:.*\\*" "^magit" - "\\*discomfort\\*" - "\\*eww bookmarks\\*" - "\\*eww history\\*" - "\\*Proced\\*" + "\\*discomfort\\*" + "\\*eww bookmarks\\*" + "\\*eww history\\*" + "\\*Proced\\*" bookmark-bmenu-mode lsp-bridge-ref-mode comint-mode @@ -63,10 +63,10 @@ process-menu-mode list-environment-mode cargo-process-mode youdao-dictionary-mode osx-dictionary-mode fanyi-mode gptel-mode - ibuffer-mode + ibuffer-mode "^\\*eshell.*\\*.*$" eshell-mode - ".*eshell\\*$" + ".*eshell\\*$" "^\\*shell.*\\*.*$" shell-mode "^\\*terminal.*\\*.*$" term-mode "^\\*vterm.*\\*.*$" vterm-mode @@ -94,7 +94,7 @@ "\\*rustfmt\\*$" rustic-compilation-mode rustic-cargo-clippy-mode rustic-cargo-outdated-mode rustic-cargo-test-mode - "^\\*\\[D\\] FILE backlinks for" "^\\*Denote HEADING backlinks for")) + "^\\*\\[D\\] FILE backlinks for" "^\\*Denote HEADING backlinks for")) (when (display-grayscale-p) (setq popper-mode-line diff --git a/lisp/my-dark-theme.el b/lisp/my-dark-theme.el index a0f8d04..8f92426 100644 --- a/lisp/my-dark-theme.el +++ b/lisp/my-dark-theme.el @@ -1,4 +1,4 @@ -;;; my-dark-theme.el --- Dark Theme -*- lexical-binding: t -*- +;;; my-dark-theme.el --- Dark Theme -*- lexical-binding: t -*- ;;; Commentary: ;; A green dark theme base on solarized-theme diff --git a/lisp/my-light-theme.el b/lisp/my-light-theme.el index 21be2ac..8d97e20 100644 --- a/lisp/my-light-theme.el +++ b/lisp/my-light-theme.el @@ -1,4 +1,4 @@ -;;; my-light-theme.el --- Light Theme -*- lexical-binding: t -*- +;;; my-light-theme.el --- Light Theme -*- lexical-binding: t -*- ;;; Commentary: ;; A green light theme base on solarized-theme