diminish more minor modes

[dotemacs] / lisp / my-keys.el

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index aee4588e54d1a0741c23e53ad5460bbef1c775d3..6f5d7328890caf83c8189d05cf63cc23db187022 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,7 +34,7 @@
 (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)
@@ -68,6 +69,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)