From d2347ab4129a975b226aaab0d1d3aba806c5a766 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 1 Jun 2017 17:52:17 +0200 Subject: Emacs: Detect Windows even outside of zsh environment --- emacs/.emacs.d/init.org | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index a6aecc5..0719ad8 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -18,6 +18,13 @@ Open Emacs with just a plain window. No graphics or messages, please! (remove-hook 'find-file-hooks #'vc-refresh-state) #+END_SRC +Are we running on Windows via the WSL? + +#+BEGIN_SRC emacs-lisp +(when (string-match "Microsoft$" (file-to-string "/proc/sys/kernel/osrelease")) + (setq system-type 'gnu/linux/windows)) +#+END_SRC + ** Compatibility #+BEGIN_SRC emacs-lisp @@ -227,12 +234,12 @@ because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresource (ap/set-fonts "Monaco" 16 "Lucida Grande" 16 t 0.2) (ap/set-fonts "Monoid" 12 "Helvetica Neue" 12 t 0.1)))) ((and (eq window-system 'x) - (not (getenv "windows"))) + (not (eq system-type 'gnu/linux/windows))) (set-fontset-font "fontset-default" 'unicode (font-spec :name "Terminus" :size 18)) (ap/set-fonts "Terminus" 18 "Lucida" 14 nil)) ((and (eq window-system 'x) - (getenv "windows")) - (ap/set-fonts "Noto Mono" 15 "Sans" 15 nil)))) + (eq system-type 'gnu/linux/windows)) + (ap/set-fonts "Noto Mono" 15 "Sans" 15 nil))) (ap/set-fonts-according-to-system)) #+END_SRC -- cgit 1.4.1