Add twilight-emacs, use it by default.

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "git-emacs"]
 	path = emacs.d/git-emacs
 	url = git://github.com/tsgates/git-emacs.git
+[submodule "emacs.d/twilight-emacs"]
+	path = emacs.d/twilight-emacs
+	url = git://github.com/crafterm/twilight-emacs.git

emacs.el

@@ -6,7 +6,10 @@
 (setq cua-highlight-region-shift-only t)
 (one-buffer-one-frame-mode 0) ; forces everything to open in one window
 
-(defun edit-my-preferencpes ()
+(define-key global-map [\C-tab] 'other-window) ; vimy window switching
+(define-key global-map "\C-x\C-z" 'shell) ; shortcut for shell
+
+(defun edit-my-preferences ()
   "Edits my local preferences."
   (interactive)
   (find-file 
@@ -39,11 +42,16 @@
                          `(define-key ,keymap ,(car kp) ,(cadr kp)))
                  keypairs)))
 
+;;;;;;;;;;;;
+;   Modes  ;
+;;;;;;;;;;;;
+
 ; colors
 (require 'color-theme)
 (color-theme-initialize)
 (setq color-theme-is-global t)
-(color-theme-dark-laptop)
+(load-file "~/.emacs.d/twilight-emacs/color-theme-twilight.el")
+(color-theme-twilight)
 
 ; rinari
 (add-to-list 'load-path "~/.emacs.d/rinari/")
@@ -73,4 +81,7 @@
   (let ((file-name (dired-get-file-for-visit)))
     (if (file-exists-p file-name)
         (call-process "/usr/bin/open" nil 0 nil file-name))))
-(define-key dired-mode-map "o" 'dired-open-mac)
+(define-key dired-mode-map "o" 'dired-open-mac)
+
+; prefer dired over dumping dir list to buffer
+(define-key global-map "\C-x\C-d" 'dired)