diff --git a/dot_eslintrc.js b/dot_eslintrc.js index 3dfb7b9..66b7092 100644 --- a/dot_eslintrc.js +++ b/dot_eslintrc.js @@ -2,12 +2,14 @@ //minimal config module.exports = { + root: true, extends: ['eslint:recommended'], env: { browser: true, es6: true, node: true, }, + parserOptions: { ecmaVersion: 2021 }, rules: { 'arrow-body-style': ['error', 'as-needed'], 'consistent-this': ['error', 'void'], diff --git a/private_dot_config/git/config.tmpl b/private_dot_config/git/config.tmpl index a00107a..a3a6313 100644 --- a/private_dot_config/git/config.tmpl +++ b/private_dot_config/git/config.tmpl @@ -1,7 +1,3 @@ -[user] - name = {{ .name }} - email = {{ .email }} - signingkey = B6EEF2F6A5ABF833927091F70355FC4371714951 [branch] autosetupmerge = always autosetuprebase = always @@ -23,7 +19,6 @@ whitespace = space-before-tab,-indent-with-non-tab,trailing-space attributesfile = ~/.config/git/attributes [commit] - gpgsign = true template = ~/.config/git/git-templates/templates/message [credential] helper = cache @@ -70,6 +65,8 @@ path = alias.toml path = style.toml [includeIf "gitdir:~/.local/share/chezmoi/**"] - path = ~/.config/git/gitconfig_perso.toml -[includeIf "gitdir:~/Developer/Perso/**"] - path = ~/.config/git/gitconfig_perso.toml + path = ~/.config/git/config_perso.toml +[includeIf "gitdir/i:~/Developer/Perso/**"] + path = ~/.config/git/config_perso.toml +[includeIf "gitdir/i:~/Developer/Storyful/**"] + path = ~/.config/git/config_storyful.toml diff --git a/private_dot_config/git/config_perso.toml b/private_dot_config/git/config_perso.toml new file mode 100644 index 0000000..209ee05 --- /dev/null +++ b/private_dot_config/git/config_perso.toml @@ -0,0 +1,7 @@ +[user] + name = fredericrous + email = frederic.rousseau.fr@gmail.com + signingkey = B6EEF2F6A5ABF833927091F70355FC4371714951 +[commit] + gpgsign = true + diff --git a/private_dot_config/git/config_storyful.toml b/private_dot_config/git/config_storyful.toml new file mode 100644 index 0000000..a8ed8b4 --- /dev/null +++ b/private_dot_config/git/config_storyful.toml @@ -0,0 +1,7 @@ +[user] + name = Frederic R + email = frederic.rousseau@storyful.com + signingkey = 0D462AB5F830995A960B126DB6017104C2C3777F +[commit] + gpgsign = true +