+;;; -*- lexical-binding: t -*-
+
;; Disable suspend-frame, it's annoying
(global-set-key (kbd "C-z") nil)
(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 k") 'my/kill-buffers-not-in-frame)
+(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)
(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-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-z") 'zap-up-to-char)
;; 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)