diff --git a/lisp/init-base.el b/lisp/init-base.el index cf5b6b0..c11f8fd 100644 --- a/lisp/init-base.el +++ b/lisp/init-base.el @@ -96,6 +96,7 @@ ;; which-key,快捷键提示 (use-package which-key + :straight nil :delight :hook (after-init . which-key-mode)) diff --git a/lisp/init-kbd-func.el b/lisp/init-kbd-func.el index 49c7c0b..679f3e6 100644 --- a/lisp/init-kbd-func.el +++ b/lisp/init-kbd-func.el @@ -13,7 +13,7 @@ (defun restart-emacs () "Restart emacs (for Windows)" (interactive) - (save-some-buffers) + (save-some-buffers) (w32-shell-execute "open" "runemacs.exe") (kill-emacs))) diff --git a/lisp/init-kbd.el b/lisp/init-kbd.el index e9cf9d9..5d0c0d2 100644 --- a/lisp/init-kbd.el +++ b/lisp/init-kbd.el @@ -103,9 +103,6 @@ "g" 'consult-notes-search-in-all-notes "C" 'calendar "c" 'org-capture - "P" 'my-blog-publish - "p" 'my-note-push - "v" 'my-blog-preview "d" 'denote "r" 'denote-rename-file-date "R" 'denote-rename-file @@ -148,6 +145,8 @@ "e" 'eshell "E" 'eat "p" 'proced + "b" 'benchmark-init/show-durations-tree + "B" 'benchmark-init/show-durations-tabulated "s" 'syncthing) ;; scratch buffer diff --git a/lisp/init-org.el b/lisp/init-org.el index 0cd233c..3b0ac32 100644 --- a/lisp/init-org.el +++ b/lisp/init-org.el @@ -143,6 +143,8 @@ ;; agenda (use-package org-agenda :straight nil + :hook + (org-agenda-finalize . disable-truncate-lines) :config (setq org-agenda-custom-commands '(("pa" "priority >= A" diff --git a/lisp/init-package.el b/lisp/init-package.el index bf1c802..53e7781 100644 --- a/lisp/init-package.el +++ b/lisp/init-package.el @@ -77,8 +77,9 @@ ("integration" "integration/*") (:exclude ".dir-locals.el" "*-tests.el"))) :hook - ((eshell-load . eat-eshell-mode) - (eshell-load . eat-eshell-visual-command-mode)) + (eshell-load . eat-eshell-mode) + (eshell-load . eat-eshell-visual-command-mode) + (eat-mode . toggle-truncate-lines) :config (setq eat-term-terminfo-directory eat--terminfo-path))) diff --git a/lisp/init-ui.el b/lisp/init-ui.el index 5af4791..199c58e 100644 --- a/lisp/init-ui.el +++ b/lisp/init-ui.el @@ -61,16 +61,7 @@ ;; eshell高亮 (use-package eshell-syntax-highlighting :hook - (eshell-mode . eshell-syntax-highlighting-global-mode) - :config - (add-hook 'eshell-mode-hook - (lambda () - (setenv "TERM" "xterm-256color") - (setenv "COLORTERM" "truecolor") - (add-to-list 'eshell-output-filter-functions 'eshell-handle-ansi-color t) - (setq-local eshell-prefer-lisp-functions nil) - (setenv "LS_COLORS" - "di=34:ln=35:so=32:pi=33:ex=31:bd=34;46:cd=34;43:su=30;41:sg=30;46")))) + (eshell-mode . eshell-syntax-highlighting-global-mode)) ;; 缩进线 (use-package indent-bars @@ -103,7 +94,7 @@ (propertize (format-time-string "-%p") 'face 'font-lock-comment-face)) 'help-echo (format-time-string "%A, %B %d, %Y")))))) -;; 安装cnfonts脚本,用于修复中英文对齐 +;; 安装cnfonts,修复中英文对齐 (use-package cnfonts :hook (after-init . cnfonts-mode)