From b138c57d95fd941b9e727d45b3ee29172cbf882f Mon Sep 17 00:00:00 2001
From: Anna Wiggins <annabunches@gmail.com>
Date: Thu, 22 Mar 2018 16:06:06 -0400
Subject: [PATCH] Move a bunch of configs around to make docker happy.

---
 emacs => emacs/.emacs                             |  0
 {emacs.d => emacs/.emacs.d}/lisp/haml-mode.el     |  0
 {emacs.d => emacs/.emacs.d}/lisp/markdown-mode.el |  0
 {emacs.d => emacs/.emacs.d}/lisp/slim-mode.el     |  0
 {emacs.d => emacs/.emacs.d}/lisp/yaml-mode.el     |  0
 gitconfig => git/.gitconfig                       |  8 +++++---
 git/gitconfig                                     | 14 --------------
 7 files changed, 5 insertions(+), 17 deletions(-)
 rename emacs => emacs/.emacs (100%)
 rename {emacs.d => emacs/.emacs.d}/lisp/haml-mode.el (100%)
 rename {emacs.d => emacs/.emacs.d}/lisp/markdown-mode.el (100%)
 rename {emacs.d => emacs/.emacs.d}/lisp/slim-mode.el (100%)
 rename {emacs.d => emacs/.emacs.d}/lisp/yaml-mode.el (100%)
 rename gitconfig => git/.gitconfig (62%)
 delete mode 100644 git/gitconfig

diff --git a/emacs b/emacs/.emacs
similarity index 100%
rename from emacs
rename to emacs/.emacs
diff --git a/emacs.d/lisp/haml-mode.el b/emacs/.emacs.d/lisp/haml-mode.el
similarity index 100%
rename from emacs.d/lisp/haml-mode.el
rename to emacs/.emacs.d/lisp/haml-mode.el
diff --git a/emacs.d/lisp/markdown-mode.el b/emacs/.emacs.d/lisp/markdown-mode.el
similarity index 100%
rename from emacs.d/lisp/markdown-mode.el
rename to emacs/.emacs.d/lisp/markdown-mode.el
diff --git a/emacs.d/lisp/slim-mode.el b/emacs/.emacs.d/lisp/slim-mode.el
similarity index 100%
rename from emacs.d/lisp/slim-mode.el
rename to emacs/.emacs.d/lisp/slim-mode.el
diff --git a/emacs.d/lisp/yaml-mode.el b/emacs/.emacs.d/lisp/yaml-mode.el
similarity index 100%
rename from emacs.d/lisp/yaml-mode.el
rename to emacs/.emacs.d/lisp/yaml-mode.el
diff --git a/gitconfig b/git/.gitconfig
similarity index 62%
rename from gitconfig
rename to git/.gitconfig
index c52c3d6..c21146d 100644
--- a/gitconfig
+++ b/git/.gitconfig
@@ -1,10 +1,12 @@
 [user]
-    name = Anna Wiggins
+	name = Anna Wiggins
     email = annabunches@gmail.com
 	signingkey = EFEF6022
-[push]
-	default = simple
 [commit]
 	gpgsign = true
 [gpg]
 	program = gpg2
+[push]
+	default = simple
+[alias]
+    graph = log --graph --oneline --decorate --all
diff --git a/git/gitconfig b/git/gitconfig
deleted file mode 100644
index 144ad66..0000000
--- a/git/gitconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is Git's per-user configuration file.
-[user]
-# Please adapt and uncomment the following lines:
-	name = Anna Wiggins
-        email = annabunches@gmail.com
-	signingkey = 0448ED78
-[commit]
-	gpgsign = true
-[gpg]
-	program = gpg2
-[push]
-	default = upstream
-[alias]
-    graph = log --graph --oneline --decorate --all