- git.{{ grains['os'] | lower }}
-{% set git_vars = {
+{% set git_confs = {
+ 'color.ui': 'true',
+ 'color.branch': 'always',
+ 'color.status': 'always',
+ 'color.interactive': 'always',
+ 'color.diff': 'true',
'user.name': 'Maximilian Friedersdorff',
- 'user.email': 'max@friedersdorff.com'
+ 'user.email': 'max@friedersdorff.com',
+ 'user.signingkey': 'F5E7FCB3',
+ 'core.editor': 'vim',
+ 'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
+ 'merge.tool': 'diffuse',
+ 'merge.ff': 'true',
+ 'push.default': 'simple',
+ 'alias.lg': 'lg = log --graph --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
+ 'alias.hist': 'log --graph --full-history --all --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
+ 'alias.struct': 'struct = log --graph --full-history --all --pretty=format:\'%ad %s %Creset %C(yellow)%d%Creset\' --date=short --simplify-by-decoration',
+ 'alias.co': 'checkout',
+ 'alias.ci': 'commit',
+ 'alias.st': 'status',
}
%}
-{% for var,val in git_vars.items() %}
+{% for var,val in git_confs.items() %}
{{ var }}:
git.config_set:
- value: {{ val }}
- global: True
- user: {{ grains['user'] }}
{% endfor %}
+
+global gitignore:
+ file.managed:
+ - name: {{ grains['homedir'] }}/.gitignore
+ - source: {{ grains['stateroot'] }}/git/files/gitignore
+ - mode: 644
+ - user: {{ grains['user'] }}
+ - group: {{ grains['user'] }}