summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2017-07-17 21:13:17 +0200
committerAlan Pearce2017-07-17 21:13:17 +0200
commit04f12bf003757d4077dc65f3c47197cb68bd5867 (patch)
tree40911adc02e1a4a947c9f134c4876687aa930949
parentc64b531ae29243fffdb45beb5525be1206a19d9f (diff)
parentb3389fa7dcfeb4fbb79c424a7b434cafe96663e0 (diff)
downloadnixfiles-04f12bf003757d4077dc65f3c47197cb68bd5867.tar.lz
nixfiles-04f12bf003757d4077dc65f3c47197cb68bd5867.tar.zst
nixfiles-04f12bf003757d4077dc65f3c47197cb68bd5867.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--emacs/.emacs.d/init.org6
1 files changed, 2 insertions, 4 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 8a383fc2..344914dd 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -201,9 +201,7 @@ quite easily.
 #+BEGIN_SRC emacs-lisp
 (use-package base16-theme
   :if (or window-system
-          (daemon-p))
-  :config (progn
-            (load-theme 'base16-mexico-light t)))
+          (daemon-p)))
 #+END_SRC
 
 Highlighting quasi-quoted expressions in lisps is quite useful, but I
@@ -249,7 +247,7 @@ because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresource
           (eq window-system 'ns))
       (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 "Fira Code" 14 "Lucida Grande" 14 t nil)
           (ap/set-fonts "Monoid" 12 "Helvetica Neue" 12 t 0.1))))
      ((and (eq window-system 'x)
            (not (eq system-type 'gnu/linux/windows)))