Merge pull request 'test' (#17) from merge-nixconfigs into main

Reviewed-on: #17
This commit is contained in:
Joseph Hanson 2024-05-31 09:49:48 -05:00
commit 75fd279667
2 changed files with 12 additions and 16 deletions

View file

@ -1,5 +1,5 @@
{
description = "My nixos homelab";
description = "My NixOS homelab";
inputs = {
# Nixpkgs and unstable
@ -57,6 +57,7 @@
url = "github:bluskript/nix-inspect";
};
};
outputs =
{ self
, nixpkgs

View file

@ -33,24 +33,19 @@ in
userEmail = cfg.email;
extraConfig = {
core = {
autocrlf = "input";
};
init = {
defaultBranch = "main";
};
pull = {
rebase = true;
};
rebase = {
autoStash = true;
};
user = {
signingKey = cfg.signingKey;
};
core.autocrlf = "input";
init.defaultBranch = "main";
pull.rebase = true;
rebase.autoStash = true;
# public key for signing commits
user.signingKey = cfg.signingKey;
# ssh instead of gpg
gpg.format = "ssh";
# 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";
# Auto sign commits without -S
commit.gpgsign = true;
};
aliases = {
co = "checkout";