summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2017-06-01 21:32:48 +0200
committerAlan Pearce2017-06-01 21:32:48 +0200
commit70d61b4a0f23dd6d6d7872f0d4159ffc92ffe267 (patch)
tree535c58ab32c355248cf16caba712391e76fecbe1
parent3ee51fe5f1110072b345638b1fc8d91af92c8c85 (diff)
parentf2f351569ffac639d5773d52f7482e77528eeb2c (diff)
downloadnixfiles-70d61b4a0f23dd6d6d7872f0d4159ffc92ffe267.tar.lz
nixfiles-70d61b4a0f23dd6d6d7872f0d4159ffc92ffe267.tar.zst
nixfiles-70d61b4a0f23dd6d6d7872f0d4159ffc92ffe267.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--emacs/.emacs.d/init.org15
-rw-r--r--zsh/.config/zsh/.zshenv3
2 files changed, 15 insertions, 3 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index b9cbef9b..9b814ecf 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
@@ -229,9 +236,13 @@ because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresource
         (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
diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv
index 51323f10..87dda38c 100644
--- a/zsh/.config/zsh/.zshenv
+++ b/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