X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fgit%2Finit.sls;h=2bfd1ca05979d1745fdf8f5dd2bde91ced6ddfe5;hb=6349a7075431ab971686f9bc79f3e70acd7d3cb7;hp=3dfc0f51426f27d7224f962f4c683d500799fc30;hpb=05549b0607b711ac7b51eb05fed77f364979035f;p=max%2Fsaltfiles.git

diff --git a/states/git/init.sls b/states/git/init.sls
index 3dfc0f5..2bfd1ca 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -8,14 +8,13 @@ include:
   'color.status': 'always',
   'color.interactive': 'always',
   'color.diff': 'true',
-  'diff.external': 'difft',
   'user.name': 'Maximilian Friedersdorff',
   'user.email': 'max@friedersdorff.com',
   'user.signingkey': 'F5E7FCB3',
   'core.editor': 'vim',
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
-  'merge.ff': 'true',
+  'merge.ff': 'false',
   'pull.rebase': 'false',
   'push.default': 'simple',
   'alias.lg': 'log --graph --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
@@ -49,6 +48,24 @@ include:
     - user: {{ grains['user'] }}
 {% endfor %}
 
+{% if grains['host'] in ["barium"] %}
+work_email:
+  git.config_set:
+    - name: user.email
+    - value: >-
+        maximilian.friedersdorff@envsys.co.uk
+    - global: True
+    - user: {{ grains['user'] }}
+
+work_gpg:
+  git.config_set:
+    - name: user.signingkey
+    - value: >-
+        B3030EB2
+    - global: True
+    - user: {{ grains['user'] }}
+{% endif %}
+
 global gitignore:
   file.managed:
     - name: {{ grains['homedir'] }}/.gitignore
@@ -56,3 +73,14 @@ global gitignore:
     - mode: 644
     - user: {{ grains['user'] }}
     - group: {{ grains['user'] }}
+
+git-prompt:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.git-prompt.sh
+    - source: https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh
+    - mode: 644
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}
+    - skip_verify: True
+
+