From a2def2bfcc9d9777934cfc192a13fbc12773924f Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Mon, 4 Mar 2024 15:10:15 -0800 Subject: don't sign git commits Simplify the configuration as this is not something I currently use. --- nix/profiles/home-manager/git.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'nix/profiles/home-manager/git.nix') diff --git a/nix/profiles/home-manager/git.nix b/nix/profiles/home-manager/git.nix index ce9c0a9..d7b07c3 100644 --- a/nix/profiles/home-manager/git.nix +++ b/nix/profiles/home-manager/git.nix @@ -1,22 +1,10 @@ -{ lib, pkgs, config, ... }: -let - sshPub = builtins.fromTOML ( - builtins.readFile ../../../configs/ssh-pubkeys.toml - ); -in +{ pkgs, config, ... }: { - home.file.".ssh/allowed_signers".text = lib.concatMapStrings (x: "franck@fcuny.net ${x}\n") (with sshPub; [ aptos work git ykey-laptop op ]); - programs.git = { enable = true; userName = "Franck Cuny"; userEmail = "franck@fcuny.net"; - signing = { - key = "key::${sshPub.op}"; - signByDefault = true; - }; - aliases = { amend = "commit --amend"; ll = "log --pretty=\"format:%h %G? %aN %s\""; @@ -26,10 +14,6 @@ in core.whitespace = "trailing-space,space-before-tab"; color.ui = "true"; - gpg.format = "ssh"; - gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers"; - gpg.ssh.program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"; - # abort if the remote branch does not match the local one push.default = "simple"; -- cgit 1.4.1