diff options
Diffstat (limited to 'lisp/ravi-init-navigation.el')
| -rw-r--r-- | lisp/ravi-init-navigation.el | 86 |
1 files changed, 24 insertions, 62 deletions
diff --git a/lisp/ravi-init-navigation.el b/lisp/ravi-init-navigation.el index 93e778b..a2ed01e 100644 --- a/lisp/ravi-init-navigation.el +++ b/lisp/ravi-init-navigation.el @@ -49,10 +49,7 @@ (defun ravi/without-region-bindings-mode (orig-func &rest args) (let* ((ravi/disable-region-bindings-mode t) (res (apply orig-func args))) - res)) - ) - :ensure t - ) + res)))) (use-package avy :bind (("M-h" . avy-goto-word-1) @@ -63,33 +60,25 @@ (progn (setq avy-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l ?r ?u ?t ?y ?w ?o ?e ?i)) (setq avy-style 'at-full - avy-background t)) - :ensure t) + avy-background t))) (use-package ace-isearch :config (progn (setq ace-isearch-use-ace-jump nil) ; prefer dedicated key for ace-jump (global-ace-isearch-mode +1)) - :disabled t ; helm-swoop has a dedicated key now - :ensure t) + :disabled t) ; helm-swoop has a dedicated key now (use-package jump-char - :bind (("M-m" . jump-char-forward)) - :ensure t - ) + :bind (("M-m" . jump-char-forward))) (use-package imenu-anywhere - :bind ("s-." . imenu-anywhere) - :ensure t - ) + :bind ("s-." . imenu-anywhere)) (use-package expand-region :config (progn - (bind-key "C-=" 'er/expand-region)) - :ensure t - ) + (bind-key "C-=" 'er/expand-region))) (use-package multiple-cursors :bind (("C-S-c C-S-c" . mc/edit-lines) @@ -104,31 +93,25 @@ (bind-key "p" 'mc/mark-previous-like-this region-bindings-mode-map) (bind-key "n" 'mc/mark-next-like-this region-bindings-mode-map) (bind-key "m" 'mc/mark-more-like-this-extended region-bindings-mode-map) - ) - :ensure t - ) + )) (use-package fold-this :commands fold-this :config (progn - (bind-key "t" 'fold-this region-bindings-mode-map)) - :ensure t - ) + (bind-key "t" 'fold-this region-bindings-mode-map))) (use-package indirect :commands indirect-region :config (progn (bind-key "I" 'indirect-region region-bindings-mode-map)) - ) + :ensure nil) (use-package visual-regexp :bind (("C-c r" . vr/replace) ("C-c q" . vr/query-replace) - ("C-c m" . vr/mc-mark)) - :ensure t - ) + ("C-c m" . vr/mc-mark))) (bind-key "<M-f6>" 'ff-find-other-file) @@ -144,10 +127,7 @@ (add-hook 'emacs-lisp-mode-hook 'smartparens-mode) (add-hook 'emacs-lisp-mode-hook 'sp-use-smartparens-bindings) (use-package minor-mode-hack :ensure t) - (raise-minor-mode-map-alist 'region-bindings-mode) - ) - :ensure t - ) + (raise-minor-mode-map-alist 'region-bindings-mode))) (use-package corral :bind (("M-9" . corral-parentheses-backward) @@ -159,24 +139,21 @@ ("M-\"" . corral-double-quotes-backward)) :config (progn - (setq corral-preserve-point t)) - :ensure t) + (setq corral-preserve-point t))) ;; Marking and moving lines (defun ravi/pull-up-a-line() "Pull up the next line" (interactive) - (join-line -1) - ) + (join-line -1)) (bind-key "M-j" 'ravi/pull-up-a-line) (use-package move-lines :bind (("<S-down>" . move-lines-down) - ("<S-up>" . move-lines-up) - ) - ) + ("<S-up>" . move-lines-up)) + :ensure nil) ;; From Kyle Sherman's comment at ;; http://emacs-fu.blogspot.com/2010/01/duplicating-lines-and-commenting-them.html @@ -211,8 +188,7 @@ (global-key-combo-mode 1) (key-combo-define-global (kbd "C-a") `(back-to-indentation move-beginning-of-line - key-combo-return))) - :ensure t) + key-combo-return)))) (defun ravi/Fuco-point-in-comment () "Determine if the point is inside a comment" @@ -251,22 +227,18 @@ ) (add-hook 'prog-mode-hook 'turn-on-whole-line-or-region-mode) ) - :diminish whole-line-or-region-mode - :ensure t - ) + :diminish whole-line-or-region-mode) ;; This must be after enabling whole-line-or-region (use-package easy-kill :config (progn (global-set-key [remap kill-ring-save] 'easy-kill) - (global-set-key [remap whole-line-or-region-kill-ring-save] 'easy-kill)) - :ensure t) + (global-set-key [remap whole-line-or-region-kill-ring-save] 'easy-kill))) ;; grep and friends -(use-package wgrep - :ensure t) +(use-package wgrep) (if (executable-find "ag") ;; Prefer the silver-searcher if available @@ -278,9 +250,7 @@ (progn (setq ag-highlight-search t) (setq ag-reuse-buffers t) - (use-package wgrep-ag - :ensure t)) - :ensure t) + (use-package wgrep-ag))) ;; Use grep if ag is not available on the system (use-package grep :bind (("H-g" . grep)))) @@ -304,9 +274,7 @@ (highlight-symbol-next) (set-temporary-overlay-map ravi/highlight-symbol-overlay-map t)) ) - :disabled t ; M-s . suffices for my needs - :ensure t - ) + :disabled t) ; M-s . suffices for my needs (let ((ad-redefinition-action 'accept)) (use-package color-moccur @@ -318,11 +286,7 @@ (bind-key "M-O" 'isearch-moccur-all isearch-mode-map)) :config - (use-package moccur-edit) - - :ensure t - ) - ) + (use-package moccur-edit))) ;; Delete via isearch (defun zap-to-isearch (rbeg rend) @@ -402,8 +366,7 @@ ("s" swoop) ("m" swoop-multi "multi") ("r" swoop-pcre "pcre") - ("b" swoop-back-to-last-position "back"))) - :ensure t) + ("b" swoop-back-to-last-position "back")))) (bind-key (kbd "y") 'info-display-manual help-map) @@ -412,8 +375,7 @@ (progn (beginend-global-mode) (dolist (m beginend-modes) - (diminish (cdr m)))) - :ensure t) + (diminish (cdr m))))) (require 'midnight) |