Compare commits

..

No commits in common. "400faebf40129de3df52ef1d1f6131234b116b91" and "1ec3748fc43777e753892e24b799a8e10a7799fa" have entirely different histories.

76
init.el
View File

@ -1630,34 +1630,31 @@ Note that this workaround is incomplete, as explained in this comment."
magit-list-repositories) magit-list-repositories)
:init (progn :init (progn
(setopt magit-diff-refine-hunk nil (setq magit-diff-refine-hunk nil
magit-commit-show-diff nil magit-commit-show-diff nil
magit-repository-directories '(("~/" . 0)
magit-repository-directories '(("~/" . 0) ("~/.emacs.d" . 0)
("~/.emacs.d" . 0) ("~/Documents/" . 3)
("~/Documents/" . 3) ("~/.local/share/dotfiles" . 0))
("~/.local/share/dotfiles" . 0)) magit-repolist-columns '(("Name" 20 magit-repolist-column-ident
())
magit-repolist-columns '(("Name" 20 magit-repolist-column-ident ("S" 1 magit-repolist-column-flag
()) ())
("S" 1 magit-repolist-column-flag ("B<U" 3 magit-repolist-column-unpulled-from-upstream
()) ((:right-align t)
("B<U" 3 magit-repolist-column-unpulled-from-upstream (:sort <)))
((:right-align t) ("B>U" 3 magit-repolist-column-unpushed-to-upstream
(:sort <))) ((:right-align t)
("B>U" 3 magit-repolist-column-unpushed-to-upstream (:sort <)))
((:right-align t) ("Version" 35 magit-repolist-column-version
(:sort <))) ((:sort magit-repolist-version<)))
("Version" 35 magit-repolist-column-version ("Path" 99 magit-repolist-column-path
((:sort magit-repolist-version<))) ())))
("Path" 99 magit-repolist-column-path
()))
magit-branch-direct-configure nil)
(when on-windows (when on-windows
;; Increase performance by not automatically refreshing status buffers ;; Experimental: on Windows, do not refresh magit-status-buffers
(setopt magit-refresh-status-buffer nil))) ;; that are not selected, to increase performance.
(setq magit-refresh-status-buffer nil)))
:config (progn :config (progn
(when (fboundp 'global-magit-file-mode) (when (fboundp 'global-magit-file-mode)
@ -2321,27 +2318,9 @@ Note that this workaround is incomplete, as explained in this comment."
:commands (turn-on-gnus-dired-mode)) :commands (turn-on-gnus-dired-mode))
(use-package tramp (use-package tramp
:init (setopt tramp-default-method (if on-windows "pscp" "scp") :init (setq tramp-default-method (if on-windows "pscp" "scp")
tramp-completion-use-auth-sources nil tramp-completion-use-auth-sources nil
tramp-histfile-override "~/.tramp_history" tramp-histfile-override "~/.tramp_history"))
tramp-use-scp-direct-remote-copying t
tramp-verbose 2)
:config (progn
;; Use direct async processes for creating processes; see
;; https://coredumped.dev/2025/06/18/making-tramp-go-brrrr./#use-direct-async.
(connection-local-set-profile-variables
'remote-direct-async-process
'((tramp-direct-async-process . t)))
(connection-local-set-profiles
'(:application tramp :protocol "scp")
'remote-direct-async-process)
(connection-local-set-profiles
'(:application tramp :protocol "pscp")
'remote-direct-async-process)))
(use-package trashed (use-package trashed
;; A simple dired-like interface to the system trash bin ;; A simple dired-like interface to the system trash bin
@ -3139,8 +3118,7 @@ eventuelly be set to nil, however)."
(bind-key "<f5>" #'project-find-regexp) (bind-key "<f5>" #'project-find-regexp)
(bind-key "<f6>" #'text-scale-adjust) (bind-key "<f6>" #'text-scale-adjust)
(bind-key "<f7>" #'dictcc) (bind-key "<f7>" #'dictcc)
(bind-key "<f8>" #'hydra-org-linking/body) (bind-key "<f9>" #'hydra-org-linking/body)
(bind-key "<f9>" #'magit-dispatch)
(bind-key "<f10>" #'magit-status) (bind-key "<f10>" #'magit-status)
(bind-key "C-," #'mc/skip-to-previous-like-this) (bind-key "C-," #'mc/skip-to-previous-like-this)
(bind-key "C-." #'mc/skip-to-next-like-this) (bind-key "C-." #'mc/skip-to-next-like-this)