Merge pull request 'test' (#17) from merge-nixconfigs into main
Reviewed-on: #17
This commit is contained in:
commit
75fd279667
2 changed files with 12 additions and 16 deletions
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
description = "My nixos homelab";
|
description = "My NixOS homelab";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
# Nixpkgs and unstable
|
# Nixpkgs and unstable
|
||||||
|
@ -57,6 +57,7 @@
|
||||||
url = "github:bluskript/nix-inspect";
|
url = "github:bluskript/nix-inspect";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
{ self
|
{ self
|
||||||
, nixpkgs
|
, nixpkgs
|
||||||
|
|
|
@ -33,24 +33,19 @@ in
|
||||||
userEmail = cfg.email;
|
userEmail = cfg.email;
|
||||||
|
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
core = {
|
core.autocrlf = "input";
|
||||||
autocrlf = "input";
|
init.defaultBranch = "main";
|
||||||
};
|
pull.rebase = true;
|
||||||
init = {
|
rebase.autoStash = true;
|
||||||
defaultBranch = "main";
|
# public key for signing commits
|
||||||
};
|
user.signingKey = cfg.signingKey;
|
||||||
pull = {
|
# ssh instead of gpg
|
||||||
rebase = true;
|
|
||||||
};
|
|
||||||
rebase = {
|
|
||||||
autoStash = true;
|
|
||||||
};
|
|
||||||
user = {
|
|
||||||
signingKey = cfg.signingKey;
|
|
||||||
};
|
|
||||||
gpg.format = "ssh";
|
gpg.format = "ssh";
|
||||||
# gpg.ssh.program = "/etc/profiles/per-user/jahanson/bin/op-ssh-sign";
|
# gpg.ssh.program = "/etc/profiles/per-user/jahanson/bin/op-ssh-sign";
|
||||||
|
# 1password signing gui git signing
|
||||||
gpg.ssh.program = "${pkgs._1password-gui}/bin/op-ssh-sign";
|
gpg.ssh.program = "${pkgs._1password-gui}/bin/op-ssh-sign";
|
||||||
|
# Auto sign commits without -S
|
||||||
|
commit.gpgsign = true;
|
||||||
};
|
};
|
||||||
aliases = {
|
aliases = {
|
||||||
co = "checkout";
|
co = "checkout";
|
||||||
|
|
Reference in a new issue