From a32c5f78690cb00262d5f05b40bba33935dbf66e Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 22 Jan 2019 04:10:57 -0500
Subject: [PATCH] Move macos super key fixes to meta

And add Option motion keybinds.
---
 modules/config/default/config.el | 41 ++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index cab5e16d9..83507b5f4 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -132,28 +132,33 @@
   ;; Fix MacOS shift+tab
   (define-key input-decode-map [S-iso-lefttab] [backtab])
   ;; Fix conventional OS keys in Emacs
-  (map! "s-`" #'other-frame  ; fix frame-switching
+  (map! "M-`" #'other-frame  ; fix frame-switching
         ;; fix OS window/frame navigation/manipulation keys
-        "s-w" #'delete-window
-        "s-W" #'delete-frame
-        "s-n" #'+default/new-buffer
-        "s-N" #'make-frame
-        "s-q" (if (daemonp) #'delete-frame #'evil-quit-all)
+        "M-w" #'delete-window
+        "M-W" #'delete-frame
+        "M-n" #'+default/new-buffer
+        "M-N" #'make-frame
+        "M-q" (if (daemonp) #'delete-frame #'evil-quit-all)
         ;; Restore OS undo, save, copy, & paste keys (without cua-mode, because
         ;; it imposes some other functionality and overhead we don't need)
-        "s-z" #'undo
-        "s-c" (if (featurep 'evil) #'evil-yank #'copy-region-as-kill)
-        "s-v" #'yank
-        "s-s" #'save-buffer
+        "M-z" #'undo
+        "M-c" (if (featurep 'evil) #'evil-yank #'copy-region-as-kill)
+        "M-v" #'yank
+        "M-s" #'save-buffer
         ;; Buffer-local font scaling
-        "s-+" (λ! (text-scale-set 0))
-        "s-=" #'text-scale-increase
-        "s--" #'text-scale-decrease
-        ;; Conventional text-editing keys
-        "s-a" #'mark-whole-buffer
-        :gi [s-return]    #'+default/newline-below
-        :gi [s-S-return]  #'+default/newline-above
-        :gi [s-backspace] #'doom/backward-kill-to-bol-and-indent))
+        "M-+" (λ! (text-scale-set 0))
+        "M-=" #'text-scale-increase
+        "M--" #'text-scale-decrease
+        ;; Conventional text-editing keys & motions
+        "M-a" #'mark-whole-buffer
+        :gi [M-return]    #'+default/newline-below
+        :gi [M-S-return]  #'+default/newline-above
+        :gi [M-backspace] #'doom/backward-kill-to-bol-and-indent
+        :gi [M-left]      #'doom/backward-to-bol-or-indent
+        :gi [M-right]     #'doom/forward-to-last-non-comment-or-eol
+        :gi [A-backspace] #'backward-kill-word
+        :gi [A-left]      #'backward-word
+        :gi [A-right]     #'forward-word))
 
 
 ;;