summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Kosarek <mattkae@protonmail.com>2022-10-20 08:43:18 -0400
committerMatthew Kosarek <mattkae@protonmail.com>2022-10-20 08:43:18 -0400
commit6585e7aa048583bac0fc76f72dabed450bf81394 (patch)
tree96193219d25a353ebff22fd9e9e62a7adc4b574d
parent6cbc3e5f85e86ccce5a6b6dd40abd41464d371d4 (diff)
Git gutter mode
-rw-r--r--.gitignore1
-rw-r--r--init.el4
-rw-r--r--lisp/general.el20
3 files changed, 23 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index f205f1b..4dc5bb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ projects
.emacs.desktop.lock
projectile.cache
ido.last
+transient \ No newline at end of file
diff --git a/init.el b/init.el
index 0b8051a..aa8190f 100644
--- a/init.el
+++ b/init.el
@@ -59,11 +59,11 @@
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(custom-safe-themes
- '("5859f61b502aa335b502b231c86a051210cb5974f74966e620c31be3a966659f" "32a9fa0f3722e679ed77a28aed3ae99161ef54dc27c35fd19e68e0410633960b" default))
+ '("5859f61b502aa335b502b231c86a051210cb5974f74966e620c31be3a966659f" "32a9fa0f3722e679ed77a28aed3ae99161ef54dc27c35fd19e68e0410633960b" default))
'(org-agenda-files (list org-directory))
'(org-directory "~/Documents/org")
'(package-selected-packages
- '(vterm-toggle vterm minimap neotree good-scroll counsel ## smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org)))
+ '(git-gutter-fringe git-gutter vterm-toggle vterm minimap neotree good-scroll counsel ## smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org)))
;;; init.el ends here
(custom-set-faces
diff --git a/lisp/general.el b/lisp/general.el
index 6474c00..2428518 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -99,6 +99,26 @@
(global-hl-line-mode 1)
(set-face-background 'hl-line "gray97")
+;; Git
+(use-package git-gutter
+ :ensure t
+ :hook (prog-mode . git-gutter-mode)
+ :config
+ (setq git-gutter:update-interval 0.02)
+ (setq git-gutter:window-width 1)
+ (set-face-background 'git-gutter:modified "dark magenta")
+ (set-face-background 'git-gutter:deleted "tomato")
+ (set-face-background 'git-gutter:added "forest green"))
+
+(custom-set-variables
+ '(git-gutter:modified-sign " ")
+ '(git-gutter:added-sign "++")
+ '(git-gutter:deleted-sign "--"))
+
+(use-package git-gutter-fringe
+ :ensure t)
+
+
;; Show flycheck always and after save
(use-package flycheck :ensure t)
(global-flycheck-mode)