emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Back to command = super, option = meta on MacOS

Browse source 
On MacOS, command used to be 'meta, which Emacs (and many packages) use
for many keybinds. I don't want to pollute the command key, so it is now
meta (as is the Emacs default).

The MacOS keybind fixes have been moved back to super.
This commit is contained in:
Henrik Lissner 2019-01-22 18:03:22 -05:00
parent f45073880b
commit f264a9bc6e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/core-os.el
View file

@ -15,8 +15,8 @@
"Inject VARS from your shell environment into Emacs.") "Inject VARS from your shell environment into Emacs.")
(cond (IS-MAC (cond (IS-MAC
(setq mac-command-modifier 'meta (setq mac-command-modifier 'super
mac-option-modifier 'alt mac-option-modifier 'meta
;; sane trackpad/mouse scroll settings ;; sane trackpad/mouse scroll settings
mac-redisplay-dont-reset-vscroll t mac-redisplay-dont-reset-vscroll t
mac-mouse-wheel-smooth-scroll nil mac-mouse-wheel-smooth-scroll nil

3
modules/config/default/+evil-bindings.el
View file

@ -19,7 +19,8 @@
(map! (:map override (map! (:map override
;; A little sandbox to run code in ;; A little sandbox to run code in
"M-;" #'eval-expression "M-;" #'eval-expression
"A-;" #'eval-expression) "A-;" #'eval-expression
(:when IS-MAC "s-;" #'eval-expression))
[remap evil-jump-to-tag] #'projectile-find-tag [remap evil-jump-to-tag] #'projectile-find-tag
[remap find-tag] #'projectile-find-tag [remap find-tag] #'projectile-find-tag

44
modules/config/default/config.el
View file

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