From 7a43a803c9cc01638da30ace149bef681b61af95 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Fri, 31 May 2024 09:21:59 -0500 Subject: [PATCH 1/3] test --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 1e9db2d..9fae3ab 100644 --- a/flake.nix +++ b/flake.nix @@ -57,6 +57,7 @@ url = "github:bluskript/nix-inspect"; }; }; + outputs = { self , nixpkgs From 464f3c0a26d003b4f683a9d1f64badf93c179295 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Fri, 31 May 2024 09:21:59 -0500 Subject: [PATCH 2/3] test test --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9fae3ab..7920857 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "My nixos homelab"; + description = "My NixOS homelab"; inputs = { # Nixpkgs and unstable From 3f95678318365f70626a81bc68323dcaf9280e6f Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Fri, 31 May 2024 09:41:25 -0500 Subject: [PATCH 3/3] clean up --- nixos/home/modules/shell/git/default.nix | 25 ++++++++++-------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/nixos/home/modules/shell/git/default.nix b/nixos/home/modules/shell/git/default.nix index c215de6..b8ede7f 100644 --- a/nixos/home/modules/shell/git/default.nix +++ b/nixos/home/modules/shell/git/default.nix @@ -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";