From 68c7f8ba0d0319ebe9f0ef8b5acf1d3c12a42a1d Mon Sep 17 00:00:00 2001 From: andsy10 Date: Sun, 10 May 2026 22:04:30 +0800 Subject: [PATCH] Config: add basic magit config --- early-init.el | 2 ++ lisp/init-kbd-func.el | 10 ++++++++-- lisp/init-kbd.el | 11 ++++++++++- lisp/init-package.el | 14 +++----------- lisp/init-prog.el | 11 +++++++++++ lisp/init-window.el | 4 +++- 6 files changed, 37 insertions(+), 15 deletions(-) diff --git a/early-init.el b/early-init.el index bdbbeb0..aa9856d 100644 --- a/early-init.el +++ b/early-init.el @@ -22,4 +22,6 @@ (setq frame-background-mode 'dark) +(setq package-enable-at-startup nil) + ;;; early-init.el ends here diff --git a/lisp/init-kbd-func.el b/lisp/init-kbd-func.el index 161ec0d..2186419 100644 --- a/lisp/init-kbd-func.el +++ b/lisp/init-kbd-func.el @@ -66,8 +66,8 @@ Disable jinx-mode if it's enable and global-jinx-mode is disable , otherwise tog nil 0 nil (file-name-directory (expand-file-name file))))) -(defun consult-fd-global () - "Search for all files use fd" +(defun consult-fd-home () + "Search for all files in home folder use fd." (interactive) (let ((consult-fd-args "fd -H -I -i -c never --full-path") (default-directory "~/")) @@ -126,6 +126,12 @@ Disable jinx-mode if it's enable and global-jinx-mode is disable , otherwise tog (forward-line 1) (dired-move-to-filename)) +(defun my-magit-toggle-parent-section () + "Toggle parent magit section." + (interactive) + (magit-section-up) + (magit-section-toggle (magit-section-at))) + (provide 'init-kbd-func) ;;; init-kbd-func.el ends here diff --git a/lisp/init-kbd.el b/lisp/init-kbd.el index 07fb214..36d947b 100644 --- a/lisp/init-kbd.el +++ b/lisp/init-kbd.el @@ -41,7 +41,8 @@ "g" 'consult-ripgrep "e" 'consult-flycheck "l" 'consult-locate - "m" 'consult-fd-global + "h" 'consult-fd-home + "m" 'consult-man "d" 'my-open-current-directory "j" 'consult-jinx "k" 'consult-kmacro @@ -120,6 +121,14 @@ "C-f" 'dired-find-file "" 'dirvish-layout-toggle) +;; magit +(general-def magit-mode-map + "C-" 'my-magit-toggle-parent-section + "p" 'magit-section-backward-sibling + "M-p" 'magit-section-backward + "n" 'magit-section-forward-sibling + "M-n" 'magit-section-forward) + ;; flycheck (general-def flycheck-mode-map "M-{" 'flycheck-previous-error diff --git a/lisp/init-package.el b/lisp/init-package.el index 3ef7db4..966800b 100644 --- a/lisp/init-package.el +++ b/lisp/init-package.el @@ -239,17 +239,6 @@ targets." (modify-syntax-entry (+ start i) "_" jinx--syntax-table))))) (require 'init-jinx))) -;; flycheck -(use-package flycheck) - -(use-package flycheck-guile - :hook - (scheme-mode . (lambda () - (require 'flycheck-guile)))) - -;; consult-flycheck -(use-package consult-flycheck) - ;; vterm ;; (unless *is-windows* ;; (use-package vterm)) @@ -310,6 +299,9 @@ targets." (not (persp-is-current-buffer buff)))) (setq persp-initial-frame-name "desktop")) +;; magit +(use-package magit) + (provide 'init-package) ;;; init-package.el ends here diff --git a/lisp/init-prog.el b/lisp/init-prog.el index 9a16baa..f7e7a33 100644 --- a/lisp/init-prog.el +++ b/lisp/init-prog.el @@ -7,6 +7,17 @@ ;; hs-minor-mode (add-hook 'prog-mode-hook 'hs-minor-mode) +;; flycheck +(use-package flycheck) + +(use-package flycheck-guile + :hook + (scheme-mode . (lambda () + (require 'flycheck-guile)))) + +;; consult-flycheck +(use-package consult-flycheck) + ;; tree-sitter (use-package treesit-auto :config diff --git a/lisp/init-window.el b/lisp/init-window.el index b803027..a474b19 100644 --- a/lisp/init-window.el +++ b/lisp/init-window.el @@ -30,7 +30,8 @@ "\\*Ibuffer\\*" "\\*Geiser Debug\\*" "\\*Kimi-Code\\*" - "\\*OpenRouter\\*" + "\\*gptel-agent:.*\\*" + "^magit" bookmark-bmenu-mode lsp-bridge-ref-mode comint-mode @@ -50,6 +51,7 @@ "^\\*shell.*\\*.*$" shell-mode "^\\*terminal.*\\*.*$" term-mode "^\\*vterm.*\\*.*$" vterm-mode + "^\\*eat.*\\*.*$" eat-mode "\\*DAP Templates\\*$" dap-server-log-mode "\\*ELP Profiling Restuls\\*" profiler-report-mode