diff options
| author | Martin Polden <martin.polden@gmail.com> | 2014-03-21 22:03:41 +0100 |
|---|---|---|
| committer | Martin Polden <martin.polden@gmail.com> | 2014-03-21 22:03:41 +0100 |
| commit | 48b53b3c0de1b5583a4947fdac8b174f6429721d (patch) | |
| tree | fd100e8fb3eefe0b7fad99748047a11f83d1b2df /lisp/init-mac.el | |
| parent | f7cc1ca71092b00757f1b1794a94fadd6c4965f8 (diff) | |
Check for OS X at top-level (init.el)
Diffstat (limited to 'lisp/init-mac.el')
| -rw-r--r-- | lisp/init-mac.el | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/lisp/init-mac.el b/lisp/init-mac.el index 00e228e..67bb13a 100644 --- a/lisp/init-mac.el +++ b/lisp/init-mac.el @@ -1,32 +1,30 @@ -;; mac-specific settings -(when (eq system-type 'darwin) - ;; set font - (set-face-attribute 'default nil :family "Source Code Pro") - (set-face-attribute 'default nil :height 140) +;; set font +(set-face-attribute 'default nil :family "Source Code Pro") +(set-face-attribute 'default nil :height 140) - ;; configure modifiers - (setq mac-option-modifier 'super) - (setq mac-command-modifier 'meta) - (setq ns-function-modifier 'hyper) +;; configure modifiers +(setq mac-option-modifier 'super) +(setq mac-command-modifier 'meta) +(setq ns-function-modifier 'hyper) - ;; Norwegian mac-keyboard - (define-key key-translation-map (kbd "s-8") (kbd "[")) - (define-key key-translation-map (kbd "s-(") (kbd "{")) - (define-key key-translation-map (kbd "s-9") (kbd "]")) - (define-key key-translation-map (kbd "s-)") (kbd "}")) - (define-key key-translation-map (kbd "s-7") (kbd "|")) - (define-key key-translation-map (kbd "s-/") (kbd "\\")) - (define-key key-translation-map (kbd "M-s-7") (kbd "M-|")) +;; Norwegian mac-keyboard +(define-key key-translation-map (kbd "s-8") (kbd "[")) +(define-key key-translation-map (kbd "s-(") (kbd "{")) +(define-key key-translation-map (kbd "s-9") (kbd "]")) +(define-key key-translation-map (kbd "s-)") (kbd "}")) +(define-key key-translation-map (kbd "s-7") (kbd "|")) +(define-key key-translation-map (kbd "s-/") (kbd "\\")) +(define-key key-translation-map (kbd "M-s-7") (kbd "M-|")) - ;; don't open files from the workspace in a new frame - (setq ns-pop-up-frames nil) +;; don't open files from the workspace in a new frame +(setq ns-pop-up-frames nil) - ;; move deleted files to ~/.Trash - (setq delete-by-moving-to-trash t - trash-directory "~/.Trash/emacs") +;; move deleted files to ~/.Trash +(setq delete-by-moving-to-trash t + trash-directory "~/.Trash/emacs") - ;; use path from shell - (require-package 'exec-path-from-shell) - (exec-path-from-shell-initialize)) +;; use path from shell +(require-package 'exec-path-from-shell) +(exec-path-from-shell-initialize) (provide 'init-mac) |