More keys for multiple cursors

[dotemacs] / lisp / my-keys.el

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index b8c9469966379753b86115269317802d7cdb105e..0d55f3aae2c867840beb3d90fc59832026d01974 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -8,13 +8,14 @@
 (global-set-key (kbd "M-x") 'counsel-M-x)
 
 ;; Search
-(global-set-key (kbd "C-s") 'swiper)
+(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 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)
 (global-set-key (kbd "C-x C-r") 'counsel-recentf)
@@ -33,14 +34,14 @@
 (global-set-key (kbd "<C-right>") 'windmove-right)
 
 ;; Movement
-(global-set-key (kbd "M-g f") 'avy-goto-char-in-line)
+(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-;") 'my/comment-dwim)
+(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)
 (global-set-key (kbd "M-o") 'my/open-line-below)
@@ -49,11 +50,15 @@
 
 ;; 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-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)
+(global-set-key (kbd "C-.") 'goto-last-change)
+(global-set-key (kbd "C-,") 'goto-last-change-reverse)
 
 ;; Killing and deleting
-(global-set-key (kbd "C-y") 'my/yank)
 (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)
@@ -68,6 +73,14 @@
 (global-set-key (kbd "<f9>") 'whitespace-mode)
 (global-set-key (kbd "<f10>") 'toggle-truncate-lines)
 
+;; Disable some default bindings from the builtin mouse.el
+(global-set-key [C-down-mouse-1] nil)
+(global-set-key [C-down-mouse-2] nil)
+(global-set-key [C-down-mouse-3] nil)
+(global-set-key [S-down-mouse-1] nil)
+(global-set-key [S-down-mouse-2] nil)
+(global-set-key [S-down-mouse-3] nil)
+
 
 (defun my/window-resize-mode ()
   (interactive)