Merge remote-tracking branch 'refs/remotes/origin/master'
1 file changed, 17 insertions(+), 5 deletions(-)
jump to
M emacs/init.el → emacs/init.el
@@ -475,10 +475,12 @@ (when (eq system-type 'darwin) (set-keyboard-coding-system nil) (setq mac-option-modifier 'meta - mac-control-modifier 'command + mac-right-option-modifier 'left + mac-control-modifier 'control mac-right-control-modifier 'left - mac-command-modifier 'control - mac-right-command-modifier 'left)) + mac-command-modifier 'super + mac-right-command-modifier 'left + mac-function-modifier 'hyper)) (unbind-key "<f4>") (bind-key "<f5>" #'compile)@@ -495,6 +497,14 @@ (bind-key "C-x C-j" #'delete-indentation) (unbind-key "C-x C-c") (bind-key "C-c i" #'ucs-insert) + +(unbind-key "s-h") +(unbind-key "s-n") +(unbind-key "s-p") +(unbind-key "s-w") +(unbind-key "s-m") + +(bind-key "s-x" (define-prefix-command 'super-x-map)) (set-register ?e `(file . ,*init-file*))@@ -668,7 +678,8 @@ ;;;; Projects (use-package projectile :ensure t - :bind (("C-c C-f" . projectile-find-file)) + :bind (("C-c C-f" . projectile-find-file) + ("s-x s-f" . projectile-find-file)) :commands (projectile-global-mode)) (use-package project-persist@@ -742,7 +753,8 @@ (setq vc-follow-symlinks t))) (use-package magit :commands (magit-status) - :bind (("C-x g" . magit-status)) + :bind (("C-x g" . magit-status) + ("s-G" . magit-status)) :init (add-hook 'magit-mode-hook #'magit-load-config-extensions)) ;;;; Spelling