(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)
;; 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 "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)