+;; Disable suspend-frame, it's annoying
+(global-set-key (kbd "C-z") nil)
+
;; General commands
(global-set-key (kbd "M-x") 'counsel-M-x)
;; Search
(global-set-key (kbd "C-s") 'swiper)
-(global-set-key (kbd "C-c r") 'ivy-resume)
+(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-find-file)
(global-set-key (kbd "C-c f") 'counsel-git)
(global-set-key (kbd "C-c g") 'counsel-git-grep)
-(global-set-key (kbd "C-x C-k") 'kill-buffers-not-in-frame)
+(global-set-key (kbd "C-x C-k") 'my/kill-buffers-not-in-frame)
(global-set-key (kbd "C-x C-b") 'ibuffer)
(global-set-key (kbd "C-x C-r") 'ivy-recentf)
(global-set-key (kbd "M-/") 'hippie-expand)
(global-set-key (kbd "M-;") 'toggle-comment-on-line)
(global-set-key (kbd "M-i") 'change-inner)
-(global-set-key (kbd "C-o") 'open-line-above)
-(global-set-key (kbd "M-o") 'open-line-below)
+(global-set-key (kbd "C-o") 'my/open-line-above)
+(global-set-key (kbd "M-o") 'my/open-line-below)
;; Marking
(global-set-key (kbd "C-=") 'er/expand-region)
;; Killing and deleting
(global-set-key (kbd "M-y") 'counsel-yank-pop)
-(global-set-key (kbd "M-_") 'copy-line)
+(global-set-key (kbd "M-_") 'my/copy-line)
(global-set-key (kbd "M-z") 'zap-up-to-char)
-;; Flyspell
+;; Mode switching
(global-set-key (kbd "<f8>") 'flyspell-mode)
+(global-set-key (kbd "<f9>") 'whitespace-mode)
+(global-set-key (kbd "<f10>") 'toggle-truncate-lines)