X-Git-Url: https://code.delx.au/dotemacs/blobdiff_plain/4107744511887482b6af8e1e30763aa7ca7d38e3..d8086c25f927c30bcaae0945a019510c1f999450:/lisp/my-keys.el

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index 372fe2f..7bb45ce 100644
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -1,21 +1,28 @@
+;;; -*- lexical-binding: t -*-
+
 ;; Disable suspend-frame, it's annoying
 (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") '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 f") 'counsel-git)
+(global-set-key (kbd "C-x g") 'counsel-git-grep)
+(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") 'ivy-recentf)
+(global-set-key (kbd "C-x t") 'my/find-prod-or-test-file)
+(global-set-key (kbd "C-c g d") 'git-gutter:popup-hunk)
+(global-set-key (kbd "C-c g p") 'git-gutter:previous-hunk)
+(global-set-key (kbd "C-c g n") 'git-gutter:next-hunk)
+(global-set-key (kbd "C-c g r") 'git-gutter:revert-hunk)
 
 ;; Windows/frames
 (global-set-key (kbd "<C-up>") 'windmove-up)
@@ -24,14 +31,19 @@
 (global-set-key (kbd "<C-right>") 'windmove-right)
 
 ;; Movement
-(global-set-key (kbd "M-g j") 'ace-jump-mode)
+(global-set-key (kbd "M-g f") 'avy-goto-char-in-line)
+(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-;") 'toggle-comment-on-line)
+(global-set-key (kbd "M-;") 'my/comment-dwim)
 (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)
+(global-set-key (kbd "C-c c") 'my/copy-line)
+(global-set-key (kbd "C-c d") 'my/duplicate-line)
 
 ;; Marking
 (global-set-key (kbd "C-=") 'er/expand-region)
@@ -39,9 +51,17 @@
 (global-set-key (kbd "C-c m") 'mc/mark-more-like-this-extended)
 
 ;; 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-_") 'copy-line)
 (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)
 
-;; Flyspell
+;; Mode switching
+(global-set-key (kbd "C-x C-j") 'direx-project:jump-to-project-root-other-window)
+(global-set-key (kbd "C-c g s") 'magit-status)
+(global-set-key (kbd "C-c g g") 'magit-dispatch-popup)
+(global-set-key (kbd "C-c g f") 'magit-file-popup)
 (global-set-key (kbd "<f8>") 'flyspell-mode)
+(global-set-key (kbd "<f9>") 'whitespace-mode)
+(global-set-key (kbd "<f10>") 'toggle-truncate-lines)