diff options
| -rw-r--r-- | config/emacs/init.el | 31 | ||||
| -rw-r--r-- | config/emacs/site-lisp/my-modal.el | 2 |
2 files changed, 20 insertions, 13 deletions
diff --git a/config/emacs/init.el b/config/emacs/init.el index 27eef38..e35d458 100644 --- a/config/emacs/init.el +++ b/config/emacs/init.el @@ -105,7 +105,6 @@ reverse. Delete trailing whitespace." (modify-syntax-entry ?_ "w") (hs-minor-mode 1) (display-fill-column-indicator-mode 1) - (smerge-mode 1) ;; (when (derived-mode-p '(c-mode c++-mode)) ;; (c-guess)) (add-hook 'before-save-hook @@ -331,26 +330,31 @@ With ARG, don't save the current layout." (keymap-set my/keys-mode-map "C-x -" 'my/swap-other-window-buffer) (keymap-set my/keys-mode-map "C-x w o" 'my/toggle-window-other-reachability) - (keymap-set my/keys-mode-map "M-w" 'copy-region-as-kill) ; make copying not flash cursor + + (keymap-set my/keys-mode-map "C-M-z" 'my/wrap-sexp) + + (keymap-set my/keys-mode-map "C-c R" 'raise-sexp) + (keymap-set my/keys-mode-map "C-c r" 'delete-pair) + + (keymap-set my/keys-mode-map "M-s g" 'grep) + (keymap-set my/keys-mode-map "M-s r" 'query-replace-regexp) + + (keymap-set my/keys-mode-map "M-w" 'copy-region-as-kill) (keymap-set my/keys-mode-map "M-(" 'my/wrap-region-paren) (keymap-set my/keys-mode-map "M-z" 'my/zap-whitespace) - (keymap-set my/keys-mode-map "C-M-z" 'my/wrap-sexp) (keymap-set my/keys-mode-map "M-o" 'other-window) (keymap-set my/keys-mode-map "M-RET" 'my/eshell) (keymap-set my/keys-mode-map "M-C" 'calc) (keymap-set my/keys-mode-map "M-K" 'my/kill-buffer) (keymap-set my/keys-mode-map "M-D" 'my/vc-on-root) - (keymap-set my/keys-mode-map "M-J" 'scroll-lock-mode) (keymap-set my/keys-mode-map "M-Q" 'auto-fill-mode) (keymap-set my/keys-mode-map "M-A" 'beginning-of-line-text) (keymap-set my/keys-mode-map "M-R" 'my/layout-swap) (keymap-set my/keys-mode-map "M-W" 'switch-to-buffer) (keymap-set my/keys-mode-map "M-N" 'man) (keymap-set my/keys-mode-map "M-*" 'my/shell-at-root) - (keymap-set my/keys-mode-map "C-c R" 'raise-sexp) - (keymap-set my/keys-mode-map "C-c r" 'delete-pair) (keymap-set my/keys-mode-map "M-S" 'surround-prefix) - (keymap-set my/keys-mode-map "M-\"" 'my/activate-mark) + (keymap-set my/keys-mode-map "M-J" 'my/activate-mark) (my/keys-mode 1)) @@ -538,19 +542,23 @@ With ARG, don't save the current layout." (emacs-lock-mode 'kill) (iimage-mode 1))))) +(progn ; vc and related binds + (setq vc-follow-symlinks t) + (vc-auto-revert-mode 1) + (add-hook 'prog-mode-hook 'smerge-mode)) + (progn ; confirm fewer things (setq kill-buffer-query-functions (delq 'process-kill-buffer-query-function kill-buffer-query-functions)) (setq confirm-kill-processes nil) - (setq async-shell-command-buffer 'new-buffer) - (setq vc-follow-symlinks t)) + (setq async-shell-command-buffer 'new-buffer)) ;; misc vars (setq delete-pair-blink-delay 0 enable-recursive-minibuffers t frame-resize-pixelwise t) (electric-pair-mode 1) -(vc-auto-revert-mode 1) +(electric-indent-mode 1) ;;; External packages: @@ -728,8 +736,7 @@ With ARG, don't save the current layout." (global-visible-mark-mode 1)) (use-package avy ; goto location by char pair and jump list - :bind (("C-'" . avy-goto-char-2) - ("M-G" . avy-goto-char-2)) + :bind (("M-G" . avy-goto-char-2)) :custom (avy-all-windows nil) (avy-all-windows-alt 'all-frames)) diff --git a/config/emacs/site-lisp/my-modal.el b/config/emacs/site-lisp/my-modal.el index 579524f..b026fe9 100644 --- a/config/emacs/site-lisp/my-modal.el +++ b/config/emacs/site-lisp/my-modal.el @@ -317,4 +317,4 @@ trigger EFFECT or consult UNTIL." (remove-hook 'after-change-major-mode-hook 'mm/enable-normal-state))) ;; And we're off! -(mm/global-modal-mode 1) +;; (mm/global-modal-mode 1) |