From c94b978f3d7831b1fb1365db5bd247f1d69b124e Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <jkaplan@memsql.com>
Date: Sun, 24 Sep 2017 22:01:55 -0400
Subject: [PATCH] Update VCS configs

---
 default.conf.yaml               |  2 ++
 git/{config-metagram => config} |  6 ++++++
 git/config-gmail                | 13 -------------
 git/config-mit                  | 13 -------------
 git/config-personal             |  3 +++
 gmail.conf.yaml                 |  6 ------
 hg/{metagram.hgrc => .hgrc}     |  0
 hg/gmail.hgrc                   | 11 -----------
 hg/mit.hgrc                     | 11 -----------
 metagram.conf.yaml              |  6 ------
 mit.conf.yaml                   |  6 ------
 11 files changed, 11 insertions(+), 66 deletions(-)
 rename git/{config-metagram => config} (59%)
 delete mode 100644 git/config-gmail
 delete mode 100644 git/config-mit
 create mode 100644 git/config-personal
 delete mode 100644 gmail.conf.yaml
 rename hg/{metagram.hgrc => .hgrc} (100%)
 delete mode 100644 hg/gmail.hgrc
 delete mode 100644 hg/mit.hgrc
 delete mode 100644 metagram.conf.yaml
 delete mode 100644 mit.conf.yaml

diff --git a/default.conf.yaml b/default.conf.yaml
index da0107d..ed07699 100644
--- a/default.conf.yaml
+++ b/default.conf.yaml
@@ -4,7 +4,9 @@
 - clean: ['~', '~/.config']
 
 - link:
+    ~/.hgrc: hg/.hgrc
     ~/.emacs.d: emacs/
+    ~/.config/git: git/
     ~/.config/nvim: neovim/
     ~/.config/tako: tako/
     ~/.config/zsh: zsh/
diff --git a/git/config-metagram b/git/config
similarity index 59%
rename from git/config-metagram
rename to git/config
index d3ab1c2..a0b1beb 100644
--- a/git/config-metagram
+++ b/git/config
@@ -7,7 +7,13 @@
 	default = simple
 [alias]
 	lg = log --oneline --graph --decorate
+	root = rev-parse --show-toplevel
 [credential]
 	helper = cache
 [commit]
 	verbose = true
+[core]
+	excludesfile = /home/jdkaplan/.gitignore
+
+[includeIf "gitdir:~/projects/"]
+	path = config-personal
diff --git a/git/config-gmail b/git/config-gmail
deleted file mode 100644
index 5837843..0000000
--- a/git/config-gmail
+++ /dev/null
@@ -1,13 +0,0 @@
-[user]
-	name = Jeremy Kaplan
-	email = jeremydkaplan@gmail.com
-[color]
-	ui = true
-[push]
-	default = simple
-[alias]
-	lg = log --oneline --graph --decorate
-[credential]
-	helper = cache
-[commit]
-	verbose = true
diff --git a/git/config-mit b/git/config-mit
deleted file mode 100644
index 540a26f..0000000
--- a/git/config-mit
+++ /dev/null
@@ -1,13 +0,0 @@
-[user]
-	name = Jeremy Kaplan
-	email = jdkaplan@mit.edu
-[color]
-	ui = true
-[push]
-	default = simple
-[alias]
-	lg = log --oneline --graph --decorate
-[credential]
-	helper = cache
-[commit]
-	verbose = true
diff --git a/git/config-personal b/git/config-personal
new file mode 100644
index 0000000..3b5d36d
--- /dev/null
+++ b/git/config-personal
@@ -0,0 +1,3 @@
+[user]
+	name = Jeremy Kaplan
+	email = jdkaplan@metagram.net
diff --git a/gmail.conf.yaml b/gmail.conf.yaml
deleted file mode 100644
index cd58c3c..0000000
--- a/gmail.conf.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- shell:
-    - mkdir -p ~/.config/git
-
-- link:
-    ~/.config/git/config: git/config-gmail
-    ~/.hgrc: hg/gmail.hgrc
diff --git a/hg/metagram.hgrc b/hg/.hgrc
similarity index 100%
rename from hg/metagram.hgrc
rename to hg/.hgrc
diff --git a/hg/gmail.hgrc b/hg/gmail.hgrc
deleted file mode 100644
index 732700f..0000000
--- a/hg/gmail.hgrc
+++ /dev/null
@@ -1,11 +0,0 @@
-[ui]
-username = Jeremy Kaplan <jeremydkaplan@gmail.com>
-[extensions]
-color =
-hgext.bookmarks =
-shelve =
-record =
-[trusted]
-users = hartz
-[bookmarks]
-track.current = True
diff --git a/hg/mit.hgrc b/hg/mit.hgrc
deleted file mode 100644
index 729ec5c..0000000
--- a/hg/mit.hgrc
+++ /dev/null
@@ -1,11 +0,0 @@
-[ui]
-username = Jeremy Kaplan <jdkaplan@mit.edu>
-[extensions]
-color =
-hgext.bookmarks =
-shelve =
-record =
-[trusted]
-users = hartz
-[bookmarks]
-track.current = True
diff --git a/metagram.conf.yaml b/metagram.conf.yaml
deleted file mode 100644
index f19df07..0000000
--- a/metagram.conf.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- shell:
-    - mkdir -p ~/.config/git
-
-- link:
-    ~/.config/git/config: git/config-metagram
-    ~/.hgrc: hg/metagram.hgrc
diff --git a/mit.conf.yaml b/mit.conf.yaml
deleted file mode 100644
index f79ebc8..0000000
--- a/mit.conf.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- shell:
-    - mkdir -p ~/.config/git
-
-- link:
-    ~/.config/git/config: git/config-mit
-    ~/.hgrc: hg/mit.hgrc