From 1e5cc844d26d88df5b3fb4a65b81b65531eed288 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 2 Apr 2021 10:35:39 +0100 Subject: [PATCH] feat(version-control): add module for git-gutter as an alternative to diff-hl For now I'm still using diff-hl, but I wanted to get git-gutter configured so I can easily give try it out and compare it against diff-hl. --- modules/themes/siren-doom-themes.el | 13 ++++---- modules/version-control/siren-git-gutter.el | 33 +++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 modules/version-control/siren-git-gutter.el diff --git a/modules/themes/siren-doom-themes.el b/modules/themes/siren-doom-themes.el index 877ddc2..0c945d9 100644 --- a/modules/themes/siren-doom-themes.el +++ b/modules/themes/siren-doom-themes.el @@ -115,19 +115,22 @@ (with-eval-after-load 'git-gutter (set-face-attribute 'git-gutter:added nil - :foreground (doom-blend 'vc-added 'bg 0.7)) + :foreground (doom-blend 'vc-added 'bg 0.9)) (set-face-attribute 'git-gutter:deleted nil - :foreground (doom-blend 'vc-deleted 'bg 0.7)) + :foreground (doom-blend 'vc-deleted 'bg 0.9)) (set-face-attribute 'git-gutter:modified nil :foreground (doom-blend 'vc-modified 'bg 0.7))) (with-eval-after-load 'git-gutter-fringe (set-face-attribute 'git-gutter-fr:added nil - :foreground (doom-blend 'vc-added 'bg 0.7)) + :foreground (doom-blend 'vc-added 'bg 0.7) + :background (doom-blend 'vc-added 'bg 0.0)) (set-face-attribute 'git-gutter-fr:deleted nil - :foreground (doom-blend 'vc-deleted 'bg 0.7)) + :foreground (doom-blend 'vc-deleted 'bg 0.7) + :background (doom-blend 'vc-deleted 'bg 0.0)) (set-face-attribute 'git-gutter-fr:modified nil - :foreground (doom-blend 'vc-modified 'bg 0.7))) + :foreground (doom-blend 'vc-modified 'bg 0.7) + :background (doom-blend 'vc-modified 'bg 0.0))) (with-eval-after-load 'hideshowvis (set-face-attribute 'hideshowvis-hidable-face nil diff --git a/modules/version-control/siren-git-gutter.el b/modules/version-control/siren-git-gutter.el new file mode 100644 index 0000000..8fd4270 --- /dev/null +++ b/modules/version-control/siren-git-gutter.el @@ -0,0 +1,33 @@ +;;; siren-git-gutter.el --- jimeh's Emacs Siren: git-gutter configuration. + +;;; Commentary: + +;; Basic configuration for git-gutter. + +;;; Code: + +(use-package git-gutter + :hook + (prog-mode . git-gutter-mode) + (text-mode . git-gutter-mode) + + :custom + (git-gutter:update-interval 1) + (git-gutter:added-sign "+") + (git-gutter:modified-sign "=") + (git-gutter:deleted-sign "-")) + +(use-package git-gutter-fringe + :if window-system + :after git-gutter + :config + ;; Customize fringe bitmaps + (define-fringe-bitmap 'git-gutter-fr:added + [#b00000011] nil nil '(center repeated)) + (define-fringe-bitmap 'git-gutter-fr:modified + [#b00000011] nil nil '(center repeated)) + (define-fringe-bitmap 'git-gutter-fr:deleted + [#b00000011] nil nil '(center repeated))) + +(provide 'siren-git-gutter) +;;; siren-git-gutter.el ends here