Make gpg config user dependent, not machine dependent

_machines/notebook01.yml

@@ -1,8 +1,5 @@
 font_size: 10
 letter_space: 0
-mail: hannes.koerber@haktec.de
-git_gpg_sign: true
-gpg_agent: true
 terminal_binary: urxvt256c
 
 users:
@@ -11,6 +8,9 @@ users:
   firefox_profiles:
     - name: lu9k8ywl.default
       manage_css: false
+  mail: hannes.koerber@haktec.de
+  git_gpg_sign: true
+  gpg_agent: true
 
 screen:
   1: eDP-1

_machines/tb-hak.yml

@@ -1,8 +1,5 @@
 font_size: 11
 letter_space: 0
-mail: hannes.koerber@tradebyte.com
-git_gpg_sign: false
-gpg_agent: false
 terminal_binary: urxvt
 
 users:
@@ -12,9 +9,17 @@ users:
   firefox_profiles:
     - name: 3wmp9hdb.default-1565075150057
       manage_css: true
+  mail: hannes.koerber@tradebyte.com
+  git_gpg_sign: false
+  gpg_agent: false
 - name: hannes-private
   group: tpp
   vt: 2
+  mail: hannes.koerber@haktec.de
+  git_gpg_sign: true
+  gpg_agent: true
+  gpg_keys:
+    master_key: "0xB5C002530C6A2053"
 
 screen:
   1: DP-1-1

git/gitconfig.j2

@@ -1,9 +1,9 @@
 [user]
     name = Hannes Körber
-    email = {{ machine.mail }}
+    email = {{ user.mail }}
     useConfigOnly = true
-{% if machine.git_gpg_sign|bool %}
-    signingkey = 0xB5C002530C6A2053
+{% if user.git_gpg_sign|bool %}
+    signingkey = {{ user.gpg_keys.master_key }}
 {% endif %}
 [github]
     user = hakoerber
@@ -86,7 +86,7 @@
     commitBeforeMerge = false
     detachedHead = false
 [commit]
-    gpgSign = {{ machine.git_gpg_sign|bool }}
+    gpgSign = {{ user.git_gpg_sign|bool }}
     cleanup = strip
     status = true
 [status]

zsh/zshrc.j2

@@ -2,7 +2,7 @@
 
 _zshdir="$HOME/.zshrc.d"
 
-{% if machine.gpg_agent %}
+{% if user.gpg_agent %}
 export GPG_TTY=$(tty)
 export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 {% endif %}