Merge branch 'master' of github.com:jaypei/exz-conf

emacsconf/emacs.d/elpa/color-theme-tangotango-0.0.2/color-theme-tangotango-autoloads.el

@@ -0,0 +1,18 @@
+;;; color-theme-tangotango-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads nil nil ("color-theme-tangotango-pkg.el" "color-theme-tangotango.el")
+;;;;;;  (21490 64295 734978 0))
+
+;;;***
+
+(provide 'color-theme-tangotango-autoloads)
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; color-theme-tangotango-autoloads.el ends here

emacsconf/emacs.d/elpa/color-theme-tangotango-0.0.2/color-theme-tangotango-pkg.el

@@ -0,0 +1 @@
+(define-package "color-theme-tangotango" "0.0.2" "Tango Palette color theme for Emacs." (quote ((color-theme "6.6.1"))))

emacsconf/emacs.d/elpa/color-theme-tangotango-0.0.2/color-theme-tangotango.el

@@ -0,0 +1,226 @@
+;;; color-theme-tangotango.el --- Tango Palette color theme for Emacs.
+
+;; First derived from color-theme-tango.el,  created by danranx@gmail.com :
+;; http://www.emacswiki.org/emacs/color-theme-tango.el
+
+;; Copyright (C) 2010 Julien Barnier <julien@nozav.org>
+
+;; Author: Julien Barnier
+;; Keywords: tango palette color theme emacs
+;; URL: https://github.com/juba/color-theme-tangotango
+;; Version: 0.0.2
+;; Package-Requires: ((color-theme "6.6.1"))
+
+;; This file is NOT part of GNU Emacs.
+
+;;; License:
+
+;; This is free software; you can redistribute it and/or modify it under
+;; the terms of the GNU General Public License as published by the Free
+;; Software Foundation; either version 2, or (at your option) any later
+;; version.
+;;
+;; This is distributed in the hope that it will be useful, but WITHOUT
+;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+;; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+;; for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+;; MA 02111-1307, USA.
+
+;;; Code:
+
+;; color theme (requires http://www.emacswiki.org/cgi-bin/wiki?ColorTheme )
+(eval-when-compile
+  (require 'color-theme))
+
+(defun color-theme-tangotango ()
+  "A color theme based on Tango Palette colors."
+  ;; Color codes :
+  ;; - blue :       "dodger blue"
+  ;; - yellow :     "#edd400"
+  ;; - green :      "#6ac214"
+  ;; - orange/red : "tomato"
+  (interactive)
+  (color-theme-install
+   '(color-theme-tangotango
+     ((background-color . "#2e3434")
+      (background-mode . dark)
+      (border-color . "#888a85")
+      (cursor-color . "#fce94f")
+      (foreground-color . "#eeeeec")
+      (mouse-color . "#8ae234"))
+     ((help-highlight-face . underline)
+      (ibuffer-dired-buffer-face . font-lock-function-name-face)
+      (ibuffer-help-buffer-face . font-lock-comment-face)
+      (ibuffer-hidden-buffer-face . font-lock-warning-face)
+      (ibuffer-occur-match-face . font-lock-warning-face)
+      (ibuffer-read-only-buffer-face . font-lock-type-face)
+      (ibuffer-special-buffer-face . font-lock-keyword-face)
+      (ibuffer-title-face . font-lock-type-face))
+     (highlight ((t (:background "brown4" :foreground nil))))
+     (border ((t (:background "#888a85"))))
+     (fringe ((t (:background "grey10"))))
+     (mode-line ((t (:foreground "#bbbbbc" :background "#222222" :box (:line-width 1 :color nil :style released-button)))))
+     (mode-line-inactive ((t (:foreground "#bbbbbc" :background "#555753"))))
+     (mode-line-buffer-id ((t (:bold t :foreground "orange" :background nil))))
+     (region ((t (:background "dark slate blue"))))
+     (link ((t (:underline t :foreground "dodger blue"))))
+     (custom-link ((t (:inherit 'link))))
+     (match ((t (:bold t :background "#e9b96e" :foreground "#2e3436"))))
+     (tool-tips ((t (:inherit 'variable-pitch :foreground "black" :background "lightyellow"))))
+     (tooltip ((t (:inherit 'variable-pitch :foreground "black" :background "lightyellow"))))
+     (bold ((t (:bold t :underline nil :background nil))))
+     (italic ((t (:italic t :underline nil :background nil))))
+     (font-lock-builtin-face ((t (:foreground "#729fcf"))))
+     (font-lock-comment-face ((t (:foreground "#888a85"))))
+     (font-lock-constant-face ((t (:foreground "#8ae234"))))
+     (font-lock-doc-face ((t (:foreground "#888a85"))))
+     (font-lock-keyword-face ((t (:foreground "#729fcf" :bold t))))
+     (font-lock-string-face ((t (:foreground "#ad7fa8" :italic t))))
+     (font-lock-type-face ((t (:foreground "#8ae234" :bold t))))
+     (font-lock-variable-name-face ((t (:foreground "tomato"))))
+     (font-lock-warning-face ((t (:bold t :foreground "#f57900"))))
+     (font-lock-function-name-face ((t (:foreground "#edd400" :bold t))))
+     (comint-highlight-input ((t (:italic t :bold t))))
+     (comint-highlight-prompt ((t (:foreground "#8ae234"))))
+     (isearch ((t (:background "#f57900" :foreground "#2e3436"))))
+     (isearch-lazy-highlight-face ((t (:foreground "#2e3436" :background "#e9b96e"))))
+     (show-paren-match-face ((t (:foreground "#2e3436" :background "#73d216"))))
+     (show-paren-mismatch-face ((t (:background "#ad7fa8" :foreground "#2e3436"))))
+     (minibuffer-prompt ((t (:foreground "#729fcf" :bold t))))
+     (info-xref ((t (:foreground "#729fcf"))))
+     (info-xref-visited ((t (:foreground "#ad7fa8"))))
+     (diary-face ((t (:bold t :foreground "IndianRed"))))
+     (eshell-ls-clutter-face ((t (:bold t :foreground "DimGray"))))
+     (eshell-ls-executable-face ((t (:bold t :foreground "Coral"))))
+     (eshell-ls-missing-face ((t (:bold t :foreground "black"))))
+     (eshell-ls-special-face ((t (:bold t :foreground "Gold"))))
+     (eshell-ls-symlink-face ((t (:bold t :foreground "White"))))
+     (widget-button ((t (:bold t))))
+     (widget-mouse-face ((t (:bold t :foreground "white" :background "brown4"))))
+     (widget-field ((t (:foreground "orange" :background "gray30"))))
+     (widget-single-line-field ((t (:foreground "orange" :background "gray30"))))
+     (custom-group-tag ((t (:bold t :foreground "#edd400" :height 1.3))))
+     (custom-variable-tag ((t (:bold t :foreground "#edd400" :height 1.1))))
+     (custom-face-tag ((t (:bold t :foreground "#edd400" :height 1.1))))
+     (custom-state-face ((t (:foreground "#729fcf"))))
+     (custom-button  ((t (:box (:line-width 1 :style released-button) :background "grey50" :foreground "black"))))
+     (custom-variable-button ((t (:inherit 'custom-button))))
+     (custom-button-mouse  ((t (:inherit 'custom-button :background "grey60"))))
+     (custom-button-unraised  ((t (:background "grey50" :foreground "black"))))
+     (custom-button-mouse-unraised  ((t (:inherit 'custom-button-unraised :background "grey60"))))
+     (custom-button-pressed  ((t (:inherit 'custom-button :box (:style pressed-button)))))
+     (custom-button-mouse-pressed-unraised  ((t (:inherit 'custom-button-unraised :background "grey60"))))
+     (custom-documentation ((t (:italic t))))
+     (message-cited-text ((t (:foreground "#edd400"))))
+     (gnus-cite-face-1 ((t (:foreground "#ad7fa8"))))
+     (gnus-cite-face-2 ((t (:foreground "sienna4"))))
+     (gnus-cite-face-3 ((t (:foreground "khaki4"))))
+     (gnus-cite-face-4 ((t (:foreground "PaleTurquoise4"))))
+     (gnus-group-mail-1-empty-face ((t (:foreground "light cyan"))))
+     (gnus-group-mail-1-face ((t (:bold t :foreground "light cyan"))))
+     (gnus-group-mail-2-empty-face ((t (:foreground "turquoise"))))
+     (gnus-group-mail-2-face ((t (:bold t :foreground "turquoise"))))
+     (gnus-group-mail-3-empty-face ((t (:foreground "#729fcf"))))
+     (gnus-group-mail-3-face ((t (:bold t :foreground "#edd400"))))
+     (gnus-group-mail-low-empty-face ((t (:foreground "dodger blue"))))
+     (gnus-group-mail-low-face ((t (:bold t :foreground "dodger blue"))))
+     (gnus-group-news-1-empty-face ((t (:foreground "light cyan"))))
+     (gnus-group-news-1-face ((t (:bold t :foreground "light cyan"))))
+     (gnus-group-news-2-empty-face ((t (:foreground "turquoise"))))
+     (gnus-group-news-2-face ((t (:bold t :foreground "turquoise"))))
+     (gnus-group-news-3-empty-face ((t (:foreground "#729fcf"))))
+     (gnus-group-news-3-face ((t (:bold t :foreground "#edd400"))))
+     (gnus-group-news-low-empty-face ((t (:foreground "dodger blue"))))
+     (gnus-group-news-low-face ((t (:bold t :foreground "dodger blue"))))
+     (gnus-header-name-face ((t (:bold t :foreground "#729fcf"))))
+     (gnus-header-from ((t (:bold t :foreground "#edd400"))))
+     (gnus-header-subject ((t (:foreground "#edd400"))))
+     (gnus-header-content ((t (:italic t :foreground "#8ae234"))))
+     (gnus-header-newsgroups-face ((t (:italic t :bold t :foreground "LightSkyBlue3"))))
+     (gnus-signature-face ((t (:italic t :foreground "dark grey"))))
+     (gnus-summary-cancelled-face ((t (:background "black" :foreground "yellow"))))
+     (gnus-summary-high-ancient-face ((t (:bold t :foreground "rotal blue"))))
+     (gnus-summary-high-read-face ((t (:bold t :foreground "lime green"))))
+     (gnus-summary-high-ticked-face ((t (:bold t :foreground "tomato"))))
+     (gnus-summary-high-unread-face ((t (:bold t :foreground "white"))))
+     (gnus-summary-low-ancient-face ((t (:italic t :foreground "lime green"))))
+     (gnus-summary-low-read-face ((t (:italic t :foreground "royal blue"))))
+     (gnus-summary-low-ticked-face ((t (:italic t :foreground "dark red"))))
+     (gnus-summary-low-unread-face ((t (:italic t :foreground "white"))))
+     (gnus-summary-normal-ancient-face ((t (:foreground "royal blue"))))
+     (gnus-summary-normal-read-face ((t (:foreground "lime green"))))
+     (gnus-summary-normal-ticked-face ((t (:foreground "indian red"))))
+     (gnus-summary-normal-unread-face ((t (:foreground "white"))))
+     (gnus-summary-selected ((t (:background "brown4" :foreground "white"))))
+     (message-header-name-face ((t (:foreground "tomato"))))
+     (message-header-newsgroups-face ((t (:italic t :bold t :foreground "LightSkyBlue3"))))
+     (message-header-other-face ((t (:foreground "LightSkyBlue3"))))
+     (message-header-xheader-face ((t (:foreground "DodgerBlue3"))))
+     (message-header-subject ((t (:foreground "white"))))
+     (message-header-to ((t (:foreground "white"))))
+     (message-header-cc ((t (:foreground "white"))))
+     (org-hide ((t (:foreground "#2e3436"))))
+     (org-level-1 ((t (:bold t :foreground "dodger blue" :height 1.5))))
+     (org-level-2 ((t (:bold nil :foreground "#edd400" :height 1.2))))
+     (org-level-3 ((t (:bold t :foreground "#6ac214" :height 1.0))))
+     (org-level-4 ((t (:bold nil :foreground "tomato" :height 1.0))))
+     (org-date ((t (:underline t :foreground "magenta3"))))
+     (org-footnote  ((t (:underline t :foreground "magenta3"))))
+     (org-link ((t (:foreground "skyblue2" :background "#2e3436"))))
+     (org-special-keyword ((t (:foreground "brown"))))
+     (org-verbatim ((t (:foreground "#eeeeec" :underline t :slant italic))))
+     (org-block ((t (:foreground "#bbbbbc"))))
+     (org-quote ((t (:inherit org-block :slant italic))))
+     (org-verse ((t (:inherit org-block :slant italic))))
+     (org-todo ((t (:bold t :foreground "Red"))))
+     (org-done ((t (:bold t :foreground "ForestGreen"))))
+     (org-agenda-structure ((t (:weight bold :foreground "tomato"))))
+     (org-agenda-date ((t (:foreground "#6ac214"))))
+     (org-agenda-date-weekend ((t (:weight normal :foreground "dodger blue"))))
+     (org-agenda-date-today ((t (:weight bold :foreground "#edd400"))))
+     (anything-header ((t (:bold t :background "grey15" :foreground "#edd400"))))
+     (ess-jb-comment-face ((t (:background "#2e3436" :foreground "firebrick" :slant italic))))
+     (ess-jb-hide-face ((t (:background "#2e3436" :foreground "#243436"))))
+     (ess-jb-h1-face ((t (:height 1.6 :foreground "dodger blue" :slant normal))))
+     (ess-jb-h2-face ((t (:height 1.4 :foreground "#6ac214" :slant normal))))
+     (ess-jb-h3-face ((t (:height 1.2 :foreground "#edd400" :slant normal))))
+     (ecb-default-highlight-face ((t (:background "#729fcf"))))
+     (ecb-tag-header-face ((t (:background "#f57900"))))
+     (magit-header ((t (:foreground "#edd400"))))
+     (magit-diff-add ((t (:foreground "#729fcf"))))
+     (magit-item-highlight ((t (:weight extra-bold :inverse-video t))))
+     (diff-header ((t (:background "gray30"))))
+     (diff-index ((t (:foreground "#edd400" :bold t))))
+     (diff-file-header ((t (:foreground "#eeeeec" :bold t))))
+     (diff-hunk-header ((t (:foreground "#edd400"))))
+     (diff-added ((t (:foreground "#8ae234"))))
+     (diff-removed ((t (:foreground "#f57900"))))
+     (diff-context ((t (:foreground "#888a85"))))
+     (diff-refine-change ((t (:bold t :background "gray30"))))
+     (ediff-current-diff-A ((t (:background "#555753"))))
+     (ediff-current-diff-Ancestor ((t (:background "#555753"))))
+     (ediff-current-diff-B ((t (:background "#555753"))))
+     (ediff-current-diff-C ((t (:background "#555753"))))
+     (ediff-even-diff-A ((t (:background "gray30"))))
+     (ediff-even-diff-Ancestor ((t (:background "gray30"))))
+     (ediff-even-diff-B ((t (:background "gray30"))))
+     (ediff-even-diff-C ((t (:background "gray30"))))
+     (ediff-odd-diff-A ((t (:background "gray30"))))
+     (ediff-odd-diff-Ancestor ((t (:background "gray30"))))
+     (ediff-odd-diff-B ((t (:background "gray30"))))
+     (ediff-odd-diff-C ((t (:background "gray30"))))
+     (ediff-fine-diff-A ((t (:background "#222222"))))
+     (ediff-fine-diff-Ancestor ((t (:background "#222222"))))
+     (ediff-fine-diff-B ((t (:background "#222222"))))
+     (ediff-fine-diff-C ((t (:background "#222222"))))
+)))
+
+(color-theme-tangotango)
+
+(provide 'color-theme-tangotango)
+
+;;; color-theme-tangotango.el ends here

emacsconf/emacs.d/etc-lisp/exz-appearance.el

@@ -27,8 +27,10 @@
   '(variable-pitch ((t nil))))
  (set-fringe-mode '(10 . 10)))
 
-(require 'color-theme-sanityinc-tomorrow)
-(load-theme 'sanityinc-tomorrow-bright t)
+;; (require 'color-theme-sanityinc-tomorrow)
+;; (load-theme 'sanityinc-tomorrow-bright t)
+(require 'color-theme-tangotango)
+(color-theme-tangotango)
 
 (exz/when-osx
  (custom-set-faces

mac/dotfiles/zshrc

@@ -7,8 +7,8 @@ ZSH=$HOME/.oh-my-zsh
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
 #export ZSH_THEME="random"
-#export ZSH_THEME='bira'
-export ZSH_THEME='tjkirch'
+export ZSH_THEME='edvardm'
+#export ZSH_THEME='tjkirch'
 
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"