From 3cc58d0ed1ef86a25c188d6cfce39495e2da141f Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Mon, 1 Mar 2010 01:56:22 -0800 Subject: [PATCH] Fixed irblack for emacs, and updating stuff --- .emacs | 37 +++++++++++++++---- .emacs.d/irblack.el | 88 ++++++++++++++++++++++++--------------------- 2 files changed, 79 insertions(+), 46 deletions(-) diff --git a/.emacs b/.emacs index 8ee8407..57335b5 100644 --- a/.emacs +++ b/.emacs @@ -9,6 +9,8 @@ (require-all '( ido + uniquify + saveplace color-theme gentooish irblack @@ -24,6 +26,10 @@ ; (color-theme-gentooish) (color-theme-dark-laptop)) (color-theme-irblack) +;(load-file "~/.emacs.d/color-theme-twilight.el") +;(color-theme-twilight) +;(load-file "~/.emacs.d/color-theme-inkpot.el") +;(color-theme-inkpot) (bar-cursor-mode 1) (menu-bar-mode 0) @@ -38,6 +44,8 @@ (display-battery-mode t) (setq display-time-24hr-format t) (display-time-mode t) +(line-number-mode 1) +(column-number-mode 1) (tooltip-mode nil) (setq midnight-mode t) @@ -47,6 +55,14 @@ (mouse-avoidance-mode 'animate) (ido-mode t) +;; Ido and uniquify options from http://curiousprogrammer.wordpress.com/2009/07/13/my-emacs-defaults/ +(setq ido-enable-flex-matching t) +(setq ido-create-new-buffer 'always) +(setq uniquify-buffer-name-style 'reverse) +(setq uniquify-separator "|") +(setq uniquify-after-kill-buffer-p t) +(setq uniquify-ignore-buffers-re "^\\*") + (global-set-key "\C-m" 'reindent-then-newline-and-indent) ;No tabs (global-set-key "\C-a" 'beginning-of-line-text) @@ -62,13 +78,16 @@ (global-set-key [C-tab] 'indent-according-to-mode) ;; Proxy for ssh tunnel + privoxy -(setq url-proxy-services '(("no_proxy" . "localhost") - ("http" . "localhost:8118"))) +;; (setq url-proxy-services '(("no_proxy" . "localhost") +;; ("http" . "localhost:8118"))) -(setq save-place-file "~/.emacs.d/saveplace") ;; keep my ~/ clean (setq-default save-place t) ;; activate it for all buffers -(require 'saveplace) ;; get the package +(setq save-place-file "~/.emacs.d/saveplace") ;; keep my ~/ clean +(setq backup-directory-alist + `((".*" . "~/.emacs.d/backups/"))) +(setq auto-save-file-name-transforms + `((".*" "~/.emacs.d/backups/" t))) ;; Enable ergoemacs layout ;; (setenv "ERGOEMACS_KEYBOARD_LAYOUT" "dv") ; US Dvorak layout @@ -275,6 +294,7 @@ '(case-fold-search t) '(comint-scroll-to-bottom-on-input t) '(fancy-splash-image "") + '(frame-background-mode (quote dark)) '(global-linum-mode t) '(ido-decorations (quote ("" "" " | " " | ..." "[" "]" " [No match]" " [Matched]" " [Not readable]" " [Too big]" " [Confirm]"))) '(ido-everywhere t) @@ -292,8 +312,7 @@ '(scroll-margin 4) '(scroll-step 1) '(scroll-up-aggressively 0.0) - '(show-paren-mode t nil (paren)) - ) + '(show-paren-mode t nil (paren))) ;;; This was installed by package-install.el. @@ -306,3 +325,9 @@ (expand-file-name "~/.emacs.d/elpa/package.el")) (package-initialize) (require 'starter-kit-elpa)) +(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. + ) diff --git a/.emacs.d/irblack.el b/.emacs.d/irblack.el index 9f29e95..949667e 100644 --- a/.emacs.d/irblack.el +++ b/.emacs.d/irblack.el @@ -8,6 +8,14 @@ ;; (require 'color-theme) +;; White #EEEEEE #FFFFFF +;; Black #4E4E4E #7C7C7C ? / dim gray +;; Blue #96CBFE #FFFFCB slate blue +;; Green #A8FF60 #CEFFAB DarkOliveGreen2 +;; Cyan #C6C5FE #DFDFFE steel blue +;; Red #FF6C60 #FFB6B0 +;; Magenta #FF73FD #FF9CFE +;; Yellow #FFFFB6 #FFFFCB pale goldenrod (defun color-theme-irblack () "IR_black theme taken from Vim" @@ -16,42 +24,41 @@ '(color-theme-irblack (;; (background-color . "#000000") ;; (background-mode . dark) - (border-color . "#454545") - (cursor-color . "#A8FF60") + (border-color . "gray10") + (cursor-color . "DarkOliveGreen2") (foreground-color . "#F6F3E8") - (mouse-color . "#A8FF60")) + (mouse-color . "DarkOliveGreen2")) (default ((t (:foreground "#F6F3E8")))) - (vertical-border ((t (:background "#666666")))) + (vertical-border ((t (:background "gray20")))) (blue ((t (:foreground "blue")))) (border-glyph ((t (nil)))) (buffers-tab ((t (:background "#141414" :foreground "#cacaca")))) - (font-lock-comment-face ((t (:foreground "#7C7C7C")))) + (font-lock-comment-face ((t (:foreground "dim gray")))) (font-lock-constant-face ((t (:foreground "#99CC99")))) - (font-lock-doc-string-face ((t (:foreground "#A8FF60")))) - (font-lock-function-name-face ((t (:foreground "#FFD2A7")))) - (font-lock-builtin-face ((t (:foreground "#96CBFE")))) - (font-lock-keyword-face ((t (:foreground "#96CBFE")))) - (font-lock-preprocessor-face ((t (:foreground "#96CBFE")))) - (font-lock-reference-face ((t (:foreground "#C6C5FE")))) + (font-lock-doc-string-face ((t (:foreground "DarkOliveGreen2")))) + (font-lock-function-name-face ((t (:foreground "burlywood")))) + (font-lock-builtin-face ((t (:foreground "slate blue")))) + (font-lock-keyword-face ((t (:foreground "slate blue")))) + (font-lock-preprocessor-face ((t (:foreground "slate blue")))) + (font-lock-reference-face ((t (:foreground "steel blue")))) (font-lock-regexp-grouping-backslash ((t (:foreground "#E9C062")))) (font-lock-regexp-grouping-construct ((t (:foreground "red")))) - (linum ((t (:background "#000000" :foreground "#666666")))) + (linum ((t (:background "black" :foreground "dim gray")))) (minibuffer-prompt ((t (:foreground "#888888")))) (ido-subdir ((t (:foreground "#CF6A4C")))) (ido-first-match ((t (:foreground "#8F9D6A")))) (ido-only-match ((t (:foreground "#8F9D6A")))) - (mumamo-background-chunk-submode ((t (:background "#222222")))) - (font-lock-string-face ((t (:foreground "#A8FF60")))) - (font-lock-type-face ((t (:foreground "#FFFFB6")))) - (font-lock-variable-name-face ((t (:foreground "#C6C5FE")))) + (font-lock-string-face ((t (:foreground "DarkOliveGreen2")))) + (font-lock-type-face ((t (:foreground "pale goldenrod")))) + (font-lock-variable-name-face ((t (:foreground "steel blue")))) (font-lock-warning-face ((t (:background "#CC1503" :foreground "#FFFFFF")))) (gui-element ((t (:background "#D4D0C8" :foreground "black")))) - (region ((t (:background "#660000")))) - (mode-line ((t (:background "grey75" :foreground "black")))) + (region ((t (:background "dark red")))) + (mode-line ((t (:background "dim gray" :foreground "dark gray")))) (highlight ((t (:background "#111111")))) (highline-face ((t (:background "SeaGreen")))) (left-margin ((t (nil)))) @@ -61,11 +68,12 @@ (underline ((nil (:underline nil)))) ;; mumamo - (mumamo-background-chunk-major ((t (:background "#000000")))) - (mumamo-background-chunk-submode1 ((t (:background "#0A0A0A")))) - (mumamo-background-chunk-submode2 ((t (:background "#0A0A0A")))) - (mumamo-background-chunk-submode3 ((t (:background "#0A0A0A")))) - (mumamo-background-chunk-submode4 ((t (:background "#0A0A0A")))) + ;(mumamo-background-chunk-major ((t (:background "#000000")))) + ;(mumamo-background-chunk-submode ((t (:background "#222222")))) + ;(mumamo-background-chunk-submode1 ((t (:background "#0A0A0A")))) + ;(mumamo-background-chunk-submode2 ((t (:background "#0A0A0A")))) + ;(mumamo-background-chunk-submode3 ((t (:background "#0A0A0A")))) + ;(mumamo-background-chunk-submode4 ((t (:background "#0A0A0A")))) ;; diff-mode (diff-added ((t (:background "#253B22" :foreground "#F8F8F8")))) @@ -75,25 +83,25 @@ ;; nxml - (nxml-delimiter ((t (:foreground "#96CBFE")))) - (nxml-name ((t (:foreground "#96CBFE")))) - (nxml-element-local-name ((t (:foreground "#96CBFE")))) - (nxml-attribute-local-name ((t (:foreground "#FFD7B1")))) + ;(nxml-delimiter ((t (:foreground "#96CBFE")))) + ;(nxml-name ((t (:foreground "#96CBFE")))) + ;(nxml-element-local-name ((t (:foreground "#96CBFE")))) + ;(nxml-attribute-local-name ((t (:foreground "#FFD7B1")))) ;; erc - (erc-default-face ((t (nil)))) - (erc-direct-msg-face ((t (:foreground "#007998")))) - (erc-input-face ((t (:foreground "#feffff")))) - (erc-bold-face ((t (:bold t :weight bold)))) - (erc-inverse-face ((t (:background "Black" :foreground "White")))) - (erc-underline-face ((t (:underline t)))) - (erc-prompt-face ((t (:foreground "#c3c6c8")))) - (erc-notice-face ((t (:foreground "#7c7c7c")))) - (erc-action-face ((t (:bold t :weight bold)))) - (erc-error-face ((t (:foreground "#007998")))) - (erc-timestamp-face ((t (:foreground "#7c7c7c")))) - (erc-nick-default-face ((t (:foreground "#feffff")))) - (erc-nick-msg-face ((t (:bold t :foreground "#007998" :weight bold)))) + ;(erc-default-face ((t (nil)))) + ;(erc-direct-msg-face ((t (:foreground "#007998")))) + ;(erc-input-face ((t (:foreground "#feffff")))) + ;(erc-bold-face ((t (:bold t :weight bold)))) + ;(erc-inverse-face ((t (:background "Black" :foreground "White")))) + ;(erc-underline-face ((t (:underline t)))) + ;(erc-prompt-face ((t (:foreground "#c3c6c8")))) + ;(erc-notice-face ((t (:foreground "#7c7c7c")))) + ;(erc-action-face ((t (:bold t :weight bold)))) + ;(erc-error-face ((t (:foreground "#007998")))) + ;(erc-timestamp-face ((t (:foreground "#7c7c7c")))) + ;(erc-nick-default-face ((t (:foreground "#feffff")))) + ;(erc-nick-msg-face ((t (:bold t :foreground "#007998" :weight bold)))) ;; erc-dangerous-host-face ;; erc-keyword-face (erc-current-nick-face ((t (:foreground "#007998"))))