Use monokai theme

2 files changed, 16 insertions, 8 deletions

diff --git a/.emacs.d/Cask b/.emacs.d/Cask
index 00f158f..12643c2 100644
--- a/.emacs.d/Cask
+++ b/.emacs.d/Cask
@@ -57,7 +57,9 @@
 (depends-on "magit")
 (depends-on "markdown-mode")
 (depends-on "mode-icons")
+(depends-on "monokai-theme")
 (depends-on "multiple-cursors")
+(depends-on "noflet")
 (depends-on "org2blog")
 (depends-on "paredit")
 (depends-on "persistent-outline" :git "git://ryuslash.org/persistent-outline.git")
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 11c131c..061be7f 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -13,7 +13,8 @@
   (require 'esh-proc)
   (require 'fill-column-indicator)
   (require 'magit)
-  (require 'yasnippet))
+  (require 'yasnippet)
+  (require 'noflet))
 
 (load (concat user-emacs-directory "init2"))
 
@@ -622,15 +623,20 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
     "Try to set the theme for the current (first) frame."
     (ignore frame)
     (unless setp
-      (load-theme 'yoshi t)
-      (smt/enable)
-      (require 'my-smt)
-      (smt/set-theme 'my-smt)
-      (set-face-attribute 'mode-line nil :box nil)
-      (set-face-attribute 'mode-line-inactive nil :box nil))))
+      ;; (load-theme 'yoshi t)
+      (load-theme 'monokai t)
+      ;; (smt/enable)
+      ;; (require 'my-smt)
+      ;; (smt/set-theme 'my-smt)
+      ;; (set-face-attribute 'mode-line nil :box nil)
+      ;; (set-face-attribute 'mode-line-inactive nil :box nil)
+      )))
 
 (if (daemonp)
-    (add-hook 'after-make-frame-functions #'oni:set-theme)
+    (add-hook 'after-make-frame-functions
+              (lambda (frame)
+                (noflet ((display-graphic-p (&optional display) t))
+                  (oni:set-theme frame))))
   (oni:eval-after-init (oni:set-theme nil)))
 
 (defun oni:shell-command-with-command (command &optional output-buffer)