From 0b8909d8fb17a1300cb26b826e59b1d0f60ec7b4 Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Mon, 21 Nov 2016 16:20:25 +0330 Subject: [PATCH] magit key binding added. projectile-ag redefined with projectile-pt --- lib/extensions/development/init.el | 11 +++++++++-- lib/extensions/editor.el | 3 +-- lib/extensions/editor/init.el | 8 +------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/extensions/development/init.el b/lib/extensions/development/init.el index 58a8f25..6123f52 100644 --- a/lib/extensions/development/init.el +++ b/lib/extensions/development/init.el @@ -23,7 +23,6 @@ (error (message "Invalid expression") (insert (current-kill 0))))) - ;;;###autoload (defun enable-pt-search () (interactive) @@ -52,7 +51,7 @@ :description "Jump to previous bookmark") (global-set-key (kbd "M-p") 'bm-toggle) - (global-set-key (kbd "M-]") 'bm-next) + (global-set-key (kbd "M-]") 'bm-next) (global-set-key (kbd "M-[") 'bm-previous) (setq bm-in-lifo-order t) @@ -66,6 +65,13 @@ (bm-buffer-save-all) (bm-repository-save)))) + (ability git () + "A wonderful git interface for FG42" + (cheatsheet-add :group '--Development-- + :key "C-x g" + :description "Rise up MAGIT. Git interface for FG42") + (global-set-key (kbd "C-x g") 'magit-status)) +1 (ability hl () "Highligh the current block of code" (require 'hl-sexp) @@ -210,6 +216,7 @@ (cheatsheet-add :group '--Development-- :key "C-c p s r" :description "Search for a regexp in a project.") + (advice-add 'projectile-ag :around #'projectile-pt) (add-hook 'projectile-mode-hook 'enable-pt-search)) (ability file-browser () diff --git a/lib/extensions/editor.el b/lib/extensions/editor.el index c1312d7..ea13ec8 100644 --- a/lib/extensions/editor.el +++ b/lib/extensions/editor.el @@ -11,8 +11,7 @@ (depends-on 'cheatsheet) (with-ability ivy - (depends-on 'ivy) - (depends-on 'counsel)) + (depends-on 'ivy)) (with-ability ido (depends-on 'ido) diff --git a/lib/extensions/editor/init.el b/lib/extensions/editor/init.el index 4f5a56a..40f257c 100644 --- a/lib/extensions/editor/init.el +++ b/lib/extensions/editor/init.el @@ -150,13 +150,7 @@ (ivy-mode 1) (setq ivy-use-virtual-buffers t) - (global-set-key (kbd "C-c C-r") 'ivy-resume) - (global-set-key (kbd "M-x") 'counsel-M-x) - (global-set-key (kbd " f") 'counsel-describe-function) - (global-set-key (kbd " v") 'counsel-describe-variable) - (global-set-key (kbd " l") 'counsel-load-library) - (global-set-key (kbd " i") 'counsel-info-lookup-symbol) - (global-set-key (kbd " u") 'counsel-unicode-char)) + (global-set-key (kbd "C-c C-r") 'ivy-resume)) ;; Swiper --------------------------------------------------- (ability swiper (ivy)