smarter yank

[dotemacs] / lisp / my-keys.el

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index f15c4dd15a1fa0ffb9f1f2b4209fdcdb8b0a3ed9..29c9f1e2c2ec4882e94c6cc6837e4923e60d14ff 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -1,3 +1,5 @@
+;;; -*- lexical-binding: t -*-
+
 ;; Disable suspend-frame, it's annoying
 (global-set-key (kbd "C-z") nil)
 
@@ -15,6 +17,12 @@
 (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-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 a") 'git-gutter:stage-hunk)
+(global-set-key (kbd "C-c g u") 'git-gutter:revert-hunk)
+(global-set-key (kbd "C-c g r") 'my/git-reset-buffer)
 
 ;; Windows/frames
 (global-set-key (kbd "<C-up>") 'windmove-up)
@@ -23,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 M-j") 'avy-goto-char-timer)
+(global-set-key (kbd "M-g M-l") 'avy-goto-char-in-line)
+(global-set-key (kbd "M-g M-w") 'avy-goto-word-1)
+(global-set-key (kbd "M-g M-g") 'avy-goto-line)
 
 ;; Text formatting
 (global-set-key (kbd "M-/") 'hippie-expand)
-(global-set-key (kbd "M-;") 'my/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") '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)
@@ -38,12 +51,14 @@
 (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-_") 'my/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)
 
 ;; Mode switching
-(global-set-key (kbd "C-x C-j") 'direx:jump-to-directory-other-window)
+(global-set-key (kbd "C-x C-j") 'direx-project:jump-to-project-root-other-window)
 (global-set-key (kbd "<f8>") 'flyspell-mode)
 (global-set-key (kbd "<f9>") 'whitespace-mode)
 (global-set-key (kbd "<f10>") 'toggle-truncate-lines)