diff --git a/emacs b/emacs index 6755b48..0b6ff18 100644 --- a/emacs +++ b/emacs @@ -7,12 +7,10 @@ (require 'color-theme) (require 'flymake) (require 'color-theme-gruber-darker) -;(require 'zenburn) -;(require 'lua-mode) (require 'tabbar) (require 'minimap) -;(require 'manage-org) (require 'column-marker) +(require 'color-theme-weirdness) ;; Auto complete (require 'auto-complete-config) @@ -35,12 +33,9 @@ (autoload 'lua-mode "lua-mode.elc" "A Major mode for editing Lua files" t) -;; Functions -;(require 'functions) - ;; Platform specifics -;(if (eq system-type 'gnu/linux) ; if we're running linux -(set-default-font "-*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*");) +(if (eq system-type 'gnu/linux) ; if we're running linux + (set-default-font "-*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*")) ;; Variables (setq @@ -95,9 +90,7 @@ (add-to-list 'compilation-finish-functions 'my-comp-finish-function) ;; Color theme -;;(require 'color-theme-weirdness) -;(color-theme-zenburn) -(color-theme-gruber-darker) +(color-theme-weirdness2) ;; Test for frame fonts (defun setup-system-frame-colours (&rest frame) @@ -161,3 +154,14 @@ ;; If there is more than one, they won't work right. '(tabbar-selected ((t (:inherit tabbar-default :background "#1E2320" :foreground "#F0DFAF")))) '(tabbar-unselected ((nil (:background "#3F3F3F" :foreground "#DCDCCC"))))) + + +;;; This was installed by package-install.el. +;;; This provides support for the package system and +;;; interfacing with ELPA, the package archive. +;;; Move this code earlier if you want to reference +;;; packages in your .emacs. +(when + (load + (expand-file-name "~/.emacs.d/elpa/package.el")) + (package-initialize)) diff --git a/emacs.d/.gitignore b/emacs.d/.gitignore index 168b1e0..2a5e743 100644 --- a/emacs.d/.gitignore +++ b/emacs.d/.gitignore @@ -1 +1,2 @@ tramp +elpa diff --git a/emacs.d/color-theme-weirdness.el b/emacs.d/color-theme-weirdness.el index a97cefc..c75996c 100644 --- a/emacs.d/color-theme-weirdness.el +++ b/emacs.d/color-theme-weirdness.el @@ -34,4 +34,41 @@ (font-lock-type-face ((t (:foreground "#8522DD")))) (font-lock-variable-name-face ((t (:foreground "#18EFF2")))) (font-lock-warning-face ((t (:foreground "#FF0000" :bold t))))))) + +;; weirdnes color-theme 2 +;; thinking of improving it. +(defun color-theme-weirdness2 () + (interactive) + (color-theme-install + '(color-theme-weirdness + ((background-color . "#000000") + (background-mode . dark) + (border-color . "#000000") + (cursor-color . "#FFFFFF") + (foreground-color . "#FFFFFF") + (mouse-color . "#000000")) + (org-level-1 ((t (:foreground "#5BFD5B" :weight normal)))) + (org-level-2 ((t (:foreground "#379A37" :weight normal)))) + (org-level-3 ((t (:foreground "#757575" :weight normal)))) + (org-level-4 ((t (:foreground "#778899" :weight normal)))) + (org-level-5 ((t (:foreground "#9898FF" :weight normal)))) + (org-level-6 ((t (:foreground "#0000B0" :weight normal)))) + (org-level-7 ((t (:foreground "#740091" :weight normal)))) + (org-level-8 ((t (:foreground "#B275C1" :weight normal)))) + (fringe ((t (:background "#000000")))) + (mode-line ((t (:foreground "#B3B3B3" :background "#43527A" :background "#000000" :box nil)))) + (region ((t (:background "#3D3D3D")))) + (minibuffer-prompt ((t (:foreground "#72F3FF" :bold t)))) + (flymake-warnline ((t (:background "#000060")))) + (flymake-errline ((t (:background "#600000")))) + (font-lock-builtin-face ((t (:foreground "#C436C4")))) + (font-lock-comment-face ((t (:foreground "#00AC00" :background "#004000" :bold t :box (:line-width 1 :color "#006000" :style nil))))) + (font-lock-comment-delimiter-face ((t (:inherit 'font-lock-comment-face)))) + (font-lock-function-name-face ((t (:foreground "#8522DD")))) + (font-lock-keyword-face ((t (:foreground "royal blue")))) + (font-lock-string-face ((t (:foreground "#E00900")))) + (font-lock-type-face ((t (:foreground "#FF9800")))) + (font-lock-variable-name-face ((t (:foreground "#18EFF2")))) + (font-lock-warning-face ((t (:foreground "#FF0000" :bold t))))))) + (provide 'color-theme-weirdness)