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