|
|
@ -130,6 +130,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
(global-set-key (kbd "C-d") nil) |
|
|
|
(global-set-key (kbd "C-d") nil) |
|
|
|
(global-set-key (kbd "C-m") nil) |
|
|
|
(global-set-key (kbd "C-m") nil) |
|
|
|
|
|
|
|
(global-set-key (kbd "RET") nil) |
|
|
|
|
|
|
|
|
|
|
|
;; Neotree binds are prefixed by C-t |
|
|
|
;; Neotree binds are prefixed by C-t |
|
|
|
|
|
|
|
|
|
|
@ -147,14 +148,20 @@ |
|
|
|
(global-set-key (kbd "M-l") 'windmove-right) |
|
|
|
(global-set-key (kbd "M-l") 'windmove-right) |
|
|
|
|
|
|
|
|
|
|
|
;; Delete surrounding |
|
|
|
;; Delete surrounding |
|
|
|
|
|
|
|
|
|
|
|
(global-set-key (kbd "C-d s") 'delete-pair) |
|
|
|
(global-set-key (kbd "C-d s") 'delete-pair) |
|
|
|
|
|
|
|
|
|
|
|
;; Git utility |
|
|
|
;; Git utility |
|
|
|
|
|
|
|
|
|
|
|
(global-set-key (kbd "C-m s") 'magit-status) |
|
|
|
(global-set-key (kbd "C-m s") 'magit-status) |
|
|
|
(global-set-key (kbd "C-m b") 'magit-blame-popup) |
|
|
|
(global-set-key (kbd "C-m b") 'magit-blame-popup) |
|
|
|
(global-set-key (kbd "C-m p") 'magit-dispatch-popup) |
|
|
|
(global-set-key (kbd "C-m p") 'magit-dispatch-popup) |
|
|
|
(global-set-key (kbd "C-m f") 'magit-file-popup) |
|
|
|
(global-set-key (kbd "C-m f") 'magit-file-popup) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; Fix RET |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(global-set-key (kbd "RET") 'electric-newline-and-maybe-indent) |
|
|
|
|
|
|
|
|
|
|
|
;;------------------------------------------------------------------------------------- |
|
|
|
;;------------------------------------------------------------------------------------- |
|
|
|
|
|
|
|
|
|
|
|
(custom-set-variables |
|
|
|
(custom-set-variables |
|
|
|