diff --git a/home/lander/features/cli/git/default.nix b/home/lander/features/cli/git/default.nix index d2c72fa..04fe669 100644 --- a/home/lander/features/cli/git/default.nix +++ b/home/lander/features/cli/git/default.nix @@ -1,12 +1,15 @@ # adapted from https://pickard.cc/posts/git-identity-home-manager/ -{ config, lib, pkgs, ...}: +{ + pkgs, + ... +}: let # put a shell script into the nix store - gitIdentity = - pkgs.writeShellScriptBin "git-identity" (builtins.readFile ./git-identity); -in { + gitIdentity = pkgs.writeShellScriptBin "git-identity" (builtins.readFile ./git-identity); +in +{ # we will use the excellent fzf in our `git-identity` script, so let's make sure it's available # let's add the gitIdentity script to the path as well home.packages = with pkgs; [ @@ -25,21 +28,20 @@ in { # the `inuits` identity user.inuits.name = "Lander Van den Bulcke"; user.inuits.email = "landervdb@inuits.eu"; + user.inuits.signingKey = "CA5B1C34E649BF92"; # the `olly` identity user.olly.name = "Lander Van den Bulcke"; user.olly.email = "landervdb@o11y.eu"; - - # the `paynovate` identity - user.paynovate.name = "Lander Van den Bulcke"; - user.paynovate.email = "lander.vandenbulcke@paynovate.com"; + user.olly.signingKey = "CA5B1C34E649BF92"; # the `personal` identity user.personal.name = "Lander Van den Bulcke"; user.personal.email = "landervandenbulcke@gmail.com"; + user.personal.signingKey = "CA5B1C34E649BF92"; # editor - core.editor = "vim"; + core.editor = "nvim"; # line up default branch with github/codeberg/forgejo init.defaultBranch = "main"; diff --git a/home/lander/features/cli/git/git-identity b/home/lander/features/cli/git/git-identity index 8e1816a..43ce16a 100644 --- a/home/lander/features/cli/git/git-identity +++ b/home/lander/features/cli/git/git-identity @@ -14,3 +14,4 @@ fi # set the id locally in each repo (eg in the repo's .git/config) git config user.name "$(git config user.${ID}.name)" git config user.email "$(git config user.${ID}.email)" +git config user.signingKey "$(git config user.${ID}.signingKey)"