wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

Different themes for cocoa and command line.

Browse Source
This commit is contained in:
Ivan Malison 2014-10-20 20:15:44 -07:00
parent 53f4c48512
commit ad458bced3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
init.el
View File

@ -21,8 +21,6 @@
(let ((default-directory "~/.emacs.d/elpa/")) (let ((default-directory "~/.emacs.d/elpa/"))
(normal-top-level-add-subdirs-to-load-path)) (normal-top-level-add-subdirs-to-load-path))
(setq exec-path (cons "/usr/local/bin/" exec-path))
(add-to-list 'custom-theme-load-path "~/.emacs.d/elpa/") (add-to-list 'custom-theme-load-path "~/.emacs.d/elpa/")
(require 'patches) (require 'patches)
@ -47,7 +45,7 @@
scala-mode2 ensime monokai-theme scala-mode2 ensime monokai-theme
gitconfig-mode jedi flymake-cursor pytest gitconfig-mode jedi flymake-cursor pytest
auto-complete project-root popup web-beautify auto-complete project-root popup web-beautify
js2-mode sphinx-doc) js2-mode js3-mode sphinx-doc)
"Packages that must be installed at launch.") "Packages that must be installed at launch.")
(defun ensure-package-installed (packages) (defun ensure-package-installed (packages)
@ -329,7 +327,8 @@ Return a list of installed packages or nil for every package not installed."
;; Appearance ;; Appearance
;; ============================================================================= ;; =============================================================================
(load-theme 'monokai t) (if (and (eq system-type 'darwin) window-system)
(load-theme 'solarized-dark t) (load-theme 'monokai t))
(require 'color-theme) (require 'color-theme)
(require 'whitespace) (require 'whitespace)
(require 'rainbow-delimiters) (require 'rainbow-delimiters)
@ -369,6 +368,13 @@ Return a list of installed packages or nil for every package not installed."
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(custom-safe-themes (quote ("60f04e478dedc16397353fb9f33f0d895ea3dab4f581307fbf0aa2f07e658a40" default)))
'(reb-re-syntax (quote string)) '(reb-re-syntax (quote string))
'(safe-local-variable-values (quote ((use-python-tabs . t) (python-indent . 4) (whitespace-line-column . 80) (lexical-binding . t))))) '(safe-local-variable-values (quote ((use-python-tabs . t) (python-indent . 4) (whitespace-line-column . 80) (lexical-binding . t)))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(default ((t (:background nil)))))