Switching emacs to my personal theme again

1 files changed, 15 insertions, 11 deletions

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))