From c648c6ebe66d05a97d1b589ac9e0824d625a864d Mon Sep 17 00:00:00 2001
From: Hactarus <hactarus.git@cresi.be>
Date: Wed, 23 May 2018 09:23:58 +0000
Subject: [PATCH] fix ssh_config

---
 common.toml                       | 27 +++++++++++++++++++--------
 config/{git_config => ssh/config} |  4 +---
 2 files changed, 20 insertions(+), 11 deletions(-)
 rename config/{git_config => ssh/config} (92%)

diff --git a/common.toml b/common.toml
index 8d88f2a..f7016fc 100644
--- a/common.toml
+++ b/common.toml
@@ -38,15 +38,22 @@
 
 [tasks.zsh]
 	rejects = [["which", "zsh"]]
-	cmds = [["@install", "zsh"],
+	cmds = [
+		["@install", "zsh"],
 		["@clone", "--depth=1" ,"https://github.com/robbyrussell/oh-my-zsh.git", ".oh-my-zsh"],
 		["chsh", "-s", "/bin/zsh"]
 	]
-	links = [[".zshrc", "config/zshrc"]]
+	links = [
+		[".zshrc", "config/zshrc"],
+		["termite.terminfo", "config/termite.terminfo"]
+	]
 
 [tasks.golang]
 	envs = [["GOPATH", "${HM_DEST}/projects/go"]]
-	cmds = [["mkdir", "-p", "$GOPATH"], ["@install", "golang"]]
+	cmds = [
+		["mkdir", "-p", "$GOPATH"],
+		["@install", "golang"]
+	]
 
 [tasks.node]
 	cmds = [["@install", "nodejs", "npm"]]
@@ -60,10 +67,15 @@
 		]]
 
 [tasks.term]
-	cms = [["wget", "https://raw.githubusercontent.com/thestinger/termite/master/termite.terminfo"], ["tic", "-x", "termite.terminfo"]]
+	cms = [
+		["wget", "https://raw.githubusercontent.com/thestinger/termite/master/termite.terminfo"],
+		["tic", "-x", "termite.terminfo"]
+	]
 
-[tasks.git]
-	templates = [[".ssh/config", "git_config"]]
+[tasks.ssh]
+	templates = [
+		[".ssh/config", "config/ssh/config"]
+	]
 
 [tasks.vim]
 	links = [
@@ -77,5 +89,4 @@
 ### Run
 ###
 [tasks.default]
-	deps = ["htop", "tmux", "git", "zsh", "dev"]
-
+	deps = ["htop", "tmux", "git", "zsh", "dev", "vim", "golang", "ssh"]
diff --git a/config/git_config b/config/ssh/config
similarity index 92%
rename from config/git_config
rename to config/ssh/config
index da11908..ac97c9c 100644
--- a/config/git_config
+++ b/config/ssh/config
@@ -23,6 +23,4 @@ Host ansible
 Host node*
 	User root
 	Port 16843
-	IdentityFile ~/.ssh/auberge
-
-
+	IdentityFile ~/.ssh/{{.Env}}