all repos — nixfiles @ 5d1e45b22d968d016dd2bb419e080c6679ef3081

System and user configuration, managed by nix and home-manager

Merge remote-tracking branch 'origin/master'
Alan Pearce alan@alanpearce.uk
Mon, 06 Feb 2017 08:51:20 +0100
commit

5d1e45b22d968d016dd2bb419e080c6679ef3081

parent

57d40296cdb4ad759b857b0ea4c396d2ade94b80

2 files changed, 3 insertions(+), 3 deletions(-)

jump to
M tag-emacs/emacs.d/init.org → tag-emacs/emacs.d/init.org
@@ -232,8 +232,8 @@ (if (eq displays 1)             (ap/set-fonts "SF Mono" 12 "Lucida Grande" 12 t)
           (ap/set-fonts "Monaco" 10 "Lucida Grande" 12 nil))))
      ((eq window-system 'x)
-      (set-fontset-font "fontset-default" 'unicode (font-spec :name "Terminus" :size 12))
-      (ap/set-fonts "Terminus" 12 "Lucida" 10 nil))))
+      (set-fontset-font "fontset-default" 'unicode (font-spec :name "Terminus" :size 10))
+      (ap/set-fonts "Terminus" 10 "Lucida" 10 nil))))
 
   (ap/set-fonts-according-to-system))
 #+END_SRC
M tag-zsh/config/zsh/zshenv → tag-zsh/config/zsh/zshenv
@@ -1,4 +1,4 @@-if [[ $SHLVL -eq 1 || (-n $DISPLAY && $SHLVL -lt 3) ]]
+if [[ $SHLVL -eq 1 || -n $DISPLAY ]]
 then
   if [[ -f $ZDOTDIR/zshenv.local ]]
   then