diff --git a/.config/git/allowed_signers b/.config/git/allowed_signers new file mode 100644 index 0000000..eb338a4 --- /dev/null +++ b/.config/git/allowed_signers @@ -0,0 +1,2 @@ + surtur ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBtG6NCgdLHX4ztpfvYNRaslKWZcl6KdTc1DehVH4kAL + leo ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKwshTdBgLzwY4d8N7VainZCngH88OwvPGhZ6bm87rBO diff --git a/.config/git/config b/.config/git/config index 4faf001..07e2a47 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,17 +1,15 @@ -[user] - name = surtur - email = a_mirre@utb.cz [commit] gpgsign = true -[oh-my-zsh] - hide-status = 1 -[cola] - spellcheck = false - statusshowtotals = true -[color] - ui = auto [tag] gpgsign = true +[gpg] + format = ssh +[gpg "ssh"] + allowedSignersFile = ~/.config/git/allowed_signers +[oh-my-zsh] + hide-status = 1 +[color] + ui = auto [pull] ff = only [filter "lfs"] @@ -34,3 +32,4 @@ fuckit = reset --hard [init] defaultBranch = development + templateDir = ~/.git-template diff --git a/home-surtur.nix b/home-surtur.nix index 5812d09..bbeac57 100644 --- a/home-surtur.nix +++ b/home-surtur.nix @@ -113,6 +113,30 @@ in { source = ./.config/fusuma/config.yml; }; + ".config/git/config-common" = { + source = ./.config/git/config; + }; + # host-specific gitconfig. + ".config/git/config.${hostName}" = { + text = '' + [user] + name = ${hostName} + email = wanderer@dotya.ml + signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBtG6NCgdLHX4ztpfvYNRaslKWZcl6KdTc1DehVH4kAL + ''; + }; + ".config/git/config" = { + text = '' + [include] + path = ~/.config/git/config-common + [include] + path = ~/.config/git/config.${hostName} + ''; + }; + ".config/git/allowed_signers" = { + source = ./.config/git/allowed_signers; + }; + # begin zsh-related. ".zshenv" = { source = ./.zshenv;