diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el index 9ee858511..f425dbf56 100644 --- a/modules/ui/vc-gutter/config.el +++ b/modules/ui/vc-gutter/config.el @@ -80,70 +80,3 @@ to the right fringe.") ;; A non-descript, left-pointing arrow (define-fringe-bitmap 'flycheck-fringe-bitmap-double-arrow [16 48 112 240 112 48 16] nil nil 'center)))) - - -;; (def-package! diff-hl -;; :defer t -;; :init -;; (defun +vc-gutter|init () -;; "Start `diff-hl-mode' if in a file-visiting and tracked buffer." -;; (when (and buffer-file-name -;; (vc-state buffer-file-name) -;; (or +vc-gutter-in-remote-files -;; (not (file-remote-p buffer-file-name)))) -;; (diff-hl-mode +1))) -;; (add-hook! (text-mode prog-mode conf-mode after-save) -;; #'+vc-gutter|init) -;; ;; standardize fringe size -;; (if (fboundp 'fringe-mode) (fringe-mode '4)) -;; :config -;; (setq vc-git-diff-switches '("--histogram")) -;; ;; Update diffs when it makes sense too, without being too slow -;; (if (not +vc-gutter-diff-unsaved-buffer) -;; (add-hook! '(doom-escape-hook focus-in-hook) #'diff-hl-update) -;; (diff-hl-flydiff-mode +1) -;; (add-hook! '(doom-escape-hook focus-in-hook) #'diff-hl-flydiff-update) -;; (when (featurep! :feature evil) -;; (when diff-hl-flydiff-timer -;; (cancel-timer diff-hl-flydiff-timer)) -;; (add-hook 'evil-insert-state-exit-hook #'diff-hl-flydiff-update))) -;; ;; Don't delete the current hunk's indicators while we're editing -;; (advice-remove #'diff-hl-overlay-modified #'ignore) -;; ;; Update diff-hl when magit refreshes -;; (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh) -;; ;; update git-gutter when using these commands -;; (advice-add #'magit-stage :after #'+version-control|update-git-gutter) -;; (advice-add #'magit-unstage :after #'+version-control|update-git-gutter) -;; (advice-add #'magit-stage-file :after #'+version-control|update-git-gutter) -;; (advice-add #'magit-unstage-file :after #'+version-control|update-git-gutter) -;; ;; Draw me like one of your French editors -;; (setq-default fringes-outside-margins t) -;; (cond ((or +vc-gutter-in-margin (not (display-graphic-p))) -;; (diff-hl-margin-mode) -;; (setq diff-hl-margin-symbols-alist -;; '((insert . "❙") (delete . "^") (change . "❙") -;; (unknown . "❙") (ignored . "❙")))) -;; (t -;; ;; Because diff-hl is in the left fringe -;; (setq flycheck-indication-mode 'right-fringe) -;; (defun +vc-gutter|setup-fringe-bitmaps () -;; "Define thin fringe bitmaps for maximum sexiness." -;; (define-fringe-bitmap 'diff-hl-bmp-top [224] nil nil '(center repeated)) -;; (define-fringe-bitmap 'diff-hl-bmp-middle [224] nil nil '(center repeated)) -;; (define-fringe-bitmap 'diff-hl-bmp-bottom [224] nil nil '(center repeated)) -;; (define-fringe-bitmap 'diff-hl-bmp-insert [224] nil nil '(center repeated)) -;; (define-fringe-bitmap 'diff-hl-bmp-single [224] nil nil '(center repeated)) -;; (define-fringe-bitmap 'diff-hl-bmp-delete [240 224 192 128] nil nil 'top)) -;; (defun +vc-gutter-type-at-pos (type _pos) -;; "Return the bitmap for `diff-hl' to use for change at point." -;; (pcase type -;; (`unknown 'question-mark) -;; (`delete 'diff-hl-bmp-delete) -;; (`change 'diff-hl-bmp-middle) -;; (`ignored 'diff-hl-bmp-i) -;; (x (intern (format "diff-hl-bmp-%s" x))))) -;; ;; Tweak the fringe bitmaps so we get long, elegant bars -;; (setq diff-hl-fringe-bmp-function #'+vc-gutter-type-at-pos -;; diff-hl-draw-borders nil) -;; (add-hook 'diff-hl-mode-hook #'+vc-gutter|setup-fringe-bitmaps)))) - diff --git a/modules/ui/vc-gutter/packages.el b/modules/ui/vc-gutter/packages.el index 921b14a94..a12b41b8f 100644 --- a/modules/ui/vc-gutter/packages.el +++ b/modules/ui/vc-gutter/packages.el @@ -2,4 +2,3 @@ ;;; ui/vc-gutter/packages.el (package! git-gutter-fringe) -;; (package! diff-hl)