jahanson/nix-config-tn
Archived
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

@ -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

25
nixos/home/modules/shell/git/default.nix
View file

@ -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";