|
@@ -49,6 +49,19 @@
|
|
|
(straight-use-package 'evil)
|
|
|
(straight-use-package 'dimmer)
|
|
|
(straight-use-package 'magit)
|
|
|
+(straight-use-package 'diff-hl)
|
|
|
+(straight-use-package 'powerline-evil)
|
|
|
+
|
|
|
+;; Git stuff
|
|
|
+(require 'magit)
|
|
|
+(require 'diff-hl)
|
|
|
+(global-diff-hl-mode)
|
|
|
+(add-hook 'magit-pre-refresh-hook 'diff-hl-magit-pre-refresh)
|
|
|
+(add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)
|
|
|
+
|
|
|
+;; Easily set cua mode on/off so that I don't have to
|
|
|
+;; use shift+insert for paste on mac
|
|
|
+(global-set-key (kbd "C-c c") 'cua-mode)
|
|
|
|
|
|
(require 'dimmer)
|
|
|
(setq dimmer-fraction 0.4)
|
|
@@ -82,6 +95,8 @@
|
|
|
|
|
|
(require 'powerline)
|
|
|
(powerline-default-theme)
|
|
|
+;; Better powerline support for evil mode
|
|
|
+(require 'powerline-evil)
|
|
|
|
|
|
(require 'neotree)
|
|
|
(global-set-key [f8] 'neotree-toggle)
|
|
@@ -133,7 +148,7 @@
|
|
|
;; Your init file should contain only one such instance.
|
|
|
;; If there is more than one, they won't work right.
|
|
|
'(custom-safe-themes
|
|
|
- '("01106ca9b4446341ecb86a76b9db48f1100e2eb13980aa0ec6f6adf8e69fd9a7" "bf798e9e8ff00d4bf2512597f36e5a135ce48e477ce88a0764cfb5d8104e8163" "0feb7052df6cfc1733c1087d3876c26c66410e5f1337b039be44cb406b6187c6" default))
|
|
|
+ '("27a1dd6378f3782a593cc83e108a35c2b93e5ecc3bd9057313e1d88462701fcd" "f703efe04a108fcd4ad104e045b391c706035bce0314a30d72fbf0840b355c2c" "c9ddf33b383e74dac7690255dd2c3dfa1961a8e8a1d20e401c6572febef61045" "01106ca9b4446341ecb86a76b9db48f1100e2eb13980aa0ec6f6adf8e69fd9a7" "bf798e9e8ff00d4bf2512597f36e5a135ce48e477ce88a0764cfb5d8104e8163" "0feb7052df6cfc1733c1087d3876c26c66410e5f1337b039be44cb406b6187c6" default))
|
|
|
'(display-time-mode t)
|
|
|
'(frame-background-mode 'dark))
|
|
|
(custom-set-faces
|