Update private bindings

modules/private/hlissner/+bindings.el

@@ -20,13 +20,11 @@
 (map!
  ;; --- Global keybindings ---------------------------
  ;; Make M-x available everywhere
- :nvime "M-x" #'execute-extended-command
- :nvime "A-x" #'execute-extended-command
+ :gnvime "M-x" #'execute-extended-command
+ :gnvime "A-x" #'execute-extended-command
  ;; Emacs debug utilities
- "M-;"        #'eval-expression
- :nvime "M-;" #'eval-expression
- "M-:"        #'doom/open-scratch-buffer
- :nvime "M-:" #'doom/open-scratch-buffer
+ :gnvime "M-;" #'eval-expression
+ :gnvime "M-:" #'doom/open-scratch-buffer
  ;; Text-scaling
  "M-+"       (λ! (text-scale-set 0))
  "M-="       #'text-scale-increase
@@ -51,27 +49,26 @@
  "M-9"       (λ! (+workspace/switch-to 8))
  "M-0"       #'+workspace/switch-to-last
  ;; Other sensible, textmate-esque global bindings
- "M-r"    #'+eval/buffer
- "M-R"    #'+eval/region-and-replace
- "M-b"    #'+eval/build
- "M-a"    #'mark-whole-buffer
- "M-c"    #'evil-yank
- "M-q"    (if (daemonp) #'delete-frame #'save-buffers-kill-emacs)
- "M-s"    #'save-buffer
- "M-v"    #'clipboard-yank
- "M-f"    #'swiper
- "C-M-f"  #'doom/toggle-fullscreen
+ :ne "M-r"   #'+eval/buffer
+ :ne "M-R"   #'+eval/region-and-replace
+ :ne "M-b"   #'+eval/build
+ :ne "M-a"   #'mark-whole-buffer
+ :ne "M-c"   #'evil-yank
+ :ne "M-q"   (if (daemonp) #'delete-frame #'save-buffers-kill-emacs)
+ :ne "M-f"   #'swiper
+ :ne "C-M-f" #'doom/toggle-fullscreen
+ :n  "M-s"   #'save-buffer
  :m  "A-j"   #'+hlissner:multi-next-line
  :m  "A-k"   #'+hlissner:multi-previous-line
  :nv "C-SPC" #'+evil:fold-toggle
+ :gnvimer "M-v" #'clipboard-yank
  ;; Easier window navigation
  :en "C-h"   #'evil-window-left
  :en "C-j"   #'evil-window-down
  :en "C-k"   #'evil-window-up
  :en "C-l"   #'evil-window-right
 
- (:prefix "C-x"
-   "p" #'doom/other-popup)
+ "C-x p"     #'doom/other-popup
 
 
  ;; --- <leader> -------------------------------------
@@ -484,13 +481,12 @@
  ;; git-timemachine
  (:after git-timemachine
    (:map git-timemachine-mode-map
-     :nv "p" #'git-timemachine-show-previous-revision
-     :nv "n" #'git-timemachine-show-next-revision
-     :nv "g" #'git-timemachine-show-nth-revision
-     :nv "q" #'git-timemachine-quit
-     :nv "w" #'git-timemachine-kill-abbreviated-revision
-     :nv "W" #'git-timemachine-kill-revision
-     :nv "b" #'git-timemachine-blame))
+     :n "C-p" #'git-timemachine-show-previous-revision
+     :n "C-n" #'git-timemachine-show-next-revision
+     :n "[["  #'git-timemachine-show-previous-revision
+     :n "]]"  #'git-timemachine-show-next-revision
+     :n "q"   #'git-timemachine-quit
+     :n "gb"  #'git-timemachine-blame))
 
  ;; gist
  (:after gist