update git config schema
5 files changed, 37 insertions(+), 37 deletions(-)
M user/hosts/marvin.nix → user/hosts/marvin.nix
@@ -38,11 +38,11 @@ format = "ssh"; key = "${config.home.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/PublicKeys/7ddf377f63c957d7c69185c07ab98a7b.pub"; signByDefault = true; }; - extraConfig.gpg = { + settings.gpg = { ssh = { allowedSignersFile = toString ( pkgs.writeText "allowed-signers" '' - ${config.programs.git.userEmail} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJVREjPey2TOIPzfYJoG9yIR4Rui7tNJK2QIKa+pbgsyXg31hhPIw37LRRIic+l53mW8eahHxX3Y1IeTjcMw8IU= alan@alanpearce.eu + ${config.programs.git.settings.user.email} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJVREjPey2TOIPzfYJoG9yIR4Rui7tNJK2QIKa+pbgsyXg31hhPIw37LRRIic+l53mW8eahHxX3Y1IeTjcMw8IU= alan@alanpearce.eu '' ); };
M user/settings/development/javascript.nix → user/settings/development/javascript.nix
@@ -79,7 +79,7 @@ programs.git.attributes = [ "*.lockb diff=lockb" ]; - programs.git.extraConfig."diff.lockb" = { + programs.git.settings."diff.lockb" = { textconv = "bun"; binary = true; };
M user/settings/emacs.nix → user/settings/emacs.nix
@@ -28,7 +28,7 @@ programs.git.attributes = [ "*.el diff=elisp" ]; - programs.git.extraConfig."diff.elisp" = { + programs.git.settings."diff.elisp" = { xfuncname = "^\\([^[:space:]]+[[:space:]]+([^()[:space:]]+)"; };
M user/settings/git.nix → user/settings/git.nix
@@ -7,9 +7,11 @@ }: { programs.git = { enable = true; - userName = "Alan Pearce"; - userEmail = "alan@alanpearce.eu"; - extraConfig = { + settings = { + user = { + name = "Alan Pearce"; + email = "alan@alanpearce.eu"; + }; init = { defaultBranch = "main"; };@@ -90,30 +92,30 @@ }; "branch.main" = { rebase = false; }; - }; - aliases = { - authors = "shortlog -s -n"; - mup = "merge FETCH_HEAD"; - rup = "rebase FETCH_HEAD"; - ls = "ls-files"; - st = "status -sb"; - ci = "commit"; - br = "branch"; - co = "checkout"; - sw = "switch"; - rs = "restore"; - lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\\\?[0-9]\" | tail -n1'"; - pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'"; - lg = "log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset'"; - ignored = "ls-files --others -i --exclude-standard"; - clear = "clear-soft"; - clear-hard = "!git-clear-hard"; - dlog = "-c diff.external=difft log --ext-diff"; - dshow = "-c diff.external=difft show --ext-diff"; - ddiff = "-c diff.external=difft diff"; - dl = "dlog"; - ds = "dshow"; - dt = "ddiff"; + alias = { + authors = "shortlog -s -n"; + mup = "merge FETCH_HEAD"; + rup = "rebase FETCH_HEAD"; + ls = "ls-files"; + st = "status -sb"; + ci = "commit"; + br = "branch"; + co = "checkout"; + sw = "switch"; + rs = "restore"; + lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\\\?[0-9]\" | tail -n1'"; + pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'"; + lg = "log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset'"; + ignored = "ls-files --others -i --exclude-standard"; + clear = "clear-soft"; + clear-hard = "!git-clear-hard"; + dlog = "-c diff.external=difft log --ext-diff"; + dshow = "-c diff.external=difft show --ext-diff"; + ddiff = "-c diff.external=difft diff"; + dl = "dlog"; + ds = "dshow"; + dt = "ddiff"; + }; }; ignores = [ ".DS_Store"
M user/settings/workstation.nix → user/settings/workstation.nix
@@ -24,10 +24,9 @@ }; programs.mergiraf.enable = true; - programs.git = { - difftastic = { - enable = true; - }; + programs.difftastic = { + enable = true; + git.enable = true; }; programs.gh = { enable = true;@@ -42,8 +41,7 @@ programs.jujutsu = { enable = true; settings = { user = { - name = config.programs.git.userName; - email = config.programs.git.userEmail; + inherit (config.programs.git.settings.user) name email; }; ui = { "diff.tool" = [