diff options
author | Alan Pearce | 2013-08-31 11:47:12 +0100 |
---|---|---|
committer | Alan Pearce | 2013-08-31 11:47:12 +0100 |
commit | 7d584cc54ba2162560334261a6f1acfb78530603 (patch) | |
tree | 118d4def3b90df62f5036b0cbf322df93e60ae5c /emacs | |
parent | 94ab675f400ca76e1c45376393bcf974579caacb (diff) | |
parent | a4fd9c1ab8fd8a7e1dc2695876ede8c83f5eaff4 (diff) | |
download | nixfiles-7d584cc54ba2162560334261a6f1acfb78530603.tar.lz nixfiles-7d584cc54ba2162560334261a6f1acfb78530603.tar.zst nixfiles-7d584cc54ba2162560334261a6f1acfb78530603.zip |
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'emacs')
-rw-r--r-- | emacs/init.el | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/emacs/init.el b/emacs/init.el index f15386fe..c26d1428 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -475,10 +475,12 @@ Values: `desktop', `server', `laptop'") (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) @@ -496,6 +498,14 @@ Values: `desktop', `server', `laptop'") (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*)) ;; Enable narrowing functions C-x n @@ -668,7 +678,8 @@ Values: `desktop', `server', `laptop'") (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 @@ Also returns nil if pid is nil." (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 |