Merge remote-tracking branch 'origin/master'
2 files changed, 15 insertions(+), 3 deletions(-)
M emacs/.emacs.d/init.org → emacs/.emacs.d/init.org
@@ -18,6 +18,13 @@ (setq file-name-handler-alist nil) (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@@ -229,9 +236,13 @@ (let ((displays (string-to-number (shell-command-to-string "system_profiler SPDisplaysDataType | grep \"Online: Yes\" | wc -l")))) (if (eq displays 1) (ap/set-fonts "Monaco" 16 "Lucida Grande" 16 t 0.2) (ap/set-fonts "Monoid" 12 "Helvetica Neue" 12 t 0.1)))) - ((eq window-system 'x) + ((and (eq window-system 'x) + (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)))) + (ap/set-fonts "Terminus" 18 "Lucida" 14 nil)) + ((and (eq window-system 'x) + (eq system-type 'gnu/linux/windows)) + (ap/set-fonts "Noto Mono" 15 "Sans" 15 nil)))) (ap/set-fonts-according-to-system)) #+END_SRC
M zsh/.config/zsh/.zshenv → zsh/.config/zsh/.zshenv
@@ -40,7 +40,8 @@ then read osrelease < /proc/sys/kernel/osrelease if [[ $osrelease =~ Microsoft$ ]] then - windows=1 + export windows=1 + umask 002 fi fi