X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=48a9e4755ff15e3787915bedbfc31384698310d5;hb=HEAD;hp=11588d5426b272779cac5d23615e262787325e0f;hpb=1d190f93f957f140e7d1469f70b7e4bab925c8b2;p=sugar.git diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el index 11588d5..48a9e47 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) @@ -181,6 +174,11 @@ ;; jaspace (require-if-present 'jaspace) +;; json +(require-if-present 'json-par) +(if (featurep 'json-par) + (add-hook 'json-mode-hook #'json-par-mode)) + ;; pkgdiff (add-to-list 'load-path "~/sandbox/_editors/emacs-pkgdiff") (autoload 'pkgvi "pkgdiff" "Edit a copy of specified file." t) @@ -338,8 +336,7 @@ Will prompt you shell name when you type `C-u' before this command." t) (autoload 'cleite "cleite" "Cleite RSS Aggregator -- Emacs Interface" t) ;; javascript -(add-to-list 'auto-mode-alist '("\\.js$" . javascript-mode)) -(add-to-list 'auto-mode-alist '("\\.json$" . javascript-mode)) +(add-to-list 'auto-mode-alist '("\\.js\\'" . javascript-mode)) ;; typescript (autoload 'typescript-mode "typescript-mode" @@ -577,9 +574,11 @@ Will prompt you shell name when you type `C-u' before this command." t) '(appt-message-warning-time 20) '(browse-url-browser-function (quote browse-url-firefox)) '(canlock-password "a14fa4d2601465d55585c291fa8b3943e189e716") + '(cl-old-struct-compat-mode t) '(clean-buffer-list-delay-general 7) '(cleite:auto-refresh-interval nil) '(cleite:measure-srpc-call-time t) + '(column-number-mode t) '(compilation-scroll-output (quote first-error)) '(completion-ignored-extensions (quote @@ -598,6 +597,7 @@ Will prompt you shell name when you type `C-u' before this command." t) (height . 25) (right-fringe) (left-fringe)))) + '(display-time-mode t) '(ditz-find-issue-directory-automatically-flag t) '(ecb-add-path-for-not-matching-files (quote (t))) '(ecb-help-info-path "/usr/pkg/info/ecb.info") @@ -609,6 +609,7 @@ Will prompt you shell name when you type `C-u' before this command." t) '(ecb-windows-width 0.2) '(electric-indent-mode nil) '(elscreen-display-tab t) + '(global-undo-tree-mode t) '(global-whitespace-mode t) '(graphviz-dot-auto-indent-on-newline nil) '(graphviz-dot-auto-indent-on-semi nil) @@ -618,6 +619,7 @@ Will prompt you shell name when you type `C-u' before this command." t) '(ido-ignore-files (quote ("\\`CVS/" "\\`#" "\\`.#" "\\`\\.\\./" "\\`\\./" "\\.ttc"))) + '(ido-mode (quote both) nil (ido)) '(ido-work-directory-list-ignore-regexps (quote ("^\\(/mnt/ibm/\\|/Volumes/IBM80GB/\\)"))) '(indent-tabs-mode nil) '(ispell-dictionary "english") @@ -635,8 +637,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) @@ -721,7 +722,8 @@ Will prompt you shell name when you type `C-u' before this command." t) ("melpa" . "https://melpa.org/packages/")))) '(package-selected-packages (quote - (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))) + (json-par nim-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))) + '(projectile-mode t nil (projectile)) '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil)))) '(riece-layout "default") '(riece-layout-alist @@ -743,6 +745,7 @@ Will prompt you shell name when you type `C-u' before this command." t) '(safe-local-variable-values (quote ((todo-categories "Todo" "Todo" "Todo" "Todo")))) '(select-enable-clipboard t) '(session-use-package t nil (session)) + '(skk-background-mode (quote light)) '(tramp-auto-save-directory "/tmp/tramp-auto-save") '(tramp-completion-reread-directory-timeout 2) '(tramp-default-host "localhost") @@ -765,6 +768,7 @@ Will prompt you shell name when you type `C-u' before this command." t) '(w3m-output-coding-system (quote utf-8)) '(w3m-terminal-coding-system (quote utf-8)) '(w3m-use-cookies t) + '(which-function-mode t) '(whitespace-global-modes (quote (not mew-draft-mode mew-summary-mode))) '(whitespace-style (quote @@ -779,7 +783,10 @@ 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-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)))) + '(mode-line ((t (:background "grey75" :foreground "black" :box (:line-width -1 :style released-button))))) '(navi2ch-bm-new-unread-face ((t (:foreground "PaleGreen" :weight bold)))) '(navi2ch-bm-updated-cache-face ((t (:foreground "CornflowerBlue" :weight bold)))) '(navi2ch-bm-updated-unread-face ((t (:foreground "DarkSeaGreen3" :weight bold))))