add powerline
dump
[from now] 2013/11/05 12:07:07

diff --git a/emacs/emacs.d.symlink/config/emacs.el b/emacs/emacs.d.symlink/config/emacs.el
index 65cfd23..9b32619 100644
--- a/emacs/emacs.d.symlink/config/emacs.el
+++ b/emacs/emacs.d.symlink/config/emacs.el
@@ -1,7 +1,8 @@
 (try-load "config/emacs/base")
+(try-load "config/emacs/themes")
 (try-load "config/emacs/window")
 (try-load "config/emacs/font")
 (try-load "config/emacs/keymap")
-;; (try-load "config/emacs/modeline")
 (try-load "config/emacs/vcs")
-(try-load "config/emacs/themes")
+(try-load "config/emacs/modeline")
+(try-load "config/emacs/cocoa-emacs")
diff --git a/emacs/emacs.d.symlink/config/emacs/base.el b/emacs/emacs.d.symlink/config/emacs/base.el
index 10c4ea5..a6322b2 100644
--- a/emacs/emacs.d.symlink/config/emacs/base.el
+++ b/emacs/emacs.d.symlink/config/emacs/base.el
@@ -34,6 +34,8 @@
 (setq use-dialog-box nil)                                ;; ダイアログを使わない
 (defalias 'message-box 'message)                         ;;
 (put 'dired-find-alternate-file 'disabled nil)           ;; Dired
+(setq max-lisp-eval-depth 5000)
+(setq max-specpdl-size 5000)

 ;; Change Directory
 ;;_______________________________________________________________
@@ -80,8 +82,10 @@
 (when ns-p
   (setq ns-command-modifier 'meta)
   (setq ns-alternate-modifier 'super)
+  (setq ns-right-command-modifier 'hyper)
+  ;; (setq ns-right-alternate-modifier 'alt)
   (setq mac-pass-command-to-system nil))

 ;; My Info
 ;;________________________________________________________________
-(setq user-mail-address "bunny.hop.md@gmail.com")
+(setq user-mail-address (concat "bunny.hop.md" "@" "gmail.com"))
diff --git a/emacs/emacs.d.symlink/config/emacs/cocoa-emacs.el b/emacs/emacs.d.symlink/config/emacs/cocoa-emacs.el
new file mode 100644
index 0000000..d89fa97
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/emacs/cocoa-emacs.el
@@ -0,0 +1,25 @@
+(setq default-input-method "MacOSX")
+
+(mac-set-input-method-parameter
+ "com.google.inputmethod.Japanese.base" 'title "あ")
+
+;; カーソルの色
+(mac-set-input-method-parameter
+ "com.apple.keylayout.US" 'cursor-color (face-attribute 'cursor :background))
+
+(mac-set-input-method-parameter
+ "com.google.inputmethod.Japanese.base" 'cursor-color "red")
+
+;; (mac-set-input-method-parameter "com.google.inputmethod.Japanese.Roman" `cursor-color "blue")
+
+;; emacs 起動時は英数モードから始める
+(add-hook 'after-init-hook 'mac-change-language-to-us)
+
+;; backslash を優先
+(mac-translate-from-yen-to-backslash)
+
+;; minibuffer 内は英数モードにする
+(add-hook 'minibuffer-setup-hook 'mac-change-language-to-us)
+
+;; [migemo]isearch のとき IME を英数モードにする
+(add-hook 'isearch-mode-hook 'mac-change-language-to-us)
diff --git a/emacs/emacs.d.symlink/config/emacs/font.el b/emacs/emacs.d.symlink/config/emacs/font.el
index a9c48d0..77e13a5 100644
--- a/emacs/emacs.d.symlink/config/emacs/font.el
+++ b/emacs/emacs.d.symlink/config/emacs/font.el
@@ -1,36 +1,37 @@
-(let ((asciifont "Ricty") (jpfont "Ricty"))
-  ;; ascii
-  (set-fontset-font "fontset-default" 'japanese-jisx0208 (cons asciifont "iso10646-1"))
-  ;; 日本語、大体第1~2水準漢字を含む
-  (set-fontset-font (frame-parameter nil 'font) 'japanese-jisx0208 (cons jpfont "iso10646-1"))
-  ;; 日本語、大体第3水準漢字を含む
-  (set-fontset-font (frame-parameter nil 'font) 'japanese-jisx0212 (cons jpfont "iso10646-1")))
+(when (and (>= emacs-major-version 24)
+           (eq window-system 'ns))
+  ;; フォントセットを作る
+  (let* ((fontset-name "myfonts") ; フォントセットの名前
+         (size (if (string= (system-name) "MacBookAir.local")
+                   12
+                 12)) ; ASCIIフォントのサイズ [9/10/12/14/15/17/19/20/...]
+         (asciifont "Menlo") ; ASCIIフォント
+         (jpfont "SetoFont") ; 日本語フォント
+         (font (format "%s-%d:weight=normal:slant=normal" asciifont size))
+         (fontspec (font-spec :family asciifont))
+         (jp-fontspec (font-spec :family jpfont))
+         (fsn (create-fontset-from-ascii-font font nil fontset-name)))
+    (set-fontset-font fsn 'japanese-jisx0213.2004-1 jp-fontspec)
+    (set-fontset-font fsn 'japanese-jisx0213-2 jp-fontspec)
+    (set-fontset-font fsn 'katakana-jisx0201 jp-fontspec) ; 半角カナ
+    (set-fontset-font fsn '(#x0080 . #x024F) fontspec)    ; 分音符付きラテン
+    (set-fontset-font fsn '(#x0370 . #x03FF) fontspec))   ; ギリシャ文字

-(setq face-font-rescale-alist
-      '(("^-apple-hiragino.*"               . 1.2)
-        (".*ricty.*"                        . 1.2)
-        (".*osaka-bold.*"                   . 1.2)
-        (".*osaka-medium.*"                 . 1.2)
-        (".*courier-bold-.*-mac-roman"      . 1.0)
-        (".*monaco cy-bold-.*-mac-cyrillic" . 0.9)
-        (".*monaco-bold-.*-mac-roman"       . 0.9)
-        ("-cdac$"                           . 1.3)))
+  ;; デフォルトのフレームパラメータでフォントセットを指定
+  (add-to-list 'default-frame-alist '(font . "fontset-myfonts"))

-;; "Osaka"
-;; "Hiragino Maru Gothic Pro"
+  ;; フォントサイズの比を設定
+  (dolist (elt '(("^-apple-hiragino.*"               . 1.2)
+                 (".*osaka-bold.*"                   . 1.2)
+                 (".*osaka-medium.*"                 . 1.2)
+                 (".*courier-bold-.*-mac-roman"      . 1.0)
+                 (".*monaco cy-bold-.*-mac-cyrillic" . 0.9)
+                 (".*monaco-bold-.*-mac-roman"       . 0.9)
+                 (".*SetoFont-.*"                    . 1.2)
+                 (".*SetoFontMini-.*"                . 1.0)))
+    (add-to-list 'face-font-rescale-alist elt))

-(defun increase-font-size ()
-  (interactive)
-  (set-face-attribute
-   'default nil
-   :height (+ 10 (face-attribute 'default :height))))
-
-(defun decrease-font-size ()
-  (interactive)
-  (set-face-attribute
-   'default nil
-   :height ((lambda (h) (if (<= h 10) h (- h 10)))
-            (face-attribute 'default :height))))
-
-(define-key global-map (kbd "C-=") #'increase-font-size) ; フォントサイズを大きく
-(define-key global-map (kbd "C--") #'decrease-font-size) ; フォントサイズを小さく
+  ;; デフォルトフェイスにフォントセットを設定
+  ;; # これは起動時に default-frame-alist に従ったフレームが
+  ;; # 作成されない現象への対処
+  (set-face-font 'default "fontset-myfonts"))
diff --git a/emacs/emacs.d.symlink/config/emacs/modeline.el b/emacs/emacs.d.symlink/config/emacs/modeline.el
index 3e44379..1dda4e4 100644
--- a/emacs/emacs.d.symlink/config/emacs/modeline.el
+++ b/emacs/emacs.d.symlink/config/emacs/modeline.el
@@ -1,4 +1,15 @@
-;; based from: http://amitp.blogspot.jp/2011/08/emacs-custom-mode-line.html
+;; Extra mode line faces
+(make-face 'mode-line-read-only-face)
+(make-face 'mode-line-modified-face)
+(make-face 'mode-line-folder-face)
+(make-face 'mode-line-filename-face)
+(make-face 'mode-line-position-face)
+(make-face 'mode-line-mode-face)
+(make-face 'mode-line-minor-mode-face)
+(make-face 'mode-line-process-face)
+(make-face 'mode-line-80col-face)
+(make-face 'mode-line-delim-face-1)
+
 ;; Mode line setup
 (setq-default mode-line-position
  '(" "
@@ -7,10 +18,25 @@
    (:propertize "/" face mode-line-delim-face-1)
    (:eval (number-to-string (count-lines (point-min) (point-max))))
    " "
-   (:eval (propertize "%3c" 'face (if (>= (current-column) 80) 'mode-line-80col-face
+   (:eval (propertize "%3c" 'face (if (>= (current-column) 80)
+                                      'mode-line-80col-face
                                     'mode-line-position-face)))
    " "))

+;; Helper function
+(defun shorten-directory (dir max-length)
+  "Show up to `max-length' characters of a directory name `dir'."
+  (let ((path (reverse (split-string (abbreviate-file-name dir) "/")))
+        (output ""))
+    (when (and path (equal "" (car path)))
+      (setq path (cdr path)))
+    (while (and path (< (length output) (- max-length 4)))
+      (setq output (concat (car path) "/" output))
+      (setq path (cdr path)))
+    (when path
+      (setq output (concat ".../" output)))
+    output))
+
 (setq-default mode-line-format
  '("%e"
    mode-line-mule-info
@@ -35,28 +61,26 @@
    (:propertize mode-line-process face mode-line-process-face)
    (global-mode-string global-mode-string)))

-;; Helper function
-(defun shorten-directory (dir max-length)
-  "Show up to `max-length' characters of a directory name `dir'."
-  (let ((path (reverse (split-string (abbreviate-file-name dir) "/")))
-        (output ""))
-    (when (and path (equal "" (car path)))
-      (setq path (cdr path)))
-    (while (and path (< (length output) (- max-length 4)))
-      (setq output (concat (car path) "/" output))
-      (setq path (cdr path)))
-    (when path
-      (setq output (concat ".../" output)))
-    output))
+(custom-set-faces
+ '(mode-line                    ((t (:foreground "gray80"
+                                     :background "gray10"
+                                     :inverse-video nil
+                                     :weight normal
+                                     :height 120
+                                     :box (:line-width 2 :color "gray10" :style nil)))))
+ '(mode-line-inactive           ((t (:foreground "gray80"
+                                     :background "gray30"
+                                     :inverse-video nil
+                                     :weight extra-light
+                                     :height 120
+                                     :box (:line-width 2 :color "gray30" :style nil)))))
+ '(mode-line-folder-face        ((t (:foreground "gray90" :inherit mode-line-face :weight extra-light :height 110 ))))
+ '(mode-line-filename-face      ((t (:foreground "#eab700" :inherit mode-line-face :weight normal :height 140))))

-;; Extra mode line faces
-(make-face 'mode-line-read-only-face)
-(make-face 'mode-line-modified-face)
-(make-face 'mode-line-folder-face)
-(make-face 'mode-line-filename-face)
-(make-face 'mode-line-position-face)
-(make-face 'mode-line-mode-face)
-(make-face 'mode-line-minor-mode-face)
-(make-face 'mode-line-process-face)
-(make-face 'mode-line-80col-face)
-(make-face 'mode-line-delim-face-1)
+ '(mode-line-process-face       ((t (:foreground "#718c00" :inherit mode-line-face))))
+ ;; '(mode-line-delim-face-1       ((t (:foreground "white" :inherit mode-line-face))))
+ ;; '(mode-line-position-face      ((t (:inherit mode-line-face :family "monaco"))))
+
+ '(mode-line-mode-face          ((t (:foreground "gray80" :inherit mode-line-face))))
+ '(mode-line-minor-mode-face    ((t (:foreground "gray60" :inherit mode-line-mode-face :height 100))))
+ '(mode-line-80col-face         ((t (:foreground "gray10" :background "#eab700" :inherit mode-line-position-face :weight bold)))))
diff --git a/emacs/emacs.d.symlink/config/emacs/themes.el b/emacs/emacs.d.symlink/config/emacs/themes.el
index caaefe2..f1a6ae7 100644
--- a/emacs/emacs.d.symlink/config/emacs/themes.el
+++ b/emacs/emacs.d.symlink/config/emacs/themes.el
@@ -1,8 +1,9 @@
-;; Write to version specific configuration here.
+(add-to-list 'load-path "~/.emacs.d/config/emacs/themes")
 (add-to-list 'custom-theme-load-path "~/.emacs.d/config/emacs/themes")

-(load-theme 'daic-powerline t)
-;; (load-theme 'subatomic256 t)
-;; (load-theme 'solarized-light t)
-;; (load-theme 'solarized t)
-;; (load-theme 'daic-h t)
+(let ((theme 'tomorrow-night))
+  (load-theme theme t)
+  (let ((bg (background-color-at-point)))
+    (custom-theme-set-faces theme
+     ;; fringeは常に背景色
+     `(fringe ((t (:background ,bg)))))))
diff --git a/emacs/emacs.d.symlink/config/emacs/themes/color-theme-tomorrow.el b/emacs/emacs.d.symlink/config/emacs/themes/color-theme-tomorrow.el
new file mode 100644
index 0000000..10e45a0
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/emacs/themes/color-theme-tomorrow.el
@@ -0,0 +1,609 @@
+;;; color-theme-tomorrow.el --- GNU Emacs port of the Tomorrow Theme.
+
+;;; Commentary:
+;;
+;;; Tomorrow Theme
+;;
+;; Originally by Chris Kempson https://github.com/ChrisKempson/Tomorrow-Theme
+;; Ported to GNU Emacs by Chris Charles
+;; Rewritten by Steve Purcell <steve@sanityinc.com> for compatibility
+;; Update to match master by Donald Curtis <dcurtis@milkbox.net>
+
+
+;;; Code:
+
+(defconst color-theme-tomorrow-colors
+  '((night . ((background . "#1d1f21")
+              (current-line . "#282a2e")
+              (selection . "#373b41")
+              (foreground . "#c5c8c6")
+              (comment . "#969896")
+              (red . "#cc6666")
+              (orange . "#de935f")
+              (yellow . "#f0c674")
+              (green . "#b5bd68")
+              (aqua . "#8abeb7")
+              (blue . "#81a2be")
+              (purple . "#b294bb")))
+    (day . ((background . "#ffffff")
+            (current-line . "#efefef")
+            (selection . "#d6d6d6")
+            (foreground . "#4d4d4c")
+            (comment . "#8e908c")
+            (red . "#c82829")
+            (orange . "#f5871f")
+            (yellow . "#eab700")
+            (green . "#718c00")
+            (aqua . "#3e999f")
+            (blue . "#4271ae")
+            (purple . "#8959a8")))
+    (night-eighties . ((background . "#2d2d2d")
+                       (current-line . "#393939")
+                       (selection . "#515151")
+                       (foreground . "#cccccc")
+                       (comment . "#999999")
+                       (red . "#f2777a")
+                       (orange . "#f99157")
+                       (yellow . "#ffcc66")
+                       (green . "#99cc99")
+                       (aqua . "#66cccc")
+                       (blue . "#6699cc")
+                       (purple . "#cc99cc")))
+    (night-blue . ((background . "#002451")
+                   (current-line . "#00346e")
+                   (selection . "#003f8e")
+                   (foreground . "#ffffff")
+                   (comment . "#7285b7")
+                   (red . "#ff9da4")
+                   (orange . "#ffc58f")
+                   (yellow . "#ffeead")
+                   (green . "#d1f1a9")
+                   (aqua . "#99ffff")
+                   (blue . "#bbdaff")
+                   (purple . "#ebbbff")))
+    (night-bright . ((background . "#000000")
+                     (current-line . "#2a2a2a")
+                     (selection . "#424242")
+                     (foreground . "#eaeaea")
+                     (comment . "#969896")
+                     (red . "#d54e53")
+                     (orange . "#e78c45")
+                     (yellow . "#e7c547")
+                     (green . "#b9ca4a")
+                     (aqua . "#70c0b1")
+                     (blue . "#7aa6da")
+                     (purple . "#c397d8")))))
+
+
+
+(defmacro color-theme-tomorrow--with-colors (mode &rest body)
+  "Execute `BODY' in a scope with variables bound to the various tomorrow colors.
+
+`MODE' should be set to either 'day, 'night, 'night-eighties, 'night-blue or 'night-bright."
+  `(let* ((colors (or (cdr (assoc ,mode color-theme-tomorrow-colors))
+                      (error "no such theme flavor")))
+          (background   (cdr (assoc 'background colors)))
+          (current-line (cdr (assoc 'current-line colors)))
+          (selection    (cdr (assoc 'selection colors)))
+          (foreground   (cdr (assoc 'foreground colors)))
+          (comment      (cdr (assoc 'comment colors)))
+          (red          (cdr (assoc 'red colors)))
+          (orange       (cdr (assoc 'orange colors)))
+          (yellow       (cdr (assoc 'yellow colors)))
+          (green        (cdr (assoc 'green colors)))
+          (aqua         (cdr (assoc 'aqua colors)))
+          (blue         (cdr (assoc 'blue colors)))
+          (purple       (cdr (assoc 'purple colors)))
+          (class '((class color) (min-colors 89))))
+     ,@body))
+
+(defmacro color-theme-tomorrow--face-specs ()
+  "Return a backquote which defines a list of face specs.
+
+It expects to be evaluated in a scope in which the various color
+names to which it refers are bound."
+  (quote
+   `(;; Standard font lock faces
+     (default ((,class (:foreground ,foreground :background ,background))))
+     (bold ((,class (:weight bold))))
+     (bold-italic ((,class (:slant italic :weight bold))))
+     (underline ((,class (:underline t))))
+     (italic ((,class (:slant italic))))
+     (shadow ((,class (:foreground ,comment))))
+     (success ((,class (:foreground ,green))))
+     (error ((,class (:foreground ,red))))
+     (warning ((,class (:foreground ,orange))))
+     (outline-4 ((,class (:slant normal :foreground ,comment))))
+
+     ;; Font-lock stuff
+     (font-lock-builtin-face ((,class (:foreground ,aqua))))
+     (font-lock-comment-delimiter-face ((,class (:foreground ,comment :slant italic))))
+     (font-lock-comment-face ((,class (:foreground ,comment :slant italic))))
+     (font-lock-constant-face ((,class (:foreground ,aqua))))
+     (font-lock-doc-face ((,class (:foreground ,comment))))
+     (font-lock-doc-string-face ((,class (:foreground ,yellow))))
+     (font-lock-function-name-face ((,class (:foreground ,blue))))
+     (font-lock-keyword-face ((,class (:foreground ,purple))))
+     (font-lock-negation-char-face ((,class (:foreground ,green))))
+     (font-lock-preprocessor-face ((,class (:foreground ,purple))))
+     (font-lock-regexp-grouping-backslash ((,class (:foreground ,yellow))))
+     (font-lock-regexp-grouping-construct ((,class (:foreground ,purple))))
+     (font-lock-string-face ((,class (:foreground ,green))))
+     (font-lock-type-face ((,class (:foreground ,yellow))))
+     (font-lock-variable-name-face ((,class (:foreground ,orange))))
+     (font-lock-warning-face ((,class (:weight bold :foreground ,red))))
+
+     ;; Flymake
+     (flymake-warnline ((,class (:underline ,orange :background ,background))))
+     (flymake-errline ((,class (:underline ,red :background ,background))))
+
+     ;; Clojure errors
+     (clojure-test-failure-face ((,class (:background nil :inherit flymake-warnline))))
+     (clojure-test-error-face ((,class (:background nil :inherit flymake-errline))))
+     (clojure-test-success-face ((,class (:background nil :foreground nil :underline ,green))))
+
+     ;; For Brian Carper's extended clojure syntax table
+     (clojure-keyword ((,class (:foreground ,yellow))))
+     (clojure-parens ((,class (:foreground ,foreground))))
+     (clojure-braces ((,class (:foreground ,green))))
+     (clojure-brackets ((,class (:foreground ,yellow))))
+     (clojure-double-quote ((,class (:foreground ,aqua :background nil))))
+     (clojure-special ((,class (:foreground ,blue))))
+     (clojure-java-call ((,class (:foreground ,purple))))
+
+     ;; Rainbow-delimiters
+     (rainbow-delimiters-depth-1-face ((,class (:foreground ,purple))))
+     (rainbow-delimiters-depth-2-face ((,class (:foreground ,blue))))
+     (rainbow-delimiters-depth-3-face ((,class (:foreground ,aqua))))
+     (rainbow-delimiters-depth-4-face ((,class (:foreground ,green))))
+     (rainbow-delimiters-depth-5-face ((,class (:foreground ,yellow))))
+     (rainbow-delimiters-depth-6-face ((,class (:foreground ,orange))))
+     (rainbow-delimiters-depth-7-face ((,class (:foreground ,red))))
+     (rainbow-delimiters-depth-8-face ((,class (:foreground ,comment))))
+     (rainbow-delimiters-depth-9-face ((,class (:foreground ,foreground))))
+     (rainbow-delimiters-unmatched-face ((,class (:foreground ,red))))
+
+     ;; MMM-mode
+     (mmm-code-submode-face ((,class (:background ,current-line))))
+     (mmm-comment-submode-face ((,class (:inherit font-lock-comment-face))))
+     (mmm-output-submode-face ((,class (:background ,current-line))))
+
+     ;; Search
+     (match ((,class (:foreground ,blue :background ,background :inverse-video t))))
+     (isearch ((,class (:foreground ,yellow :background ,background :inverse-video t))))
+     (isearch-lazy-highlight-face ((,class (:foreground ,aqua :background ,background :inverse-video t))))
+     (isearch-fail ((,class (:background ,background :inherit font-lock-warning-face :inverse-video t))))
+
+     ;; IDO
+     (ido-subdir ((,class (:foreground ,comment))))
+     (ido-first-match ((,class (:foreground ,orange :weight bold))))
+     (ido-only-match ((,class (:foreground ,red :weight bold))))
+     (ido-indicator ((,class (:foreground ,red :background ,background))))
+     (ido-virtual ((,class (:foreground ,comment))))
+
+     ;; which-function
+     (which-func ((,class (:foreground ,blue :background nil :weight bold))))
+
+     ;; Emacs interface
+     (cursor ((,class (:background ,red))))
+     (fringe ((,class (:background ,current-line))))
+     (linum ((,class (:background ,current-line))))
+     (hl-line ((,class (:background ,current-line))))
+     (border ((,class (:background ,current-line))))
+     (border-glyph ((,class (nil))))
+     (highlight ((,class (:background ,green))))
+     (link ((,class (:foreground ,blue))))
+     (link-visited ((,class (:foreground ,purple))))
+     (gui-element ((,class (:background ,current-line :foreground ,foreground))))
+     (mode-line ((,class (:background ,selection :foreground ,foreground))))
+     (mode-line-inactive ((,class (:background ,current-line :foreground ,foreground))))
+     (mode-line-buffer-id ((,class (:foreground ,purple :background nil))))
+     (mode-line-emphasis ((,class (:foreground ,foreground :slant italic))))
+     (mode-line-highlight ((,class (:foreground ,purple :box nil :weight bold))))
+     (minibuffer-prompt ((,class (:foreground ,blue))))
+     (region ((,class (:background ,selection))))
+     (secondary-selection ((,class (:background ,current-line))))
+
+     (header-line ((,class (:inherit mode-line :foreground ,purple :background nil))))
+
+     (trailing-whitespace ((,class (:background ,red :foreground ,yellow))))
+     (whitespace-empty ((,class (:foreground ,red :background ,yellow))))
+     (whitespace-hspace ((,class (:background ,selection :foreground ,comment))))
+     (whitespace-indentation ((,class (:background ,yellow :foreground ,red))))
+     (whitespace-line ((,class (:background ,current-line :foreground ,purple))))
+     (whitespace-newline ((,class (:foreground ,comment))))
+     (whitespace-space ((,class (:background ,current-line :foreground ,comment))))
+     (whitespace-space-after-tab ((,class (:background ,yellow :foreground ,red))))
+     (whitespace-space-before-tab ((,class (:background ,orange :foreground ,red))))
+     (whitespace-tab ((,class (:background ,selection :foreground ,comment))))
+     (whitespace-trailing ((,class (:background ,red :foreground ,yellow))))
+
+     ;; Parenthesis matching (built-in)
+     (show-paren-match ((,class (:background ,blue :foreground ,current-line))))
+     (show-paren-mismatch ((,class (:background ,orange :foreground ,current-line))))
+
+     ;; Parenthesis matching (mic-paren)
+     (paren-face-match ((,class (:foreground nil :background nil :inherit show-paren-match))))
+     (paren-face-mismatch ((,class (:foreground nil :background nil :inherit show-paren-mismatch))))
+     (paren-face-no-match ((,class (:foreground nil :background nil :inherit show-paren-mismatch))))
+
+     ;; Parenthesis dimming (parenface)
+     (paren-face ((,class (:foreground ,comment :background nil))))
+
+     (sh-heredoc ((,class (:foreground nil :inherit font-lock-string-face :weight normal))))
+     (sh-quoted-exec ((,class (:foreground nil :inherit font-lock-preprocessor-face))))
+     (slime-highlight-edits-face ((,class (:weight bold))))
+     (slime-repl-input-face ((,class (:weight normal :underline nil))))
+     (slime-repl-prompt-face ((,class (:underline nil :weight bold :foreground ,purple))))
+     (slime-repl-result-face ((,class (:foreground ,green))))
+     (slime-repl-output-face ((,class (:foreground ,blue :background ,background))))
+
+     (csv-separator-face ((,class (:foreground ,orange))))
+
+     (diff-added ((,class (:foreground ,green))))
+     (diff-changed ((,class (:foreground ,yellow))))
+     (diff-removed ((,class (:foreground ,red))))
+     (diff-header ((,class (:background ,current-line))))
+     (diff-file-header ((,class (:background ,selection))))
+     (diff-hunk-header ((,class (:background ,current-line :foreground ,purple))))
+
+     (ediff-even-diff-A ((,class (:foreground nil :background nil :inverse-video t))))
+     (ediff-even-diff-B ((,class (:foreground nil :background nil :inverse-video t))))
+     (ediff-odd-diff-A  ((,class (:foreground ,comment :background nil :inverse-video t))))
+     (ediff-odd-diff-B  ((,class (:foreground ,comment :background nil :inverse-video t))))
+
+     (eldoc-highlight-function-argument ((,class (:foreground ,green :weight bold))))
+
+     ;; undo-tree
+     (undo-tree-visualizer-default-face ((,class (:foreground ,foreground))))
+     (undo-tree-visualizer-current-face ((,class (:foreground ,green :weight bold))))
+     (undo-tree-visualizer-active-branch-face ((,class (:foreground ,red))))
+     (undo-tree-visualizer-register-face ((,class (:foreground ,yellow))))
+
+     ;; auctex
+     (font-latex-bold-face ((,class (:foreground ,green))))
+     (font-latex-doctex-documentation-face ((,class (:background ,current-line))))
+     (font-latex-italic-face ((,class (:foreground ,green))))
+     (font-latex-math-face ((,class (:foreground ,orange))))
+     (font-latex-sectioning-0-face ((,class (:foreground ,yellow))))
+     (font-latex-sectioning-1-face ((,class (:foreground ,yellow))))
+     (font-latex-sectioning-2-face ((,class (:foreground ,yellow))))
+     (font-latex-sectioning-3-face ((,class (:foreground ,yellow))))
+     (font-latex-sectioning-4-face ((,class (:foreground ,yellow))))
+     (font-latex-sectioning-5-face ((,class (:foreground ,yellow))))
+     (font-latex-sedate-face ((,class (:foreground ,aqua))))
+     (font-latex-string-face ((,class (:foreground ,yellow))))
+     (font-latex-verbatim-face ((,class (:foreground ,orange))))
+     (font-latex-warning-face ((,class (:foreground ,red))))
+
+     ;; dired+
+     (diredp-compressed-file-suffix ((,class (:foreground ,blue))))
+     (diredp-dir-heading ((,class (:foreground nil :background nil :inherit heading))))
+     (diredp-dir-priv ((,class (:foreground ,aqua :background nil))))
+     (diredp-exec-priv ((,class (:foreground ,blue :background nil))))
+     (diredp-executable-tag ((,class (:foreground ,red :background nil))))
+     (diredp-file-name ((,class (:foreground ,yellow))))
+     (diredp-file-suffix ((,class (:foreground ,green))))
+     (diredp-flag-mark-line ((,class (:background nil :inherit highlight))))
+     (diredp-ignored-file-name ((,class (:foreground ,comment))))
+     (diredp-link-priv ((,class (:background nil :foreground ,purple))))
+     (diredp-mode-line-flagged ((,class (:foreground ,red))))
+     (diredp-mode-line-marked ((,class (:foreground ,green))))
+     (diredp-no-priv ((,class (:background nil))))
+     (diredp-number ((,class (:foreground ,yellow))))
+     (diredp-other-priv ((,class (:background nil :foreground ,purple))))
+     (diredp-rare-priv ((,class (:foreground ,red :background nil))))
+     (diredp-read-priv ((,class (:foreground ,green :background nil))))
+     (diredp-symlink ((,class (:foreground ,purple))))
+     (diredp-write-priv ((,class (:foreground ,yellow :background nil))))
+
+     ;; Magit (a patch is pending in magit to make these standard upstream)
+     (magit-branch ((,class (:foreground ,green))))
+     (magit-header ((,class (:inherit nil :weight bold))))
+     (magit-item-highlight ((,class (:inherit highlight :background nil))))
+     (magit-log-graph ((,class (:foreground ,comment))))
+     (magit-log-sha1 ((,class (:foreground ,purple))))
+     (magit-log-head-label-bisect-bad ((,class (:foreground ,red))))
+     (magit-log-head-label-bisect-good ((,class (:foreground ,green))))
+     (magit-log-head-label-default ((,class (:foreground ,yellow :box nil :weight bold))))
+     (magit-log-head-label-local ((,class (:foreground ,blue))))
+     (magit-log-head-label-remote ((,class (:foreground ,green))))
+     (magit-log-head-label-tags ((,class (:foreground ,aqua :box nil :weight bold))))
+     (magit-section-title ((,class (:inherit diff-hunk-header))))
+
+     (link ((,class (:foreground nil :underline t))))
+     (widget-button ((,class (:underline t))))
+     (widget-field ((,class (:background ,current-line :box (:line-width 1 :color ,foreground)))))
+
+     ;; Compilation (most faces politely inherit from 'success, 'error, 'warning etc.)
+     (compilation-column-number ((,class (:foreground ,yellow))))
+     (compilation-line-number ((,class (:foreground ,yellow))))
+     (compilation-message-face ((,class (:foreground ,blue))))
+     (compilation-mode-line-exit ((,class (:foreground ,green))))
+     (compilation-mode-line-fail ((,class (:foreground ,red))))
+     (compilation-mode-line-run ((,class (:foreground ,blue))))
+
+     ;; Grep
+     (grep-context-face ((,class (:foreground ,comment))))
+     (grep-error-face ((,class (:foreground ,red :weight bold :underline t))))
+     (grep-hit-face ((,class (:foreground ,blue))))
+     (grep-match-face ((,class (:foreground nil :background nil :inherit match))))
+
+     (regex-tool-matched-face ((,class (:foreground nil :background nil :inherit match))))
+
+     ;; mark-multiple
+     (mm/master-face ((,class (:inherit region :foreground nil :background nil))))
+     (mm/mirror-face ((,class (:inherit region :foreground nil :background nil))))
+
+     (org-agenda-structure ((,class (:foreground ,purple))))
+     (org-agenda-date ((,class (:foreground ,blue :underline nil))))
+     (org-agenda-done ((,class (:foreground ,green))))
+     (org-agenda-dimmed-todo-face ((,class (:foreground ,comment))))
+     (org-block ((,class (:foreground ,orange))))
+     (org-code ((,class (:foreground ,yellow))))
+     (org-column ((,class (:background ,current-line))))
+     (org-column-title ((,class (:inherit org-column :weight bold :underline t))))
+     (org-date ((,class (:foreground ,purple :underline t))))
+     (org-document-info ((,class (:foreground ,aqua))))
+     (org-document-info-keyword ((,class (:foreground ,green))))
+     (org-document-title ((,class (:weight bold :foreground ,orange :height 1.44))))
+     (org-done ((,class (:foreground ,green))))
+     (org-ellipsis ((,class (:foreground ,comment))))
+     (org-footnote ((,class (:foreground ,aqua))))
+     (org-formula ((,class (:foreground ,red))))
+     (org-hide ((,class (:foreground ,current-line))))
+     (org-link ((,class (:foreground ,blue))))
+     (org-scheduled ((,class (:foreground ,green))))
+     (org-scheduled-previously ((,class (:foreground ,orange))))
+     (org-scheduled-today ((,class (:foreground ,green))))
+     (org-special-keyword ((,class (:foreground ,orange))))
+     (org-table ((,class (:foreground ,purple))))
+     (org-todo ((,class (:foreground ,red))))
+     (org-upcoming-deadline ((,class (:foreground ,orange))))
+     (org-warning ((,class (:weight bold :foreground ,red))))
+
+     (markdown-url-face ((,class (:inherit link))))
+     (markdown-link-face ((,class (:foreground ,blue :underline t))))
+
+     (hl-sexp-face ((,class (:background ,current-line))))
+     (highlight-80+ ((,class (:background ,current-line))))
+
+     ;; Python-specific overrides
+     (py-builtins-face ((,class (:foreground ,orange :weight normal))))
+
+     ;; js2-mode
+     (js2-warning-face ((,class (:underline ,orange))))
+     (js2-error-face ((,class (:foreground nil :underline ,red))))
+     (js2-external-variable-face ((,class (:foreground ,purple))))
+     (js2-function-param-face ((,class (:foreground ,blue))))
+     (js2-instance-member-face ((,class (:foreground ,blue))))
+     (js2-private-function-call-face ((,class (:foreground ,red))))
+
+     ;; js3-mode
+     (js3-warning-face ((,class (:underline ,orange))))
+     (js3-error-face ((,class (:foreground nil :underline ,red))))
+     (js3-external-variable-face ((,class (:foreground ,purple))))
+     (js3-function-param-face ((,class (:foreground ,blue))))
+     (js3-jsdoc-tag-face ((,class (:foreground ,orange))))
+     (js3-jsdoc-type-face ((,class (:foreground ,aqua))))
+     (js3-jsdoc-value-face ((,class (:foreground ,yellow))))
+     (js3-jsdoc-html-tag-name-face ((,class (:foreground ,blue))))
+     (js3-jsdoc-html-tag-delimiter-face ((,class (:foreground ,green))))
+     (js3-instance-member-face ((,class (:foreground ,blue))))
+     (js3-private-function-call-face ((,class (:foreground ,red))))
+
+     ;; nxml
+     (nxml-name-face ((,class (:foreground unspecified :inherit font-lock-constant-face))))
+     (nxml-attribute-local-name-face ((,class (:foreground unspecified :inherit font-lock-variable-name-face))))
+     (nxml-ref-face ((,class (:foreground unspecified :inherit font-lock-preprocessor-face))))
+     (nxml-delimiter-face ((,class (:foreground unspecified :inherit font-lock-keyword-face))))
+     (nxml-delimited-data-face ((,class (:foreground unspecified :inherit font-lock-string-face))))
+     (rng-error-face ((,class (:underline ,red))))
+
+     ;; RHTML
+     (erb-delim-face ((,class (:background ,current-line))))
+     (erb-exec-face ((,class (:background ,current-line :weight bold))))
+     (erb-exec-delim-face ((,class (:background ,current-line))))
+     (erb-out-face ((,class (:background ,current-line :weight bold))))
+     (erb-out-delim-face ((,class (:background ,current-line))))
+     (erb-comment-face ((,class (:background ,current-line :weight bold :slant italic))))
+     (erb-comment-delim-face ((,class (:background ,current-line))))
+
+     ;; Message-mode
+     (message-header-other ((,class (:foreground nil :background nil :weight normal))))
+     (message-header-subject ((,class (:inherit message-header-other :weight bold :foreground ,yellow))))
+     (message-header-to ((,class (:inherit message-header-other :weight bold :foreground ,orange))))
+     (message-header-cc ((,class (:inherit message-header-to :foreground nil))))
+     (message-header-name ((,class (:foreground ,blue :background nil))))
+     (message-header-newsgroups ((,class (:foreground ,aqua :background nil :slant normal))))
+     (message-separator ((,class (:foreground ,purple))))
+
+     ;; Jabber
+     (jabber-chat-prompt-local ((,class (:foreground ,yellow))))
+     (jabber-chat-prompt-foreign ((,class (:foreground ,orange))))
+     (jabber-chat-prompt-system ((,class (:foreground ,yellow :weight bold))))
+     (jabber-chat-text-local ((,class (:foreground ,yellow))))
+     (jabber-chat-text-foreign ((,class (:foreground ,orange))))
+     (jabber-chat-text-error ((,class (:foreground ,red))))
+
+     (jabber-roster-user-online ((,class (:foreground ,green))))
+     (jabber-roster-user-xa ((,class :foreground ,comment)))
+     (jabber-roster-user-dnd ((,class :foreground ,yellow)))
+     (jabber-roster-user-away ((,class (:foreground ,orange))))
+     (jabber-roster-user-chatty ((,class (:foreground ,purple))))
+     (jabber-roster-user-error ((,class (:foreground ,red))))
+     (jabber-roster-user-offline ((,class (:foreground ,comment))))
+
+     (jabber-rare-time-face ((,class (:foreground ,comment))))
+     (jabber-activity-face ((,class (:foreground ,purple))))
+     (jabber-activity-personal-face ((,class (:foreground ,aqua))))
+
+     ;; Gnus
+     (gnus-cite-1 ((,class (:inherit outline-1 :foreground nil))))
+     (gnus-cite-2 ((,class (:inherit outline-2 :foreground nil))))
+     (gnus-cite-3 ((,class (:inherit outline-3 :foreground nil))))
+     (gnus-cite-4 ((,class (:inherit outline-4 :foreground nil))))
+     (gnus-cite-5 ((,class (:inherit outline-5 :foreground nil))))
+     (gnus-cite-6 ((,class (:inherit outline-6 :foreground nil))))
+     (gnus-cite-7 ((,class (:inherit outline-7 :foreground nil))))
+     (gnus-cite-8 ((,class (:inherit outline-8 :foreground nil))))
+     ;; there are several more -cite- faces...
+     (gnus-header-content ((,class (:inherit message-header-other))))
+     (gnus-header-subject ((,class (:inherit message-header-subject))))
+     (gnus-header-from ((,class (:inherit message-header-other-face :weight bold :foreground ,orange))))
+     (gnus-header-name ((,class (:inherit message-header-name))))
+     (gnus-button ((,class (:inherit link :foreground nil))))
+     (gnus-signature ((,class (:inherit font-lock-comment-face))))
+
+     (gnus-summary-normal-unread ((,class (:foreground ,blue :weight normal))))
+     (gnus-summary-normal-read ((,class (:foreground ,foreground :weight normal))))
+     (gnus-summary-normal-ancient ((,class (:foreground ,aqua :weight normal))))
+     (gnus-summary-normal-ticked ((,class (:foreground ,orange :weight normal))))
+     (gnus-summary-low-unread ((,class (:foreground ,comment :weight normal))))
+     (gnus-summary-low-read ((,class (:foreground ,comment :weight normal))))
+     (gnus-summary-low-ancient ((,class (:foreground ,comment :weight normal))))
+     (gnus-summary-high-unread ((,class (:foreground ,yellow :weight normal))))
+     (gnus-summary-high-read ((,class (:foreground ,green :weight normal))))
+     (gnus-summary-high-ancient ((,class (:foreground ,green :weight normal))))
+     (gnus-summary-high-ticked ((,class (:foreground ,orange :weight normal))))
+     (gnus-summary-cancelled ((,class (:foreground ,red :background nil :weight normal))))
+
+     (gnus-group-mail-low ((,class (:foreground ,comment))))
+     (gnus-group-mail-low-empty ((,class (:foreground ,comment))))
+     (gnus-group-mail-1 ((,class (:foreground nil :weight normal :inherit outline-1))))
+     (gnus-group-mail-2 ((,class (:foreground nil :weight normal :inherit outline-2))))
+     (gnus-group-mail-3 ((,class (:foreground nil :weight normal :inherit outline-3))))
+     (gnus-group-mail-4 ((,class (:foreground nil :weight normal :inherit outline-4))))
+     (gnus-group-mail-5 ((,class (:foreground nil :weight normal :inherit outline-5))))
+     (gnus-group-mail-6 ((,class (:foreground nil :weight normal :inherit outline-6))))
+     (gnus-group-mail-1-empty ((,class (:inherit gnus-group-mail-1 :foreground ,comment))))
+     (gnus-group-mail-2-empty ((,class (:inherit gnus-group-mail-2 :foreground ,comment))))
+     (gnus-group-mail-3-empty ((,class (:inherit gnus-group-mail-3 :foreground ,comment))))
+     (gnus-group-mail-4-empty ((,class (:inherit gnus-group-mail-4 :foreground ,comment))))
+     (gnus-group-mail-5-empty ((,class (:inherit gnus-group-mail-5 :foreground ,comment))))
+     (gnus-group-mail-6-empty ((,class (:inherit gnus-group-mail-6 :foreground ,comment))))
+     (gnus-group-news-1 ((,class (:foreground nil :weight normal :inherit outline-5))))
+     (gnus-group-news-2 ((,class (:foreground nil :weight normal :inherit outline-6))))
+     (gnus-group-news-3 ((,class (:foreground nil :weight normal :inherit outline-7))))
+     (gnus-group-news-4 ((,class (:foreground nil :weight normal :inherit outline-8))))
+     (gnus-group-news-5 ((,class (:foreground nil :weight normal :inherit outline-1))))
+     (gnus-group-news-6 ((,class (:foreground nil :weight normal :inherit outline-2))))
+     (gnus-group-news-1-empty ((,class (:inherit gnus-group-news-1 :foreground ,comment))))
+     (gnus-group-news-2-empty ((,class (:inherit gnus-group-news-2 :foreground ,comment))))
+     (gnus-group-news-3-empty ((,class (:inherit gnus-group-news-3 :foreground ,comment))))
+     (gnus-group-news-4-empty ((,class (:inherit gnus-group-news-4 :foreground ,comment))))
+     (gnus-group-news-5-empty ((,class (:inherit gnus-group-news-5 :foreground ,comment))))
+     (gnus-group-news-6-empty ((,class (:inherit gnus-group-news-6 :foreground ,comment))))
+
+     (erc-direct-msg-face ((,class (:foreground ,orange))))
+     (erc-error-face ((,class (:foreground ,red))))
+     (erc-header-face ((,class (:foreground ,foreground :background ,selection))))
+     (erc-input-face ((,class (:foreground ,green))))
+     (erc-keyword-face ((,class (:foreground ,yellow))))
+     (erc-current-nick-face ((,class (:foreground ,green))))
+     (erc-my-nick-face ((,class (:foreground ,green))))
+     (erc-nick-default-face ((,class (:weight normal :foreground ,purple))))
+     (erc-nick-msg-face ((,class (:weight normal :foreground ,yellow))))
+     (erc-notice-face ((,class (:foreground ,comment))))
+     (erc-pal-face ((,class (:foreground ,orange))))
+     (erc-prompt-face ((,class (:foreground ,blue))))
+     (erc-timestamp-face ((,class (:foreground ,aqua))))
+
+     (custom-variable-tag ((,class (:foreground ,blue))))
+     (custom-group-tag ((,class (:foreground ,blue))))
+     (custom-state ((,class (:foreground ,green))))
+     )))
+
+(defmacro color-theme-tomorrow--frame-parameter-specs ()
+  "Return a backquote which defines a list of frame parameter specs.
+
+These are required by color-theme's `color-theme-install', but
+not by the new `deftheme' mechanism. It expects to be evaluated
+in a scope in which the various color names to which it refers
+are bound."
+  (quote
+   `(((background-color . ,background)
+      (background-mode . light)
+      (border-color . ,foreground)
+      (cursor-color . ,purple)
+      (foreground-color . ,foreground)
+      (mouse-color . ,aqua)))))
+
+(defun color-theme-tomorrow--theme-name (mode)
+  (intern (format "tomorrow-%s" (symbol-name mode))))
+
+(defmacro color-theme-tomorrow--define-theme (mode)
+  "Define a theme for the tomorrow variant `MODE'."
+  (let ((name (color-theme-tomorrow--theme-name mode))
+        (doc (format "tomorrow-%s" mode)))
+    `(progn
+       (deftheme ,name ,doc)
+       (color-theme-tomorrow--with-colors
+        ',mode
+        (apply 'custom-theme-set-faces ',name
+               (color-theme-tomorrow--face-specs))
+        (custom-theme-set-variables
+         ',name
+         `(fci-rule-color ,current-line)
+         `(ansi-color-names-vector (vector ,foreground ,red ,green ,yellow ,blue ,purple ,aqua ,background))
+         '(ansi-color-faces-vector [default bold shadow italic underline bold bold-italic bold])))
+       (provide-theme ',name))))
+
+
+(defun color-theme-tomorrow-real (mode)
+  "Apply the tomorrow variant theme."
+  (if (fboundp 'load-theme)
+      (let ((name (color-theme-tomorrow--theme-name mode)))
+        (if (> emacs-major-version 23)
+            (load-theme name t)
+          (load-theme name)))
+    (progn
+      (require 'color-theme)
+      (color-theme-tomorrow--with-colors
+       mode
+       (color-theme-install
+        `(,(intern (concat "color-theme-tomorrow-" (symbol-name mode)))
+          ,@(color-theme-tomorrow--frame-parameter-specs)
+          ,@(color-theme-tomorrow--face-specs)))
+       ;; ansi-color - comint and other modes that handle terminal color escape sequences
+       (setq ansi-color-names-vector (vector foreground red green yellow blue purple aqua background))
+       (setq ansi-color-faces-vector [default bold shadow italic underline bold bold-italic bold])))))
+
+;;;###autoload
+(when (boundp 'custom-theme-load-path)
+  (add-to-list 'custom-theme-load-path
+               (file-name-as-directory (file-name-directory load-file-name))))
+
+;;;###autoload
+(defun color-theme-tomorrow-night ()
+  (interactive)
+  (color-theme-tomorrow-real 'night))
+
+;;;###autoload
+(defun color-theme-tomorrow ()
+  (interactive)
+  (color-theme-tomorrow-real 'day))
+
+;;;###autoload
+(defun color-theme-tomorrow-night-bright ()
+  (interactive)
+  (color-theme-tomorrow-real 'night-bright))
+
+;;;###autoload
+(defun color-theme-tomorrow-night-eighties ()
+  (interactive)
+  (color-theme-tomorrow-real 'night-eighties))
+
+;;;###autoload
+(defun color-theme-tomorrow-night-blue ()
+  (interactive)
+  (color-theme-tomorrow-real 'night-blue))
+
+
+(provide 'color-theme-tomorrow)
+
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions)
+;; End:
+
+;;; color-theme-tomorrow.el ends here
diff --git a/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-day-theme.el b/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-day-theme.el
new file mode 100644
index 0000000..58761dd
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-day-theme.el
@@ -0,0 +1,2 @@
+(require 'color-theme-tomorrow)
+(color-theme-tomorrow--define-theme day)
diff --git a/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-blue-theme.el b/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-blue-theme.el
new file mode 100644
index 0000000..32ffdde
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-blue-theme.el
@@ -0,0 +1,2 @@
+(require 'color-theme-tomorrow)
+(color-theme-tomorrow--define-theme night-blue)
diff --git a/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-bright-theme.el b/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-bright-theme.el
new file mode 100644
index 0000000..c1be97e
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-bright-theme.el
@@ -0,0 +1,2 @@
+(require 'color-theme-tomorrow)
+(color-theme-tomorrow--define-theme night-bright)
diff --git a/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-eighties-theme.el b/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-eighties-theme.el
new file mode 100644
index 0000000..4818341
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-eighties-theme.el
@@ -0,0 +1,2 @@
+(require 'color-theme-tomorrow)
+(color-theme-tomorrow--define-theme night-eighties)
diff --git a/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-theme.el b/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-theme.el
new file mode 100644
index 0000000..67c9a25
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/emacs/themes/tomorrow-night-theme.el
@@ -0,0 +1,2 @@
+(require 'color-theme-tomorrow)
+(color-theme-tomorrow--define-theme night)
diff --git a/emacs/emacs.d.symlink/config/emacs/window.el b/emacs/emacs.d.symlink/config/emacs/window.el
index d6b02f5..501364b 100644
--- a/emacs/emacs.d.symlink/config/emacs/window.el
+++ b/emacs/emacs.d.symlink/config/emacs/window.el
@@ -29,6 +29,9 @@
 (defvar  my-face-b-1 'my-face-b-1)
 (defvar  my-face-b-2 'my-face-b-2)
 (defvar  my-face-u-1 'my-face-u-1)
+(make-variable-buffer-local 'my-face-b-1)
+(make-variable-buffer-local 'my-face-b-2)
+(make-variable-buffer-local 'my-face-u-1)
 (defadvice font-lock-mode (before my-font-lock-mode ())
   (font-lock-add-keywords major-mode '(("　"    0 my-face-b-1 append)
                                        ("\t"    0 my-face-b-2 append)
@@ -48,3 +51,8 @@ See `font-lock-add-keywords' and `font-lock-defaults'."
   (font-lock-remove-keywords mode (get mode 'font-lock-user-keywords))
   (font-lock-add-keywords mode keywords)
   (put mode 'font-lock-user-keywords keywords))
+
+(setq frame-title-format
+      (if (buffer-file-name)
+          (format "%%f - Emacs")
+        (format "%%b - Emacs")))
diff --git a/emacs/emacs.d.symlink/config/functions.el b/emacs/emacs.d.symlink/config/functions.el
new file mode 100644
index 0000000..2d4c601
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/functions.el
@@ -0,0 +1 @@
+(try-load "config/functions/utils")
diff --git a/emacs/emacs.d.symlink/config/functions/utils.el b/emacs/emacs.d.symlink/config/functions/utils.el
new file mode 100644
index 0000000..f463b78
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/functions/utils.el
@@ -0,0 +1,170 @@
+;; ウィンドウサイズをC-q C-rで変更(hjkl操作)
+;;_______________________________________________________________
+(defun window-resizer ()
+  "Control window size and position."
+  (interactive)
+  (let ((window-obj (selected-window))
+        (current-width (window-width))
+        (current-height (window-height))
+        (dx (if (= (nth 0 (window-edges)) 0) 1 -1))
+        (dy (if (= (nth 1 (window-edges)) 0) 1 -1))
+        action c)
+    (catch 'end-flag
+      (while t
+        (setq action
+              (read-key-sequence-vector
+               (format "size[%dx%d]" (window-width) (window-height))))
+        (setq c (aref action 0))
+        (cond ((= c ?l) (enlarge-window-horizontally dx))
+              ((= c ?h) (shrink-window-horizontally dx))
+              ((= c ?j) (enlarge-window dy))
+              ((= c ?k) (shrink-window dy))
+              ;; otherwise
+              (t (let ((last-command-event (aref action 0)) (command (key-binding action)))
+                   (when command (call-interactively command)))
+                 (message "Quit")
+                 (throw 'end-flag t)))))))
+(define-key global-map (kbd "C-q") (make-sparse-keymap))
+(define-key global-map (kbd "C-q C-q") #'quoted-insert)
+(define-key global-map (kbd "C-q C-r") #'window-resizer)
+(define-key global-map (kbd "C-q C-l") #'windmove-right)
+(define-key global-map (kbd "C-q C-h") #'windmove-left)
+(define-key global-map (kbd "C-q C-j") #'windmove-down)
+(define-key global-map (kbd "C-q C-k") #'windmove-up)
+
+;; 0バイトになったファイルをファイルシステムから削除
+;;_______________________________________________________________
+(defun delete-file-if-no-contents ()
+  (when (and (buffer-file-name (current-buffer))
+             (= (point-min) (point-max)))
+    (when (y-or-n-p "Delete file and kill buffer?")
+      (delete-file (buffer-file-name (current-buffer)))
+      (kill-buffer (current-buffer)))))
+(add-to-list 'after-save-hook #'delete-file-if-no-contents)
+
+;; コメントアウトして貼り付け
+;;_______________________________________________________________
+(defun copy-and-comment-out (start end)
+  (interactive "r")
+  ;;(save-excursion
+    (kill-ring-save start end)
+    (comment-region start end)
+    (newline)
+    ;;(newline)
+    (yank));)
+(define-key global-map (kbd "C-M-:") #'copy-and-comment-out)
+
+;; scratchバッファの保存とリストア
+;;_______________________________________________________________
+(defun save-scratch-data ()
+  (if (get-buffer "*scratch*")
+      (let* ((str (progn (set-buffer (get-buffer "*scratch*"))
+                         (buffer-substring-no-properties (point-min) (point-max))))
+             (file (concat user-emacs-directory "tmp/scratch-" (system-name)))
+             (buf (or (get-file-buffer (expand-file-name file))
+                      (find-file-noselect file))))
+        (set-buffer buf)
+        (erase-buffer)
+        (insert str)
+        (save-buffer)
+        (kill-buffer buf))))
+
+(defadvice save-buffers-kill-emacs (before save-scratch-buffer activate)
+  (save-scratch-data))
+
+(defun read-scratch-data ()
+  (let ((file (concat user-emacs-directory "tmp/scratch-" (system-name))))
+    (when (file-exists-p file)
+      (set-buffer (get-buffer "*scratch*"))
+      (erase-buffer)
+      (insert-file-contents file))))
+(read-scratch-data)
+
+;; don't kill *scratch*
+(defun unkillable-scratch-buffer ()
+  (if (equal (buffer-name (current-buffer)) "*scratch*")
+      (progn (delete-region (point-min) (point-max)) nil)
+    t))
+(add-hook 'kill-buffer-query-functions #'unkillable-scratch-buffer)
+
+;; URLをw3mかブラウザの選択
+;;_______________________________________________________________
+(defun choose-browser (url &rest args)
+  (interactive "sURL: ")
+  (if (y-or-n-p "Use external browser? ")
+      (browse-url-default-macosx-browser url)
+    (w3m-browse-url url)))
+(setq browse-url-browser-function #'choose-browser)
+
+;;; 折り返し表示ON/OFF
+;;====================================
+(define-key global-map (kbd "C-c TAB")
+  (lambda ()
+    (interactive)
+    (if truncate-lines
+        (setq truncate-lines nil)
+      (setq truncate-lines t))))
+
+;; scratch以外の全てのBufferを削除
+;;====================================
+(defun my-kill-all-buffers ()
+  "scratch bufferを除く全てのバッファをkill"
+  (interactive)
+  (dolist (buf (buffer-list))
+    (if (not (string= "*scratch*" (buffer-name buf)))
+        (kill-buffer buf))))
+
+;; リージョンを選択していないときに行をキルする
+;;====================================
+(defadvice kill-region (around kill-line-or-kill-region activate)
+  (if (and (called-interactively-p 'interactive)
+           transient-mark-mode (not mark-active))
+      (kill-whole-line)
+    ad-do-it))
+
+;; リージョンを選択していないときに行をコピーする
+;;====================================
+(defadvice kill-ring-save (around kill-line-save-or-kill-ring-save activate)
+  (if (and (called-interactively-p 'interactive)
+           transient-mark-mode (not mark-active))
+      (copy-line)
+    ad-do-it))
+
+(defun copy-line (&optional arg)
+  (interactive "p")
+  (copy-region-as-kill
+   (line-beginning-position)
+   (line-beginning-position (1+ (or arg 1))))
+  (message "Line copied"))
+
+;; 所有者がrootだった場合にsudoで開くかを確認する
+;;_______________________________________________________________
+(defun file-root-p (filename)
+  (eq 0 (nth 2 (file-attributes filename))))
+
+(defun th-rename-tramp-buffer ()
+  (when (file-remote-p (buffer-file-name))
+    (rename-buffer
+     (format "%s:%s" (file-remote-p (buffer-file-name) 'method) (buffer-name)))))
+(add-hook 'find-file-hook #'th-rename-tramp-buffer)
+
+(defadvice find-file (around th-find-file activate)
+  (if (and (file-root-p (ad-get-arg 0))
+           (not (file-writable-p (ad-get-arg 0)))
+           (y-or-n-p (concat "File " (ad-get-arg 0) " is read-only.  Open it as root? ")))
+      (th-find-file-sudo (ad-get-arg 0))
+    ad-do-it))
+
+(defun th-find-file-sudo (file)
+  (interactive "F")
+  (set-buffer (find-file (concat "/sudo::" file))))
+
+;; 一時的なファイルを作成する
+;;_______________________________________________________________
+(defun open-junk-file ()
+  (interactive)
+  (let* ((file (expand-file-name
+                (format-time-string "%Y/%m/%Y-%m-%d-%H%M%S." (current-time)) "~/.emacs.d/tmp/junk"))
+         (dir (file-name-directory file)))
+    (make-directory dir t)
+    (find-file-other-window (read-string "Junk Code: " file))))
diff --git a/emacs/emacs.d.symlink/config/packages.el b/emacs/emacs.d.symlink/config/packages.el
index 00c96ba..47d5067 100644
--- a/emacs/emacs.d.symlink/config/packages.el
+++ b/emacs/emacs.d.symlink/config/packages.el
@@ -2,7 +2,7 @@
 (try-load "config/packages/el-bundler")

 ;; Utility Package
-(try-load "config/packages/powerline")
+;: (try-load "config/packages/powerline")
 (try-load "config/packages/helm")
 (try-load "config/packages/auto-async-byte-compile")
 (try-load "config/packages/auto-complete")
@@ -30,14 +30,19 @@
 (try-load "config/packages/multi-term")
 (try-load "config/packages/auto-highlight-symbol")
 (try-load "config/packages/google-translate")
+;; (try-load "config/packages/revive")
+(try-load "config/packages/ace-jump-mode")
+;; (try-load "config/packages/popup-pos-tip")
+;; (try-load "config/packages/guide-key")
+
 ;; (try-load "config/packages/auto-save-buffers")
 ;; (try-load "config/packages/ediff")
 ;; (try-load "config/packages/quickrun")
 ;; (try-load "config/packages/rotate")

 ;; Development Package
-;; (try-load "config/packages/flycheck")
 (try-load "config/packages/php-mode")
+(try-load "config/packages/go-mode")
 (try-load "config/packages/coffee-mode")
 (try-load "config/packages/js2-mode")
 (try-load "config/packages/web-mode")
diff --git a/emacs/emacs.d.symlink/config/packages/ace-jump-mode.el b/emacs/emacs.d.symlink/config/packages/ace-jump-mode.el
new file mode 100644
index 0000000..a15ebdc
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/packages/ace-jump-mode.el
@@ -0,0 +1,17 @@
+(require 'ace-jump-mode)
+
+;; (define-key global-map (kbd "C-c SPC") 'ace-jump-mode)
+
+(defun add-keys-to-ace-jump-mode (prefix c &optional mode)
+  (define-key global-map
+    (read-kbd-macro (concat prefix (string c)))
+    `(lambda ()
+       (interactive)
+       (funcall (if (eq ',mode 'word)
+                    #'ace-jump-word-mode
+                  #'ace-jump-char-mode) ,c))))
+
+(loop for c from ?0 to ?9 do (add-keys-to-ace-jump-mode "H-" c))
+(loop for c from ?a to ?z do (add-keys-to-ace-jump-mode "H-" c))
+(loop for c from ?0 to ?9 do (add-keys-to-ace-jump-mode "H-M-" c 'word))
+(loop for c from ?a to ?z do (add-keys-to-ace-jump-mode "H-M-" c 'word))
diff --git a/emacs/emacs.d.symlink/config/packages/el-bundler.el b/emacs/emacs.d.symlink/config/packages/el-bundler.el
index 4c8bb31..eb9b5f0 100644
--- a/emacs/emacs.d.symlink/config/packages/el-bundler.el
+++ b/emacs/emacs.d.symlink/config/packages/el-bundler.el
@@ -2,17 +2,31 @@
 (require 'el-bundler)

 (el-bundler:packages
- ;; (:type "github" :name "daic-h/initialize")
- (:type "github" :name "daic-h/emacs-rotate")
- (:type "github" :name "daic-h/auto-async-byte-compile-mirror")
+ ;; helm
  (:type "github" :name "emacs-helm/helm")
  (:type "github" :name "emacs-helm/helm-c-moccur")
  (:type "github" :name "emacs-helm/helm-descbinds")
  (:type "github" :name "emacs-helm/helm-ls-git")
  (:type "github" :name "emacs-helm/helm-c-yasnippet")
  (:type "github" :name "daic-h/helm-growthforecast")
- (:type "github" :name "syohex/emacs-helm-ag")
+;; (:type "github" :name "syohex/emacs-helm-ag")
  (:type "github" :name "syohex/emacs-helm-gtags")
+
+  ;; git-butter
+ (:type "github" :name "syohex/emacs-git-gutter")
+ (:type "github" :name "syohex/emacs-git-gutter-fringe")
+ (:type "github" :name "nschum/fringe-helper.el")
+
+ ;; auto-complete
+ (:type "github" :name "auto-complete/fuzzy-el")
+ (:type "github" :name "auto-complete/popup-el")
+ (:type "github" :name "auto-complete/auto-complete")
+
+ ;; pos-tip
+ (:type "github" :name "emacsmirror/pos-tip")
+ (:type "github" :name "emacsmirror/popup-pos-tip")
+
+ ;; develop mode
  (:type "github" :name "ejmr/php-mode")
  (:type "github" :name "mooz/js2-mode")
  (:type "github" :name "hvesalai/scala-mode2")
@@ -23,11 +37,13 @@
  (:type "github" :name "nex3/haml-mode")
  (:type "github" :name "antonj/scss-mode")
  (:type "github" :name "yoshiki/yaml-mode")
+ (:type "github" :name "dominikh/go-mode.el")
+
+ ;; utils
+ (:type "github" :name "emacsmirror/revive")
+ (:type "github" :name "daic-h/auto-async-byte-compile-mirror")
  (:type "github" :name "hayamiz/twittering-mode")
  (:type "github" :name "capitaomorte/yasnippet")
- (:type "github" :name "auto-complete/fuzzy-el")
- (:type "github" :name "auto-complete/popup-el")
- (:type "github" :name "auto-complete/auto-complete")
  (:type "github" :name "m2ym/popwin-el")
  (:type "github" :name "m2ym/undohist-el")
  (:type "github" :name "magnars/multiple-cursors.el")
@@ -36,17 +52,16 @@
  (:type "github" :name "mooz/emacs-zlc")
  (:type "github" :name "syohex/emacs-quickrun")
  (:type "github" :name "uk-ar/flex-autopair")
- (:type "github" :name "syohex/emacs-git-gutter")
- (:type "github" :name "syohex/emacs-git-gutter-fringe")
  (:type "github" :name "emacsmirror/auto-highlight-symbol")
- (:type "github" :name "nschum/fringe-helper.el")
  (:type "github" :name "jonathanchu/emacs-powerline")
- (:type "github" :name "imakado/emacs-smartchr")
  (:type "github" :name "magnars/expand-region.el")
  (:type "github" :name "id774-2/emacs-w3m")
  (:type "github" :name "k-talo/smooth-scroll.el")
  (:type "github" :name "emacs-jp/elscreen")
  (:type "github" :name "kawaguchi/jaunte.el")
+ (:type "github" :name "winterTTr/ace-jump-mode")
+ (:type "github" :name "manzyuk/google-translate")
+ (:type "github" :name "kbkbkbkb1/guide-key")
  (:type "github" :name "emacsmirror/shell-pop")
  (:type "github" :name "emacsmirror/redo-plus")
  (:type "github" :name "emacsmirror/point-undo")
@@ -58,8 +73,31 @@
  (:type "github" :name "emacsmirror/sequential-command")
  (:type "github" :name "emacsmirror/color-moccur")
  (:type "github" :name "emacsmirror/multi-term")
- (:type "github" :name "manzyuk/google-translate")
  (:type "git" :url "git://navi2ch.git.sourceforge.net/gitroot/navi2ch/navi2ch"))

 (el-bundler:configure :dir "~/.emacs.d/packages/bundle" :process-num 3)
 (el-bundler:initialize)
+
+;; (elpm-packages
+;;  (:type "github" :name "emacs-helm/helm")
+;;  (:type "github" :name "emacs-helm/helm-c-moccur")
+;;  (:type "github" :name "emacs-helm/helm-descbinds")
+;;  (:type "github" :name "emacs-helm/helm-ls-git")
+;;  (:type "github" :name "emacs-helm/helm-c-yasnippet")
+;;  (:type "github" :name "daic-h/helm-growthforecast")
+;;  (:type "github" :name "syohex/emacs-helm-ag")
+;;  (:type "github" :name "syohex/emacs-helm-gtags")
+;;  (:type "git" :url "git://navi2ch.git.sourceforge.net/gitroot/navi2ch/navi2ch")))
+
+;; (elpm-source :github
+;;  (:name "emacs-helm/helm")
+;;  (:name "emacs-helm/helm-c-moccur")
+;;  (:name "emacs-helm/helm-descbinds")
+;;  (:name "emacs-helm/helm-ls-git")
+;;  (:name "emacs-helm/helm-c-yasnippet")
+;;  (:name "daic-h/helm-growthforecast")
+;;  (:name "syohex/emacs-helm-ag")
+;;  (:name "syohex/emacs-helm-gtags"))
+
+;; (elpm-sources :git
+;;  (:url "git://navi2ch.git.sourceforge.net/gitroot/navi2ch/navi2ch"))
diff --git a/emacs/emacs.d.symlink/config/packages/elscreen.el b/emacs/emacs.d.symlink/config/packages/elscreen.el
index a4b8a52..3c6b16a 100644
--- a/emacs/emacs.d.symlink/config/packages/elscreen.el
+++ b/emacs/emacs.d.symlink/config/packages/elscreen.el
@@ -2,7 +2,7 @@
 (require 'elscreen)
 (elscreen-start)

-;; (setq elscreen-display-tab t)
+(setq elscreen-display-tab nil)
 ;; (setq elscreen-display-screen-number nil)
 (setq elscreen-tab-display-control nil)
 (setq elscreen-tab-display-kill-screen nil)
diff --git a/emacs/emacs.d.symlink/config/packages/go-mode.el b/emacs/emacs.d.symlink/config/packages/go-mode.el
new file mode 100644
index 0000000..6c2411d
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/packages/go-mode.el
@@ -0,0 +1,12 @@
+(autoload 'go-mode "go-mode" nil t)
+
+(add-hook-fn 'go-mode-hook
+ (setq c-basic-offset 4)
+ (setq indent-tabs-mode t)
+ (local-set-key (kbd "C-c C-r") 'go-remove-unused-imports)
+ (local-set-key (kbd "C-c i") 'go-goto-imports)
+ (local-set-key (kbd "C-c d") 'godoc)
+ ;; Goはタブ使うのでしょうがなく
+ (face-remap-add-relative 'my-face-b-2 '(:background nil)) )
+
+(add-to-auto-mode-fn 'go-mode '("\\.go$"))
diff --git a/emacs/emacs.d.symlink/config/packages/guide-key.el b/emacs/emacs.d.symlink/config/packages/guide-key.el
new file mode 100644
index 0000000..5e8ef3f
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/packages/guide-key.el
@@ -0,0 +1,3 @@
+(require 'guide-key)
+(setq guide-key/guide-key-sequence '("C-x r" "C-x 4"))
+(guide-key-mode 1)  ; Enable guide-key-mode
diff --git a/emacs/emacs.d.symlink/config/packages/helm.el b/emacs/emacs.d.symlink/config/packages/helm.el
index 2a9a628..e3eab93 100644
--- a/emacs/emacs.d.symlink/config/packages/helm.el
+++ b/emacs/emacs.d.symlink/config/packages/helm.el
@@ -26,7 +26,7 @@
 ;;

 (require 'helm-growthforecast)
-(require 'helm-ag)
+;: (require 'helm-ag)

 (require 'helm-c-yasnippet)
 (global-set-key (kbd "C-c y") 'helm-c-yas-complete)
@@ -48,10 +48,12 @@
   (local-set-key (kbd "M-s") 'helm-gtags-find-symbol)
   (local-set-key (kbd "C-t") 'helm-gtags-pop-stack))

+
 ;;
 ;; user function
 ;;

+;; Git
 (defun helm-c-source-git-log (&optional target-file)
   (let ((file (or target-file ""))
         (regexp (concat "^\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\s"
@@ -62,31 +64,30 @@
                   (call-process-shell-command
                    (format "git log --date=short --pretty=format:\"%%ad %%h (%%an) %%s\" %s" ,file) nil t nil))))
       (candidates-in-buffer)
-      (candidate-transformer (lambda (candidate)
-                               (loop for line in candidate
-                                     if (string-match ,regexp line)
-                                     collect (format "%s %s %s %s"
-                                                     (propertize (match-string 1 line) 'face
-                                                                 '((t (:foreground "Skyblue1"))))
-                                                     (propertize (match-string 2 line) 'face
-                                                                 '((t (:foreground "Darkgoldenrod1"))))
-                                                     (propertize (match-string 3 line) 'face
-                                                                 '((t (:foreground "ForestGreen"))))
-                                                     (match-string 4 line))
-                                     else return (list line))))
-      (action . (("Show Log" . (lambda (candidate)
-                                 (let ((hash (progn (string-match ,regexp candidate)
-                                                    (match-string 2 candidate))))
-                                   (with-current-buffer (get-buffer-create "*helm-git-log*")
-                                     (setq buffer-read-only nil)
-                                     (erase-buffer)
-                                     (save-excursion
-                                       (call-process-shell-command
-                                        (format "git show %s %s" hash ,file) nil t nil))
-                                     (unless (eq major-mode 'diff-mode)
-                                       (diff-mode))
-                                     (setq buffer-read-only t)
-                                     (helm-switch-to-buffer (current-buffer)))))))))))
+      (candidate-transformer
+       (lambda (candidate)
+         (loop for line in candidate
+               if (string-match ,regexp line)
+               collect (format "%s %s %s %s"
+                               (propertize (match-string 1 line) 'face '((t (:foreground "Skyblue1"))))
+                               (propertize (match-string 2 line) 'face '((t (:foreground "Darkgoldenrod1"))))
+                               (propertize (match-string 3 line) 'face '((t (:foreground "ForestGreen"))))
+                               (match-string 4 line))
+               else return (list line))))
+      (action . (("Show Log" .
+                  (lambda (candidate)
+                    (let ((hash (progn (string-match ,regexp candidate)
+                                       (match-string 2 candidate))))
+                      (with-current-buffer (get-buffer-create "*helm-git-log*")
+                        (setq buffer-read-only nil)
+                        (erase-buffer)
+                        (save-excursion
+                          (call-process-shell-command
+                           (format "git show %s %s" hash ,file) nil t nil))
+                        (unless (eq major-mode 'diff-mode)
+                          (diff-mode))
+                        (setq buffer-read-only t)
+                        (helm-switch-to-buffer (current-buffer)))))))))))

 (defun helm-git-log ()
   (interactive)
@@ -95,3 +96,52 @@
 (defun helm-git-log-current-file ()
   (interactive)
   (helm :sources (helm-c-source-git-log (buffer-file-name))))
+
+;; Ag
+(defun helm-c-source-ag ()
+  '((name . "Ag")
+    (init . (lambda ()
+              (let* ((dir (file-name-directory buffer-file-name))
+                     (target-dir (read-string "target dir: " dir))
+                     (target-word (read-string "ag: ")))
+                (helm-attrset 'target-dir target-dir)
+                (helm-attrset 'target-word target-word)
+                (with-current-buffer (helm-candidate-buffer 'global)
+                  (call-process-shell-command
+                   (format "ag --smart-case --nogroup --column --line-numbers %s %s" target-word target-dir) nil t nil)))))
+    (candidates-in-buffer)
+    (candidate-transformer
+     (lambda (candidate)
+       (let ((target-dir (helm-attr 'target-dir))
+             (target-word (helm-attr 'target-word)))
+         (loop for line in candidate
+               if (string-match "^\\(.*\\):\\([0-9]+\\):\\([0-9]+\\):\\(.*\\)$" line)
+               collect (progn
+                         (let ((file (replace-regexp-in-string
+                                      target-dir "./" (match-string 1 line)))
+                               (line (match-string 2 line))
+                               (column (match-string 3 line))
+                               (result (match-string 4 line)))
+                           (format "%s:%s:%s: %s"
+                                   (propertize   file 'face '(foreground-color . "Skyblue1"))
+                                   line
+                                   column
+                                   ;; (propertize   line 'face '(foreground-color . "Green4"))
+                                   ;; (propertize column 'face '(foreground-color . "Mediumorchid4"))
+                                   (replace-regexp-in-string
+                                    target-word (propertize target-word 'face '(foreground-color . "Darkgoldenrod1")) result))))
+               else return (list line)))))
+    (action . (("Action" . (lambda (candidate)
+                             (let ((target-dir (helm-attr 'target-dir)))
+                               (string-match "^\\(.*\\):\\([0-9]+\\):\\([0-9]+\\):\\(.*\\)$" candidate)
+                               (let ((file (concat target-dir (match-string 1 candidate)))
+                                     (line (match-string 2 candidate))
+                                     (column (match-string 3 candidate)))
+                                 (with-current-buffer (find-file-noselect file)
+                                   (goto-line (string-to-int line))
+                                   (move-to-column (1- (string-to-int column)))
+                                   (helm-switch-to-buffer (current-buffer)))))))))))
+
+(defun helm-ag ()
+  (interactive)
+  (helm :sources (helm-c-source-ag)))
diff --git a/emacs/emacs.d.symlink/config/packages/multiple-cursors.el b/emacs/emacs.d.symlink/config/packages/multiple-cursors.el
index 3e67f00..b5f7808 100644
--- a/emacs/emacs.d.symlink/config/packages/multiple-cursors.el
+++ b/emacs/emacs.d.symlink/config/packages/multiple-cursors.el
@@ -1,17 +1,4 @@
-;; (require 'region-bindings-mode)
-;; (region-bindings-mode-enable)
-
-;; 下記モードでは発動しない
-;; (setq region-bindings-mode-disabled-modes '(foo-mode bar-mode))
-
-;; (define-key region-bindings-mode-map "a" 'mc/mark-all-like-this)
-;; (define-key region-bindings-mode-map "p" 'mc/mark-previous-like-this)
-;; (define-key region-bindings-mode-map "n" 'mc/mark-next-like-this)
-;; (define-key region-bindings-mode-map "m" 'mc/mark-more-like-this-extended)
-
 (require 'multiple-cursors)
-;; (global-set-key (kbd "C-S-c C-S-c") 'mc/edit-lines)
+
 (global-set-key (kbd "C->") 'mc/mark-next-like-this)
-(global-set-key (kbd "C-<") 'mc/mark-previous-like-this)
-(global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this)
-(global-set-key (kbd "C-c C->") 'mc/mark-all-like-this-in-defun)
+(global-set-key (kbd "C-<") 'mc/unmark-next-like-this)
diff --git a/emacs/emacs.d.symlink/config/packages/php-mode.el b/emacs/emacs.d.symlink/config/packages/php-mode.el
index b9fe8d6..7b4f8ad 100644
--- a/emacs/emacs.d.symlink/config/packages/php-mode.el
+++ b/emacs/emacs.d.symlink/config/packages/php-mode.el
@@ -5,6 +5,8 @@
  (setq indent-tabs-mode nil)
  (setq c-basic-offset 4)
  (setq tab-width 4)
+ (c-set-offset 'case-label' 4)
+ (c-set-offset 'substatement-open 0)
  (define-key php-mode-map (kbd "C-.") 'er/expand-region)
  (define-key php-mode-map (kbd "C-,") 'er/contract-region)
  (define-key php-mode-map (kbd "RET") 'docblock/newline-and-indent)
diff --git a/emacs/emacs.d.symlink/config/packages/popup-pos-tip.el b/emacs/emacs.d.symlink/config/packages/popup-pos-tip.el
new file mode 100644
index 0000000..6158277
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/packages/popup-pos-tip.el
@@ -0,0 +1 @@
+(require 'popup-pos-tip)
diff --git a/emacs/emacs.d.symlink/config/packages/popwin.el b/emacs/emacs.d.symlink/config/packages/popwin.el
index 663e335..9c634da 100644
--- a/emacs/emacs.d.symlink/config/packages/popwin.el
+++ b/emacs/emacs.d.symlink/config/packages/popwin.el
@@ -25,7 +25,7 @@
       popwin:special-display-config)

 ;; el-bundler
-(push '("*el-bundler:command*" :height 14 :noselect t :position bottom)
+(push '("*ElBundler:Command*" :height 14 :noselect t :position bottom)
       popwin:special-display-config)

 ;; google-translate
diff --git a/emacs/emacs.d.symlink/config/packages/powerline.el b/emacs/emacs.d.symlink/config/packages/powerline.el
index 8f50e04..b85b15f 100644
--- a/emacs/emacs.d.symlink/config/packages/powerline.el
+++ b/emacs/emacs.d.symlink/config/packages/powerline.el
@@ -1,18 +1,24 @@
 (require 'powerline)

-;; subatomic256
-;;--------------------------------------------
-;; (custom-set-faces
-;;  ;; アクティブ時
-;;  '(mode-line ((t (:foreground "white" :background "#5f5f87" :box nil))))
-;;  ;; 非アクティブ時
-;;  '(mode-line-inactive ((t (:foreground "#5f5f87" :background "#a8a8a8" :box nil)))))
-
-;; モードライン2色目
-;; (setq powerline-color1 "#a8a8a8")
-
-;; モードライン3色目
-;; (setq powerline-color2 "#262626")
+;; (let ((color1 "#cc6600")
+;;       (color1-inactive "#cc9999")
+;;       (color2 "#cc9999")
+;;       (color3 "#ffcc99")
+;;       (color1-fg "#000000")
+;;       (color1-inactive-fg "#000000"))
+;;   (custom-set-faces
+;;    ;; アクティブ時
+;;    `(mode-line ((t (:foreground ,color1-fg :background ,color1 :box nil))))
+;;    ;; 非アクティブ時
+;;    `(mode-line-inactive ((t (:foreground ,color1-inactive-fg :background ,color1-inactive :box nil)))))
+
+;;   ;; モードライン2色目
+;;   (setq powerline-color1 color2)
+
+;;   ;; モードライン3色目
+;;   (setq powerline-color2 color3))
+
+

 ;;Base
 ;;-------------------------------------------
diff --git a/emacs/emacs.d.symlink/config/packages/revive.el b/emacs/emacs.d.symlink/config/packages/revive.el
new file mode 100644
index 0000000..d4aaa4e
--- /dev/null
+++ b/emacs/emacs.d.symlink/config/packages/revive.el
@@ -0,0 +1,6 @@
+(autoload 'save-current-configuration "revive" "Save status" t)
+(autoload 'resume "revive" "Resume Emacs" t)
+(autoload 'wipe "revive" "Wipe emacs" t)
+(define-key global-map (kbd "C-x S") 'save-current-configuration)
+(define-key global-map (kbd "C-x F") 'resume)
+(add-hook 'kill-emacs-hook 'save-current-configuration)
diff --git a/emacs/emacs.d.symlink/functions/functions.el b/emacs/emacs.d.symlink/functions/functions.el
deleted file mode 100644
index 940c22c..0000000
--- a/emacs/emacs.d.symlink/functions/functions.el
+++ /dev/null
@@ -1 +0,0 @@
-(try-load "functions/utils")
diff --git a/emacs/emacs.d.symlink/functions/utils.el b/emacs/emacs.d.symlink/functions/utils.el
deleted file mode 100644
index f463b78..0000000
--- a/emacs/emacs.d.symlink/functions/utils.el
+++ /dev/null
@@ -1,170 +0,0 @@
-;; ウィンドウサイズをC-q C-rで変更(hjkl操作)
-;;_______________________________________________________________
-(defun window-resizer ()
-  "Control window size and position."
-  (interactive)
-  (let ((window-obj (selected-window))
-        (current-width (window-width))
-        (current-height (window-height))
-        (dx (if (= (nth 0 (window-edges)) 0) 1 -1))
-        (dy (if (= (nth 1 (window-edges)) 0) 1 -1))
-        action c)
-    (catch 'end-flag
-      (while t
-        (setq action
-              (read-key-sequence-vector
-               (format "size[%dx%d]" (window-width) (window-height))))
-        (setq c (aref action 0))
-        (cond ((= c ?l) (enlarge-window-horizontally dx))
-              ((= c ?h) (shrink-window-horizontally dx))
-              ((= c ?j) (enlarge-window dy))
-              ((= c ?k) (shrink-window dy))
-              ;; otherwise
-              (t (let ((last-command-event (aref action 0)) (command (key-binding action)))
-                   (when command (call-interactively command)))
-                 (message "Quit")
-                 (throw 'end-flag t)))))))
-(define-key global-map (kbd "C-q") (make-sparse-keymap))
-(define-key global-map (kbd "C-q C-q") #'quoted-insert)
-(define-key global-map (kbd "C-q C-r") #'window-resizer)
-(define-key global-map (kbd "C-q C-l") #'windmove-right)
-(define-key global-map (kbd "C-q C-h") #'windmove-left)
-(define-key global-map (kbd "C-q C-j") #'windmove-down)
-(define-key global-map (kbd "C-q C-k") #'windmove-up)
-
-;; 0バイトになったファイルをファイルシステムから削除
-;;_______________________________________________________________
-(defun delete-file-if-no-contents ()
-  (when (and (buffer-file-name (current-buffer))
-             (= (point-min) (point-max)))
-    (when (y-or-n-p "Delete file and kill buffer?")
-      (delete-file (buffer-file-name (current-buffer)))
-      (kill-buffer (current-buffer)))))
-(add-to-list 'after-save-hook #'delete-file-if-no-contents)
-
-;; コメントアウトして貼り付け
-;;_______________________________________________________________
-(defun copy-and-comment-out (start end)
-  (interactive "r")
-  ;;(save-excursion
-    (kill-ring-save start end)
-    (comment-region start end)
-    (newline)
-    ;;(newline)
-    (yank));)
-(define-key global-map (kbd "C-M-:") #'copy-and-comment-out)
-
-;; scratchバッファの保存とリストア
-;;_______________________________________________________________
-(defun save-scratch-data ()
-  (if (get-buffer "*scratch*")
-      (let* ((str (progn (set-buffer (get-buffer "*scratch*"))
-                         (buffer-substring-no-properties (point-min) (point-max))))
-             (file (concat user-emacs-directory "tmp/scratch-" (system-name)))
-             (buf (or (get-file-buffer (expand-file-name file))
-                      (find-file-noselect file))))
-        (set-buffer buf)
-        (erase-buffer)
-        (insert str)
-        (save-buffer)
-        (kill-buffer buf))))
-
-(defadvice save-buffers-kill-emacs (before save-scratch-buffer activate)
-  (save-scratch-data))
-
-(defun read-scratch-data ()
-  (let ((file (concat user-emacs-directory "tmp/scratch-" (system-name))))
-    (when (file-exists-p file)
-      (set-buffer (get-buffer "*scratch*"))
-      (erase-buffer)
-      (insert-file-contents file))))
-(read-scratch-data)
-
-;; don't kill *scratch*
-(defun unkillable-scratch-buffer ()
-  (if (equal (buffer-name (current-buffer)) "*scratch*")
-      (progn (delete-region (point-min) (point-max)) nil)
-    t))
-(add-hook 'kill-buffer-query-functions #'unkillable-scratch-buffer)
-
-;; URLをw3mかブラウザの選択
-;;_______________________________________________________________
-(defun choose-browser (url &rest args)
-  (interactive "sURL: ")
-  (if (y-or-n-p "Use external browser? ")
-      (browse-url-default-macosx-browser url)
-    (w3m-browse-url url)))
-(setq browse-url-browser-function #'choose-browser)
-
-;;; 折り返し表示ON/OFF
-;;====================================
-(define-key global-map (kbd "C-c TAB")
-  (lambda ()
-    (interactive)
-    (if truncate-lines
-        (setq truncate-lines nil)
-      (setq truncate-lines t))))
-
-;; scratch以外の全てのBufferを削除
-;;====================================
-(defun my-kill-all-buffers ()
-  "scratch bufferを除く全てのバッファをkill"
-  (interactive)
-  (dolist (buf (buffer-list))
-    (if (not (string= "*scratch*" (buffer-name buf)))
-        (kill-buffer buf))))
-
-;; リージョンを選択していないときに行をキルする
-;;====================================
-(defadvice kill-region (around kill-line-or-kill-region activate)
-  (if (and (called-interactively-p 'interactive)
-           transient-mark-mode (not mark-active))
-      (kill-whole-line)
-    ad-do-it))
-
-;; リージョンを選択していないときに行をコピーする
-;;====================================
-(defadvice kill-ring-save (around kill-line-save-or-kill-ring-save activate)
-  (if (and (called-interactively-p 'interactive)
-           transient-mark-mode (not mark-active))
-      (copy-line)
-    ad-do-it))
-
-(defun copy-line (&optional arg)
-  (interactive "p")
-  (copy-region-as-kill
-   (line-beginning-position)
-   (line-beginning-position (1+ (or arg 1))))
-  (message "Line copied"))
-
-;; 所有者がrootだった場合にsudoで開くかを確認する
-;;_______________________________________________________________
-(defun file-root-p (filename)
-  (eq 0 (nth 2 (file-attributes filename))))
-
-(defun th-rename-tramp-buffer ()
-  (when (file-remote-p (buffer-file-name))
-    (rename-buffer
-     (format "%s:%s" (file-remote-p (buffer-file-name) 'method) (buffer-name)))))
-(add-hook 'find-file-hook #'th-rename-tramp-buffer)
-
-(defadvice find-file (around th-find-file activate)
-  (if (and (file-root-p (ad-get-arg 0))
-           (not (file-writable-p (ad-get-arg 0)))
-           (y-or-n-p (concat "File " (ad-get-arg 0) " is read-only.  Open it as root? ")))
-      (th-find-file-sudo (ad-get-arg 0))
-    ad-do-it))
-
-(defun th-find-file-sudo (file)
-  (interactive "F")
-  (set-buffer (find-file (concat "/sudo::" file))))
-
-;; 一時的なファイルを作成する
-;;_______________________________________________________________
-(defun open-junk-file ()
-  (interactive)
-  (let* ((file (expand-file-name
-                (format-time-string "%Y/%m/%Y-%m-%d-%H%M%S." (current-time)) "~/.emacs.d/tmp/junk"))
-         (dir (file-name-directory file)))
-    (make-directory dir t)
-    (find-file-other-window (read-string "Junk Code: " file))))
diff --git a/emacs/emacs.d.symlink/init.el b/emacs/emacs.d.symlink/init.el
index a31ff99..54a2b18 100644
--- a/emacs/emacs.d.symlink/init.el
+++ b/emacs/emacs.d.symlink/init.el
@@ -19,4 +19,4 @@
 (try-load "config/packages")

 ;; 個人用の関数
-(try-load "functions/functions")
+(try-load "config/functions")
diff --git a/emacs/emacs.d.symlink/packages/elisp/docblock/docblock.el b/emacs/emacs.d.symlink/packages/elisp/docblock/docblock.el
index d94d44f..1eb9d88 100644
--- a/emacs/emacs.d.symlink/packages/elisp/docblock/docblock.el
+++ b/emacs/emacs.d.symlink/packages/elisp/docblock/docblock.el
@@ -26,7 +26,8 @@
       (match-string 1 str))))

 (defun docblock/inside-comment-p ()
-  (eq (get-text-property (point) 'face) 'font-lock-comment-face))
+  (and (eq (get-text-property (point) 'face) 'font-lock-comment-face)
+       (string-match "^\\s-*/?\\*" (docblock/current-line-string))))

 (defun docblock/beginning-block-p ()
   (string-match
diff --git a/emacs/emacs.d.symlink/packages/elisp/el-bundler b/emacs/emacs.d.symlink/packages/elisp/el-bundler
index 6327dc8..ee5becd 160000
--- a/emacs/emacs.d.symlink/packages/elisp/el-bundler
+++ b/emacs/emacs.d.symlink/packages/elisp/el-bundler
@@ -1 +1 @@
-Subproject commit 6327dc871a28c58e23eaa731e12fae67ad769846
+Subproject commit ee5becd441093660988d2f3aeffdfaa6dc0b916e
diff --git a/fonts/YanoneKaffeesatzTTF.zip b/fonts/YanoneKaffeesatzTTF.zip
new file mode 100644
index 0000000..212330e
Binary files /dev/null and b/fonts/YanoneKaffeesatzTTF.zip differ
diff --git a/fonts/fonts.symlink/Ricty-Bold.ttf b/fonts/fonts.symlink/Ricty-Bold.ttf
new file mode 100644
index 0000000..c665260
Binary files /dev/null and b/fonts/fonts.symlink/Ricty-Bold.ttf differ
diff --git a/fonts/fonts.symlink/Ricty-Regular.ttf b/fonts/fonts.symlink/Ricty-Regular.ttf
new file mode 100644
index 0000000..cb093e0
Binary files /dev/null and b/fonts/fonts.symlink/Ricty-Regular.ttf differ
diff --git a/fonts/fonts.symlink/RictyDiscord-Bold.ttf b/fonts/fonts.symlink/RictyDiscord-Bold.ttf
new file mode 100644
index 0000000..e6893ed
Binary files /dev/null and b/fonts/fonts.symlink/RictyDiscord-Bold.ttf differ
diff --git a/fonts/fonts.symlink/RictyDiscord-Regular.ttf b/fonts/fonts.symlink/RictyDiscord-Regular.ttf
new file mode 100644
index 0000000..2520b81
Binary files /dev/null and b/fonts/fonts.symlink/RictyDiscord-Regular.ttf differ
diff --git a/fonts/fonts.symlink/m_setofont.ttf b/fonts/fonts.symlink/m_setofont.ttf
new file mode 100644
index 0000000..11f7e0e
Binary files /dev/null and b/fonts/fonts.symlink/m_setofont.ttf differ
diff --git a/fonts/fonts.symlink/seto-gaiji.ttf b/fonts/fonts.symlink/seto-gaiji.ttf
new file mode 100644
index 0000000..d64f320
Binary files /dev/null and b/fonts/fonts.symlink/seto-gaiji.ttf differ
diff --git a/fonts/fonts.symlink/setofont-ex.ttf b/fonts/fonts.symlink/setofont-ex.ttf
new file mode 100644
index 0000000..efb88b7
Binary files /dev/null and b/fonts/fonts.symlink/setofont-ex.ttf differ
diff --git a/fonts/fonts.symlink/setofont.ttf b/fonts/fonts.symlink/setofont.ttf
new file mode 100644
index 0000000..7357ae8
Binary files /dev/null and b/fonts/fonts.symlink/setofont.ttf differ
diff --git a/git/.gitignore b/git/.gitignore
index 09edf7f..e8920ea 100644
--- a/git/.gitignore
+++ b/git/.gitignore
@@ -1,3 +1 @@
-gitconfig.symlink
-
-
+gitconfig.local.symlink
diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
new file mode 100644
index 0000000..d1edb95
--- /dev/null
+++ b/git/gitconfig.symlink
@@ -0,0 +1,64 @@
+[user]
+	name = Daichi Hirata
+	email = bunny.hop.md@gmail.com
+
+[core]
+	excludesfile = ~/.gitignore
+
+[include]
+    path = .gitconfig.local
+
+[push]
+#	default = simple
+
+[pull]
+    rebase = true
+
+[merge]
+    ff = false
+
+[color]
+    diff   = auto
+    status = auto
+    branch = auto
+	ui     = auto
+
+[alias]
+    alias    = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\\t => \\2/' | sort
+    info     = remote show origin
+    co       = checkout
+    d        = diff
+    dc       = diff --cached
+    di       = diff
+    dic      = diff --cached
+    p4diff   = difftool -t p4
+    st       = status -sb
+    wd       = diff --word-diff
+    cancel   = !git commit -a -m 'Temporary commit for cancel' && git reset --hard HEAD~
+    tlog     = log --graph --pretty=oneline --decorate --date=short --abbrev-commit --branches
+	hist     = log --pretty=format:\"%C(yellow)%h %C(White)%ad | %C(White)%s%d %C(Red)[%an]\" --graph --date=short
+    tag-date = for-each-ref --sort=-taggerdate --format='%(authordate) %(refname) %(subject)' refs/tags
+    ignore   = update-index --assume-unchanged
+    unignore = update-index --no-assume-unchanged
+    ignored  = !git ls-files -v | grep "^[a-z]"
+
+[difftool "ediff"]
+    cmd = emacsclient --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\"
+
+[difftool "p4"]
+    cmd = /Applications/p4merge.app/Contents/MacOS/p4merge $LOCAL $REMOTE
+    prompt = false
+
+[difftool]
+	prompt = false
+
+[difftool "sourcetree"]
+	cmd = /Applications/p4merge.app/Contents/MacOS/p4merge \"$LOCAL\" \"$REMOTE\"
+	path =
+
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true
+
+[push]
+	default = tracking
diff --git a/git/gitconfig.symlink.example b/git/gitconfig.symlink.example
deleted file mode 100644
index c083f71..0000000
--- a/git/gitconfig.symlink.example
+++ /dev/null
@@ -1,19 +0,0 @@
-[user]
-	name = Daichi Hirata
-	email = bunny.hop.md@gmail.com
-[github]
-	user = daic-h
-[color]
-    diff = auto
-    status = auto
-    branch = auto
-	ui = auto
-[alias]
-    co = checkout
-    st = status -sb
-    wd = diff --word-diff
-    tlog = log --graph --pretty=oneline --decorate --date=short --abbrev-commit --branches
-[merge]
-	tool = vimdiff
-[core]
-    excludesfile = ~/.gitignore
\ No newline at end of file
diff --git a/tmux/tmux.conf.symlink b/tmux/tmux.conf.symlink
index 178dd0f..f5beec0 100644
--- a/tmux/tmux.conf.symlink
+++ b/tmux/tmux.conf.symlink
@@ -1,17 +1,20 @@
 # Prefix Key
-unbind-key C-b
-set-option -g prefix C-t
+unbind C-b
+set -g prefix C-t

 # Base Setting
-set-option -g base-index 1
-set-option -g default-command "reattach-to-user-namespace -l zsh"
-set-window-option -g mode-keys emacs
+setw -g mode-keys emacs
+setw -g mode-mouse on
+set -g base-index 1
+set -g default-command "reattach-to-user-namespace -l zsh"
+set -g history-limit 10000
+set -g terminal-overrides 'xterm*:smcup@:rmcup@'

 # Reload
 bind r source-file ~/.tmux.conf; display-message "Reload Config!!"

 # Key bind
-bind-key C-t last-window
+bind C-t last-window
 bind H resize-pane -L 5
 bind J resize-pane -D 5
 bind K resize-pane -U 5
@@ -25,7 +28,8 @@ bind C-l select-pane -R
 bind h previous-window
 bind l next-window
 bind n new-window
-bind q break-pane -d
+# bind q break-pane -d
+
 bind s split-window -v
 bind C-s split-window -v
 bind v split-window -h
@@ -43,31 +47,31 @@ set -g status-right '#[fg=red]#(uptime | cut -f 4-5 -d " " | cut -f 1 -d ",") #[
 set -g default-terminal "screen-256color"

 # default statusbar colors
-set-option -g status-bg colour235 #base02
-set-option -g status-fg colour136 #yellow
-set-option -g status-attr default
+set -g status-bg colour235 #base02
+set -g status-fg colour136 #yellow
+set -g status-attr default

 # default window title colors
-set-window-option -g window-status-fg colour244 #base0
-set-window-option -g window-status-bg default
-#set-window-option -g window-status-attr dim
+setw -g window-status-fg colour244 #base0
+setw -g window-status-bg default
+#setw -g window-status-attr dim

 # active window title colors
-set-window-option -g window-status-current-fg colour166 #orange
-set-window-option -g window-status-current-bg default
-#set-window-option -g window-status-current-attr bright
+setw -g window-status-current-fg colour166 #orange
+setw -g window-status-current-bg default
+#setw -g window-status-current-attr bright

 # pane border
-set-option -g pane-border-fg colour235 #base02
-set-option -g pane-active-border-fg colour240 #base01
+set -g pane-border-fg colour235 #base02
+set -g pane-active-border-fg colour240 #base01

 # message text
-set-option -g message-bg colour235 #base02
-set-option -g message-fg colour166 #orange
+set -g message-bg colour235 #base02
+set -g message-fg colour166 #orange

 # pane number display
-set-option -g display-panes-active-colour colour33 #blue
-set-option -g display-panes-colour colour166 #orange
+set -g display-panes-active-colour colour33 #blue
+set -g display-panes-colour colour166 #orange

 # clock
-set-window-option -g clock-mode-colour colour64 #green
+setw -g clock-mode-colour colour64 #green
diff --git a/zsh/conf/aliases.zsh b/zsh/conf/aliases.zsh
index 7003b66..3a12ab1 100644
--- a/zsh/conf/aliases.zsh
+++ b/zsh/conf/aliases.zsh
@@ -5,7 +5,7 @@ alias _='sudo'
 alias please='sudo'

 # Show history
-alias history='fc -l 1'
+# alias history='fc -l 1'

 # List direcory contents
 alias ls='ls -GF'
diff --git a/zsh/lib/python/pythonbrew.zsh b/zsh/lib/python/pythonbrew.zsh
new file mode 100644
index 0000000..4bb1bbe
--- /dev/null
+++ b/zsh/lib/python/pythonbrew.zsh
@@ -0,0 +1 @@
+[[ -s "$HOME/.pythonbrew/etc/bashrc" ]] && source $HOME/.pythonbrew/etc/bashrc
zshの設定を変更