      "--no-ext-diff" "--stat" "--diff-algorithm=histogram"))
   (git-commit-style-convention-checks '(non-empty-second-line overlong-summary-line))
   (magit-diff-refine-hunk t)
+  (magit-ediff-dwim-show-on-hunks t)
   (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
   (magit-process-popup-time 20)
   (magit-refs-show-commit-count 'all))

  (when-let* ((buf (get-buffer "*Packages*")))
    (switch-to-buffer buf)
    (kill-buffer-and-window)))

;;
;; Packages needed no matter what, and usually others are depended on it


(csetq tooltip-resize-echo-area t)
(csetq tooltip-delay 0.5)
(csetq x-gtk-use-system-tooltips nil)

(csetq tramp-default-method "ssh")
(csetq tramp-verbose 2)

(csetq uniquify-buffer-name-style 'post-forward-angle-brackets)
(csetq uniquify-after-kill-buffer-p t)

;; simple.el
(csetq mark-ring-max 128)
