From 73864e4da7edb08fe5f7c2bf79c45407ee0b471d Mon Sep 17 00:00:00 2001 From: Mark Nipper Date: Sun, 19 Oct 2025 11:37:33 -0700 Subject: Update deprecated options --- home/nipsy/common/core/git.nix | 10 +++++++--- home/root/common/core/git.nix | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/home/nipsy/common/core/git.nix b/home/nipsy/common/core/git.nix index d8bc6cf..5ff118e 100644 --- a/home/nipsy/common/core/git.nix +++ b/home/nipsy/common/core/git.nix @@ -1,8 +1,12 @@ { programs.git = { enable = true; - userEmail = "nipsy@bitgnome.net"; - userName = "Mark Nipper"; - extraConfig.pull.rebase = true; + settings = { + pull.rebase = true; + user = { + email = "nipsy@bitgnome.net"; + name = "Mark Nipper"; + }; + }; }; } diff --git a/home/root/common/core/git.nix b/home/root/common/core/git.nix index 49e10df..e1cb96b 100644 --- a/home/root/common/core/git.nix +++ b/home/root/common/core/git.nix @@ -1,6 +1,6 @@ { programs.git = { enable = true; - extraConfig.pull.rebase = true; + settings.pull.rebase = true; }; } -- cgit v1.2.3