From 1ed94bcb14ff3b7bd5e57bccae0ab1c5b55b7f80 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@twitter.com>
Date: Tue, 16 Jan 2018 09:33:02 -0800
Subject: [emacs] Add back my theme and switch font size / family.

---
 emacs.d/init.el                | 14 +++++++-------
 emacs.d/lib/settings.el        |  2 +-
 emacs.d/lib/wabi-sabi-theme.el |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'emacs.d')

diff --git a/emacs.d/init.el b/emacs.d/init.el
index aa020ac..aefb530 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -3,15 +3,15 @@
 ;; (package-initialize)
 
 (defun emacs-lib (filename)
-  (expand-file-name (concat "lib" "/" filename) user-emacs-directory))
+  (expand-file-name (concat "lib" "/" filename ".el") user-emacs-directory))
 
-(load (emacs-lib "settings.el"))
-(load (emacs-lib "funcs.el"))
-(load (emacs-lib "bindings.el"))
+(load (emacs-lib "settings"))
+(load (emacs-lib "funcs"))
+(load (emacs-lib "bindings"))
+(load (emacs-lib "wabi-sabi-theme"))
 
 (when (>= emacs-major-version 24)
-  (load (emacs-lib "packages.el"))
-  (load (emacs-lib "org.el"))
-  (load (emacs-lib "twitter.el") 'missing-ok))
+  (load (emacs-lib "packages"))
+  (load (emacs-lib "twitter") 'missing-ok))
 
 (add-hook 'emacs-startup-hook #'fc/load-time)
diff --git a/emacs.d/lib/settings.el b/emacs.d/lib/settings.el
index 757e594..8c221d1 100644
--- a/emacs.d/lib/settings.el
+++ b/emacs.d/lib/settings.el
@@ -88,7 +88,7 @@
 (global-hl-line-mode 1)
 
 ;; Set default font.
-(set-face-attribute 'default nil :height 130 :weight 'normal :width 'normal)
+(set-face-attribute 'default nil :height 150 :font "Go Mono" :weight 'normal :width 'normal)
 
 ;; no bell
 (setq visible-bell nil)
diff --git a/emacs.d/lib/wabi-sabi-theme.el b/emacs.d/lib/wabi-sabi-theme.el
index 1ca0003..986e266 100644
--- a/emacs.d/lib/wabi-sabi-theme.el
+++ b/emacs.d/lib/wabi-sabi-theme.el
@@ -22,7 +22,7 @@
     fringe
     sh-quoted-exec))
 
-(let ((bg              "#f7f9f5")
+(let ((bg              "#FFFFE5")
       (bg-alt          "#fffde7")
       (fg              "#000000")
       (fg-alt          "#000000")
@@ -35,8 +35,8 @@
 
   (apply 'custom-theme-set-faces 'wabi-sabi
          `(default   ((t (:foreground ,fg :background ,bg))))
-         `(cursor    ((t (:background ,fg :foreground ,bg))))
-         `(highlight ((t (:background ,highlight))))
+         `(cursor    ((t (:background ,fg :foreground "white smoke"))))
+         `(highlight ((t nil)))
 
          `(mode-line           ((t (:foreground ,modeline-fg :background ,modeline-bg))))
          `(mode-line-inactive  ((t (:foreground ,modeline-fg :background ,modeline-bg-alt))))
-- 
cgit 1.4.1