more git stuff
This commit is contained in:
parent
378e380cde
commit
39628711b7
13
config.org
13
config.org
|
@ -162,7 +162,10 @@
|
||||||
evil-want-keybinding nil)
|
evil-want-keybinding nil)
|
||||||
:config
|
:config
|
||||||
(evil-mode 1)
|
(evil-mode 1)
|
||||||
(evil-define-key 'normal 'global (kbd "K") #'eldoc-box-help-at-point))
|
(evil-define-key 'normal 'global (kbd "K") #'eldoc-box-help-at-point)
|
||||||
|
(evil-define-key 'normal 'global (kbd "gp") #'diff-hl-show-hunk)
|
||||||
|
(evil-define-key 'normal 'global (kbd "gr") #'diff-hl-revert-hunk)
|
||||||
|
(evil-define-key 'normal 'global (kbd "gs") #'diff-hl-stage-current-hunk))
|
||||||
|
|
||||||
(use-package evil-collection
|
(use-package evil-collection
|
||||||
:ensure t
|
:ensure t
|
||||||
|
@ -286,7 +289,7 @@
|
||||||
((eq system-type 'gnu/linux)
|
((eq system-type 'gnu/linux)
|
||||||
(set-face-attribute 'default nil :font "Iosevka Comfy Medium-12")
|
(set-face-attribute 'default nil :font "Iosevka Comfy Medium-12")
|
||||||
(set-face-attribute 'fixed-pitch nil :font "Iosevka Comfy Medium-12")
|
(set-face-attribute 'fixed-pitch nil :font "Iosevka Comfy Medium-12")
|
||||||
(set-face-attribute 'variable-pitch nil :font "Iosevka Comfy Motion Duo-14")
|
(set-face-attribute 'variable-pitch nil :font "Iosevka Comfy Motion Duo Md-14")
|
||||||
(setq default-frame-alist
|
(setq default-frame-alist
|
||||||
'((font . "Iosevka Comfy Medium-12")
|
'((font . "Iosevka Comfy Medium-12")
|
||||||
(undecorated . t)))))
|
(undecorated . t)))))
|
||||||
|
@ -349,6 +352,12 @@
|
||||||
magit-restore-window-configuration t)
|
magit-restore-window-configuration t)
|
||||||
:bind ("C-x g" . magit-status))
|
:bind ("C-x g" . magit-status))
|
||||||
|
|
||||||
|
(use-package diff-hl
|
||||||
|
:ensure t
|
||||||
|
:hook ((magit-post-refresh . diff-hl-magit-post-refresh))
|
||||||
|
:config
|
||||||
|
(global-diff-hl-mode))
|
||||||
|
|
||||||
(use-package git-gutter
|
(use-package git-gutter
|
||||||
:ensure t
|
:ensure t
|
||||||
:config
|
:config
|
||||||
|
|
Loading…
Reference in a new issue