X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=c54ee01c3143c148a072ce9f16d2a2a05ca656b0;hb=36196fa73573a5839436535a219031b2da14d601;hp=712bf7a20861f2129076175ec52d84c3e511cfd5;hpb=91dd08629219b1218d9d8f1449d5bdd557eaf0f5;p=sugar.git

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 712bf7a..c54ee01 100644
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -109,21 +109,14 @@
 ;; Setting for Frames ----------------------------------------------------------
 (when window-system
   (let ((host (system-name)))
-    (cond ((equal host "seras")
-           (set-frame-font "Dejavu Sans Mono 11" t))
+    (cond ((equal host "kurumi.cielonegro.org")
+           (set-frame-font "Andale Mono 14"))
 
-          ((equal host "yukari.cielonegro.org")
+          ((equal host "seras")
            (set-frame-font "Dejavu Sans Mono 11" t))
 
-          ((equal host "aria.cielonegro.org")
-           (progn
-             (set-frame-font "Dejavu Sans Mono 13" t)
-             ;; Emacs 24.4.1 somehow gets very slow when the following
-             ;; lines are uncommented.
-             ;;(set-fontset-font nil 'japanese-jisx0208 "さざなみゴシック")
-             ;;(set-fontset-font nil 'japanese-jisx0212 "さざなみゴシック")
-             ;;(set-fontset-font nil 'katakana-jisx0201 "さざなみゴシック")
-             )))))
+          ((equal host "yukari.cielonegro.org")
+           (set-frame-font "Dejavu Sans Mono 11" t)))))
 
 ;; Setting for Packages --------------------------------------------------------
 (defun require-if-present (feature)
@@ -206,13 +199,6 @@
 ;; midnight
 (require-if-present 'midnight)
 
-;; color-theme
-(require-if-present 'color-theme)
-(if (featurep 'color-theme)
-    (progn
-      (color-theme-initialize)
-      (color-theme-subtle-hacker)))
-
 ;; multi-term
 (autoload 'multi-term "multi-term"
   "Create new term buffer.
@@ -467,8 +453,8 @@ Will prompt you shell name when you type `C-u' before this command." t)
 (autoload 'navi2ch "navi2ch" "Navigator for 2ch for Emacs" t)
 
 ;; migemo
-(require-if-present 'migemo)
-(setq migemo-isearch-enable-p nil)
+;(require-if-present 'migemo)
+;(setq migemo-isearch-enable-p nil)
 
 ;; tiarra-conf
 (setq load-path (cons (expand-file-name "~/sandbox/Tiarra") load-path))
@@ -593,6 +579,10 @@ Will prompt you shell name when you type `C-u' before this command." t)
     (".svn/" "CVS/" ".o" "~" ".bin" ".lbin" ".so" ".a" ".ln" ".blg" ".bbl" ".elc" ".lof" ".glo" ".idx" ".lot" ".dvi" ".fmt" ".tfm" ".pdf" ".class" ".fas" ".lib" ".mem" ".x86f" ".sparcf" ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl" ".lo" ".la" ".gmo" ".mo" ".toc" ".aux" ".cp" ".fn" ".ky" ".pg" ".tp" ".vr" ".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs" ".pyc" ".pyo" ".hi")))
  '(cperl-merge-trailing-else nil)
  '(csv-align-style (quote auto))
+ '(custom-enabled-themes (quote (gnome2)))
+ '(custom-safe-themes
+   (quote
+    ("64affc3597b4271ba6b0b428777d616cfb20d8f7f147dbd00f1de220b2b59bbf" "06e0662b31a2ae8da5c6b5e9a05b25fabd1dc8dd3c3661ac194201131cafb080" default)))
  '(default-frame-alist
     (quote
      ((tool-bar-lines . 0)
@@ -638,8 +628,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(markdown-live-preview-delete-export (quote delete-on-export))
  '(mediawiki-site-alist
    (quote
-    (("Wikipedia" "http://en.wikipedia.org/w/" "username" "password" "Main Page")
-     ("YmirDev" "https://ymirlink:santamo@update.forcast.jp/fcdiv/mwiki/" "PHO" "" "メインページ"))))
+    (("Wikipedia" "http://en.wikipedia.org/w/" "username" "password" "Main Page"))))
  '(mew-field-spec
    (quote
     (("^Resent-\\(From\\|To\\|Cc\\|Date\\)" t mew-face-header-important mew-face-header-important)
@@ -724,7 +713,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
      ("melpa" . "https://melpa.org/packages/"))))
  '(package-selected-packages
    (quote
-    (elscreen elscreen-multi-term projectile elixir-mode flycheck-haskell flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
+    (elscreen-fr color-theme-modern elscreen elscreen-multi-term projectile elixir-mode flycheck-haskell flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode)))
  '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil))))
  '(riece-layout "default")
  '(riece-layout-alist
@@ -782,7 +771,8 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(diff-added ((t (:inherit diff-changed :foreground "medium spring green" :weight extra-bold))))
  '(diff-removed ((t (:foreground "gold3" :weight extra-bold))))
  '(flyspell-incorrect ((t (:foreground "OrangeRed" :overline t))))
- '(font-lock-function-name-face ((t (:foreground "sky blue" :weight bold))))
+ '(font-lock-comment-face ((t (:foreground "white smoke"))))
+ '(font-lock-keyword-face ((t (:foreground "salmon"))))
  '(jaspace-highlight-tab-face ((((class color) (background dark)) (:foreground "gray70" :underline t))))
  '(navi2ch-bm-new-unread-face ((t (:foreground "PaleGreen" :weight bold))))
  '(navi2ch-bm-updated-cache-face ((t (:foreground "CornflowerBlue" :weight bold))))