Fix magit bindings

[dotemacs] / lisp / my-keys.el

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index 14d9a76012d09d431523524678a83ef20fc87695..6c7d1f020ad1592a29cd7ac8874ef4aec57c5534 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -4,17 +4,13 @@
 (global-set-key (kbd "C-z") nil)
 (global-set-key (kbd "C-x C-z") nil)
 
-;; General commands
-(global-set-key (kbd "M-x") 'counsel-M-x)
-
 ;; Search
 (global-set-key (kbd "C-s") 'counsel-grep-or-swiper)
 (global-set-key (kbd "C-r") 'ivy-resume)
 
 ;; Files/buffers
-(global-set-key (kbd "C-x C-f") 'counsel-find-file)
-(global-set-key (kbd "C-x f") 'counsel-git)
-(global-set-key (kbd "C-x g") 'counsel-git-grep)
+(global-set-key (kbd "C-x f") 'counsel-rg-jump)
+(global-set-key (kbd "C-x g") 'counsel-rg)
 (global-set-key (kbd "C-x l") 'counsel-locate)
 (global-set-key (kbd "C-x c") 'my/kill-buffers-not-in-frame)
 (global-set-key (kbd "C-x C-b") 'ibuffer)
@@ -26,7 +22,6 @@
 (global-set-key (kbd "C-c g r") 'git-gutter:revert-hunk)
 
 ;; Windows/frames
-(global-set-key (kbd "C-x o") 'ace-window)
 (global-set-key (kbd "C-x 9") 'my/window-resize-mode)
 (global-set-key (kbd "<C-up>") 'windmove-up)
 (global-set-key (kbd "<C-down>") 'windmove-down)
@@ -35,12 +30,8 @@
 
 ;; Movement
 (global-set-key (kbd "M-g f") 'jump-char-forward)
-(global-set-key (kbd "M-g g") 'avy-goto-line)
-(global-set-key (kbd "M-g M-g") 'avy-goto-line)
-(global-set-key (kbd "M-g j") 'avy-goto-word-1)
 
 ;; Text formatting
-(global-set-key (kbd "M-/") 'hippie-expand)
 (global-set-key (kbd "M-;") 'comment-line)
 (global-set-key (kbd "M-i") 'change-inner)
 (global-set-key (kbd "C-o") 'my/open-line-above)
@@ -49,14 +40,14 @@
 (global-set-key (kbd "C-c d") 'my/duplicate-line)
 
 ;; Marking
-(global-set-key (kbd "C-=") 'er/expand-region)
-(global-set-key (kbd "C-c l") 'mc/edit-lines)
-(global-set-key (kbd "C-c m") 'mc/mark-more-like-this-extended)
-(global-set-key (kbd "C-.") 'goto-last-change)
-(global-set-key (kbd "C-,") 'goto-last-change-reverse)
+(global-set-key (kbd "M-=") 'er/expand-region)
+(global-set-key (kbd "C-c m a") 'mc/mark-all-dwim)
+(global-set-key (kbd "C-c m l") 'mc/edit-lines)
+(global-set-key (kbd "C-c m m") 'mc/mark-more-like-this-extended)
+(global-set-key (kbd "C-c m p") 'mc/mark-previous-like-this)
+(global-set-key (kbd "C-c m n") 'mc/mark-next-like-this)
 
 ;; Killing and deleting
-(global-set-key (kbd "M-y") 'counsel-yank-pop)
 (global-set-key (kbd "M-z") 'zap-up-to-char)
 (global-set-key (kbd "C-c k") 'kill-whole-line)
 (global-set-key (kbd "C-c s") 'my/substitute-line)
@@ -64,8 +55,8 @@
 ;; Mode switching
 (global-set-key (kbd "C-x C-j") 'direx-project:jump-to-project-root-other-window)
 (global-set-key (kbd "C-c g s") 'magit-status)
-(global-set-key (kbd "C-c g g") 'magit-dispatch-popup)
-(global-set-key (kbd "C-c g f") 'magit-file-popup)
+(global-set-key (kbd "C-c g g") 'magit-dispatch)
+(global-set-key (kbd "C-c g f") 'magit-file-dispatch)
 (global-set-key (kbd "<f8>") 'flyspell-mode)
 (global-set-key (kbd "<f9>") 'whitespace-mode)
 (global-set-key (kbd "<f10>") 'toggle-truncate-lines)