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

Move OS constants to core/core.el

Browse source 
So it is universally available to all of Doom, rather than excluding
sessions that haven't called doom-initialize interactively.
This commit is contained in:
Henrik Lissner 2018-06-08 13:31:45 +02:00
parent bc2f8a0ec9
commit 81c465a545
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 47 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

89
core/core-os.el
View file

@ -1,57 +1,52 @@
;;; core-os.el -*- lexical-binding: t; -*- ;;; core-os.el -*- lexical-binding: t; -*-
(defconst IS-MAC (eq system-type 'darwin)) ;; clipboard
(defconst IS-LINUX (eq system-type 'gnu/linux)) (setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT TEXT STRING)
(defconst IS-WINDOWS (memq system-type '(cygwin windows-nt ms-dos))) ;; Use a shared clipboard
select-enable-clipboard t
select-enable-primary t)
(unless noninteractive ;; stop copying each visual state move to the clipboard:
;; clipboard ;; https://bitbucket.org/lyro/evil/issue/336/osx-visual-state-copies-the-region-on
(setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT TEXT STRING) ;; Most of this code grokked from:
;; Use a shared clipboard ;; http://stackoverflow.com/questions/15873346/elisp-rename-macro
select-enable-clipboard t (advice-add #'evil-visual-update-x-selection :override #'ignore)
select-enable-primary t)
;; stop copying each visual state move to the clipboard: (cond (IS-MAC
;; https://bitbucket.org/lyro/evil/issue/336/osx-visual-state-copies-the-region-on (setq mac-command-modifier 'meta
;; Most of this code grokked from: mac-option-modifier 'alt
;; http://stackoverflow.com/questions/15873346/elisp-rename-macro ;; sane trackpad/mouse scroll settings
(advice-add #'evil-visual-update-x-selection :override #'ignore) mac-redisplay-dont-reset-vscroll t
mac-mouse-wheel-smooth-scroll nil
mouse-wheel-scroll-amount '(5 ((shift) . 2)) ; one line at a time
mouse-wheel-progressive-speed nil ; don't accelerate scrolling
;; Curse Lion and its sudden but inevitable fullscreen mode!
;; NOTE Meaningless to railwaycat's emacs-mac build
ns-use-native-fullscreen nil
;; Don't open files from the workspace in a new frame
ns-pop-up-frames nil)
(cond (IS-MAC (if (not (display-graphic-p))
(setq mac-command-modifier 'meta (add-hook 'doom-post-init-hook #'osx-clipboard-mode)
mac-option-modifier 'alt ;; A known problem with GUI Emacs on MacOS: it runs in an isolated
;; sane trackpad/mouse scroll settings ;; environment, so envvars will be wrong. That includes the PATH Emacs
mac-redisplay-dont-reset-vscroll t ;; picks up. `exec-path-from-shell' fixes this.
mac-mouse-wheel-smooth-scroll nil (when (require 'exec-path-from-shell nil t)
mouse-wheel-scroll-amount '(5 ((shift) . 2)) ; one line at a time (def-setting! :env (&rest vars)
mouse-wheel-progressive-speed nil ; don't accelerate scrolling "Inject VARS from your shell environment into Emacs."
;; Curse Lion and its sudden but inevitable fullscreen mode! `(exec-path-from-shell-copy-envs (list ,@vars)))
;; NOTE Meaningless to railwaycat's emacs-mac build (setq exec-path-from-shell-check-startup-files nil
ns-use-native-fullscreen nil exec-path-from-shell-arguments (delete "-i" exec-path-from-shell-arguments))
;; Don't open files from the workspace in a new frame (defvaralias 'exec-path-from-shell-debug 'doom-debug-mode)
ns-pop-up-frames nil) (exec-path-from-shell-initialize))))
(if (not (display-graphic-p)) (IS-LINUX
(add-hook 'doom-post-init-hook #'osx-clipboard-mode) (setq x-gtk-use-system-tooltips nil ; native tooltips are ugly!
;; A known problem with GUI Emacs on MacOS: it runs in an isolated x-underline-at-descent-line t)) ; draw underline lower
;; environment, so envvars will be wrong. That includes the PATH Emacs
;; picks up. `exec-path-from-shell' fixes this.
(when (require 'exec-path-from-shell nil t)
(def-setting! :env (&rest vars)
"Inject VARS from your shell environment into Emacs."
`(exec-path-from-shell-copy-envs (list ,@vars)))
(setq exec-path-from-shell-check-startup-files nil
exec-path-from-shell-arguments (delete "-i" exec-path-from-shell-arguments))
(defvaralias 'exec-path-from-shell-debug 'doom-debug-mode)
(exec-path-from-shell-initialize))))
(IS-LINUX (IS-WINDOWS
(setq x-gtk-use-system-tooltips nil ; native tooltips are ugly! (setq w32-get-true-file-attributes nil) ; fix file io slowdowns
x-underline-at-descent-line t)) ; draw underline lower ))
(IS-WINDOWS
(setq w32-get-true-file-attributes nil) ; fix file io slowdowns
)))
(provide 'core-os) (provide 'core-os)
;;; core-os.el ends here ;;; core-os.el ends here

2
core/core-packages.el
View file

@ -286,10 +286,10 @@ to least)."
(unless (or force-p noninteractive) (unless (or force-p noninteractive)
(doom//reload-package-autoloads)))) (doom//reload-package-autoloads))))
;; Initialize Doom core ;; Initialize Doom core
(require 'core-os)
(unless noninteractive (unless noninteractive
(add-hook! 'emacs-startup-hook (add-hook! 'emacs-startup-hook
#'(doom|post-init doom|display-benchmark)) #'(doom|post-init doom|display-benchmark))
(require 'core-os)
(require 'core-ui) (require 'core-ui)
(require 'core-editor) (require 'core-editor)
(require 'core-projects) (require 'core-projects)

4
core/core.el
View file

@ -16,6 +16,10 @@ line or use --debug-init to enable this.")
(eval-when-compile (not (version< emacs-version "26")))) (eval-when-compile (not (version< emacs-version "26"))))
(defconst EMACS27+ (defconst EMACS27+
(eval-when-compile (not (version< emacs-version "27")))) (eval-when-compile (not (version< emacs-version "27"))))
(defconst IS-MAC (eq system-type 'darwin))
(defconst IS-LINUX (eq system-type 'gnu/linux))
(defconst IS-WINDOWS (memq system-type '(cygwin windows-nt ms-dos)))
;; ;;
(defvar doom-emacs-dir (defvar doom-emacs-dir