Adding color theme work
This commit is contained in:
parent
a491ef2093
commit
3af6307831
5 changed files with 1809 additions and 28 deletions
|
|
@ -51,12 +51,6 @@
|
||||||
'(which-func-mode-global t nil (which-func))
|
'(which-func-mode-global t nil (which-func))
|
||||||
'(widget-editable-list-gui t)
|
'(widget-editable-list-gui t)
|
||||||
'(x-stretch-cursor nil))
|
'(x-stretch-cursor nil))
|
||||||
(custom-set-faces
|
|
||||||
;; custom-set-faces was added by Custom.
|
|
||||||
;; If you edit it by hand, you could mess it up, so be careful.
|
|
||||||
;; Your init file should contain only one such instance.
|
|
||||||
;; If there is more than one, they won't work right.
|
|
||||||
)
|
|
||||||
|
|
||||||
;; add private lisp directory to load-path.
|
;; add private lisp directory to load-path.
|
||||||
(add-to-list 'load-path "~/site-lisp")
|
(add-to-list 'load-path "~/site-lisp")
|
||||||
|
|
@ -102,22 +96,9 @@
|
||||||
(if (fboundp 'tool-bar-mode) (tool-bar-mode -1))
|
(if (fboundp 'tool-bar-mode) (tool-bar-mode -1))
|
||||||
(if (fboundp 'menu-bar-mode) (menu-bar-mode -1))
|
(if (fboundp 'menu-bar-mode) (menu-bar-mode -1))
|
||||||
|
|
||||||
;; Here are some font strings that I have used in the past.
|
;; Consolas.
|
||||||
;; Courier New:
|
;;
|
||||||
;;(setq my-font-choice "-*-Courier New-normal-r-*-*-12-90-*-*-c-*-*-ansi-")
|
(setq my-font-choice "Consolas-11")
|
||||||
;; More Courier: (This is a bit big)
|
|
||||||
;;(setq my-font-choice "-outline-Courier New-normal-r-normal-normal-13-97-96-96-c-*-iso10646-1")
|
|
||||||
;; Lucida Console:
|
|
||||||
;;(setq my-font-choice "-outline-Lucida Console-normal-r-normal-normal-13-90-96-96-c-*-iso8859-15")
|
|
||||||
;; Bitstream Vera Sans Mono:
|
|
||||||
;;(setq my-font-choice "-outline-Bitstream Vera Sans Mono-normal-r-normal-normal-12-90-96-96-c-*-iso10646-1")
|
|
||||||
;; Bitstream Vera Sans Mono 12pt:
|
|
||||||
;;(setq my-font-choice "-outline-Bitstream Vera Sans Mono-normal-r-normal-normal-13-97-96-96-c-*-iso10646-1")
|
|
||||||
;; Consolas (Vista font!):
|
|
||||||
(setq my-font-choice "-*-Consolas-normal-r-normal-normal-14-90-96-96-m-*-iso10646-1")
|
|
||||||
;; Bigger consolas
|
|
||||||
;;(setq my-font-choice "-*-Consolas-normal-r-normal-normal-19-142-96-96-c-*-iso8859-1")
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
;; To obtain new font string, execute eval-expression, and eval this:
|
;; To obtain new font string, execute eval-expression, and eval this:
|
||||||
;;(insert(prin1-to-string(w32-select-font)))
|
;;(insert(prin1-to-string(w32-select-font)))
|
||||||
|
|
@ -132,9 +113,6 @@
|
||||||
;; looks like.
|
;; looks like.
|
||||||
(setq default-frame-alist
|
(setq default-frame-alist
|
||||||
`((font . ,my-font-choice)
|
`((font . ,my-font-choice)
|
||||||
(foreground-color . "Black")
|
|
||||||
(background-color . "White")
|
|
||||||
(cursor-color . "Black")
|
|
||||||
(width . 91)
|
(width . 91)
|
||||||
(height . ,jd-frame-height)
|
(height . ,jd-frame-height)
|
||||||
,@default-frame-alist))
|
,@default-frame-alist))
|
||||||
|
|
@ -142,18 +120,22 @@
|
||||||
;; initial-frame-alist controls what the first frame looks like.
|
;; initial-frame-alist controls what the first frame looks like.
|
||||||
(setq initial-frame-alist
|
(setq initial-frame-alist
|
||||||
`((font . ,my-font-choice)
|
`((font . ,my-font-choice)
|
||||||
(foreground-color . "Black")
|
|
||||||
(background-color . "White")
|
|
||||||
(cursor-color . "Black")
|
|
||||||
(width . 91)
|
(width . 91)
|
||||||
(height . ,jd-frame-height)))
|
(height . ,jd-frame-height)))
|
||||||
|
|
||||||
;; This is just here for playing with things.
|
;; This is just here for playing with things.
|
||||||
;;(set-frame-font my-font-choice)
|
;;(set-frame-font my-font-choice)
|
||||||
|
|
||||||
|
;; COLORZ!
|
||||||
|
;;
|
||||||
|
(require 'color-theme)
|
||||||
|
(require 'color-theme-solarized)
|
||||||
|
(color-theme-solarized-light)
|
||||||
|
|
||||||
;; Modeline format:
|
;; Modeline format:
|
||||||
(display-time-mode -1)
|
(display-time-mode -1)
|
||||||
|
|
||||||
|
;; Um, I don't know why this is *here*, but it has to be somewhere.
|
||||||
(require 'ido)
|
(require 'ido)
|
||||||
|
|
||||||
;; =================================================================
|
;; =================================================================
|
||||||
|
|
|
||||||
131
site-lisp/color-theme-solarized.el
Normal file
131
site-lisp/color-theme-solarized.el
Normal file
|
|
@ -0,0 +1,131 @@
|
||||||
|
;;; Author: Ethan Schoonover, Solarized; Greg Pfeil, Emacs adaptation
|
||||||
|
;;; URL: http://ethanschoonover.com/solarized
|
||||||
|
|
||||||
|
;;; This file is not (YET) part of GNU Emacs.
|
||||||
|
|
||||||
|
;;; # Usage
|
||||||
|
|
||||||
|
;;; 1. Install the color-theme package
|
||||||
|
;;; (http://www.emacswiki.org/cgi-bin/wiki/ColorTheme)
|
||||||
|
;;; 2. Load this file
|
||||||
|
;;; 3. M-x color-theme-solarized-[dark|light]
|
||||||
|
|
||||||
|
(eval-when-compile
|
||||||
|
(require 'color-theme))
|
||||||
|
|
||||||
|
(defun color-theme-solarized (mode)
|
||||||
|
"Color theme by Ethan Schoonover, created 2011-03-24.
|
||||||
|
Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized."
|
||||||
|
(interactive "Slight or dark? ")
|
||||||
|
(let ((base03 "#002b36")
|
||||||
|
(base02 "#073642")
|
||||||
|
(base01 "#586e75")
|
||||||
|
(base00 "#657b83")
|
||||||
|
(base0 "#839496")
|
||||||
|
(base1 "#93a1a1")
|
||||||
|
(base2 "#eee8d5")
|
||||||
|
(base3 "#fdf6e3")
|
||||||
|
(yellow "#b58900")
|
||||||
|
(orange "#cb4b16")
|
||||||
|
(red "#dc322f")
|
||||||
|
(magenta "#d33682")
|
||||||
|
(violet "#6c71c4")
|
||||||
|
(blue "#268bd2")
|
||||||
|
(cyan "#2aa198")
|
||||||
|
(green "#859900"))
|
||||||
|
(when (eq 'light mode)
|
||||||
|
(rotatef base03 base3)
|
||||||
|
(rotatef base02 base2)
|
||||||
|
(rotatef base01 base1)
|
||||||
|
(rotatef base00 base0))
|
||||||
|
(color-theme-install
|
||||||
|
`(color-theme-solarized
|
||||||
|
((foreground-color . ,base0)
|
||||||
|
(background-color . ,base03)
|
||||||
|
(background-mode . ,mode)
|
||||||
|
(cursor-color . ,base0))
|
||||||
|
;; basic
|
||||||
|
(default ((t (:foreground ,base0))))
|
||||||
|
(cursor ((t (:foreground ,base0 :background ,base03 :inverse-video t))))
|
||||||
|
(escape-glyph-face ((t (:foreground ,red))))
|
||||||
|
(fringe ((t (:foreground ,base01 :background ,base02))))
|
||||||
|
(header-line ((t (:foreground ,base0 :background ,base2))))
|
||||||
|
(highlight ((t (:background ,base02))))
|
||||||
|
(isearch ((t (:foreground ,yellow :inverse-video t))))
|
||||||
|
(menu ((t (:foreground ,base0 :background ,base02))))
|
||||||
|
(minibuffer-prompt ((t (:foreground ,blue))))
|
||||||
|
(mode-line
|
||||||
|
((t (:foreground ,base1 :background ,base02
|
||||||
|
:box (:line-width 1 :color ,base1)))))
|
||||||
|
(mode-line-buffer-id ((t (:foreground ,base1))))
|
||||||
|
(mode-line-inactive
|
||||||
|
((t (:foreground ,base0 :background ,base02
|
||||||
|
:box (:line-width 1 :color ,base02)))))
|
||||||
|
(region ((t (:background ,base02))))
|
||||||
|
(secondary-selection ((t (:background ,base02))))
|
||||||
|
(trailing-whitespace ((t (:foreground ,red :inverse-video t))))
|
||||||
|
(vertical-border ((t (:foreground ,base0))))
|
||||||
|
;; compilation
|
||||||
|
(compilation-info ((t (:forground ,green :bold t))))
|
||||||
|
(compilation-warning ((t (:foreground ,orange :bold t))))
|
||||||
|
;; customize
|
||||||
|
(custom-button
|
||||||
|
((t (:background ,base02 :box (:line-width 2 :style released-button)))))
|
||||||
|
(custom-button-mouse ((t (:inherit custom-button :foreground ,base1))))
|
||||||
|
(custom-button-pressed
|
||||||
|
((t (:inherit custom-button-mouse
|
||||||
|
:box (:line-width 2 :style pressed-button)))))
|
||||||
|
(custom-comment-tag ((t (:background ,base02))))
|
||||||
|
(custom-comment-tag ((t (:background ,base02))))
|
||||||
|
(custom-documentation ((t (:inherit default))))
|
||||||
|
(custom-group-tag ((t (:foreground ,orange :bold t))))
|
||||||
|
(custom-link ((t (:foreground ,violet))))
|
||||||
|
(custom-state ((t (:foreground ,green))))
|
||||||
|
(custom-variable-tag ((t (:foreground ,orange :bold t))))
|
||||||
|
;; diff
|
||||||
|
(diff-added ((t (:foreground ,green :inverse-video t))))
|
||||||
|
(diff-changed ((t (:foreground ,yellow :inverse-video t))))
|
||||||
|
(diff-removed ((t (:foreground ,red :inverse-video t))))
|
||||||
|
;; emacs-wiki
|
||||||
|
(emacs-wiki-bad-link-face ((t (:foreground ,red :underline t))))
|
||||||
|
(emacs-wiki-link-face ((t (:foreground ,blue :underline t))))
|
||||||
|
(emacs-wiki-verbatim-face ((t (:foreground ,base00 :underline t))))
|
||||||
|
;; font-lock
|
||||||
|
(font-lock-builtin-face ((t (:foreground ,green))))
|
||||||
|
(font-lock-comment-face ((t (:foreground ,base01 :italic t))))
|
||||||
|
(font-lock-constant-face ((t (:foreground ,cyan))))
|
||||||
|
(font-lock-function-name-face ((t (:foreground ,blue))))
|
||||||
|
(font-lock-keyword-face ((t (:foreground ,green))))
|
||||||
|
(font-lock-string-face ((t (:foreground ,cyan))))
|
||||||
|
(font-lock-type-face ((t (:foreground ,yellow))))
|
||||||
|
(font-lock-variable-name-face ((t (:foreground ,blue))))
|
||||||
|
(font-lock-warning-face ((t (:foreground ,red :bold t))))
|
||||||
|
;; info
|
||||||
|
(info-xref ((t (:foreground ,blue :underline t))))
|
||||||
|
(info-xref-visited ((t (:inherit info-xref :foreground ,magenta))))
|
||||||
|
;; org
|
||||||
|
(org-hide ((t (:foreground ,base03))))
|
||||||
|
(org-todo ((t (:foreground ,red :bold t))))
|
||||||
|
(org-done ((t (:foreground ,green :bold t))))
|
||||||
|
;; show-paren
|
||||||
|
(show-paren-match-face ((t (:background ,cyan :foreground ,base3))))
|
||||||
|
(show-paren-mismatch-face ((t (:background ,red :foreground ,base3))))))))
|
||||||
|
|
||||||
|
(defun color-theme-solarized-dark ()
|
||||||
|
(interactive)
|
||||||
|
(color-theme-solarized 'dark))
|
||||||
|
|
||||||
|
(defun color-theme-solarized-light ()
|
||||||
|
(interactive)
|
||||||
|
(color-theme-solarized 'light))
|
||||||
|
|
||||||
|
(add-to-list 'color-themes
|
||||||
|
'(color-theme-solarized-light
|
||||||
|
"Solarized Light"
|
||||||
|
"Ethan Schoonover & Greg Pfeil <greg@technomadic.org>"))
|
||||||
|
(add-to-list 'color-themes
|
||||||
|
'(color-theme-solarized-dark
|
||||||
|
"Solarized Dark"
|
||||||
|
"Ethan Schoonover & Greg Pfeil <greg@technomadic.org>"))
|
||||||
|
|
||||||
|
(provide 'color-theme-solarized)
|
||||||
BIN
site-lisp/color-theme-solarized.elc
Normal file
BIN
site-lisp/color-theme-solarized.elc
Normal file
Binary file not shown.
1668
site-lisp/color-theme.el
Normal file
1668
site-lisp/color-theme.el
Normal file
File diff suppressed because it is too large
Load diff
BIN
site-lisp/color-theme.elc
Normal file
BIN
site-lisp/color-theme.elc
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue