aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2025-10-19 11:37:33 -0700
committerMark Nipper <nipsy@bitgnome.net>2025-10-19 11:37:33 -0700
commit73864e4da7edb08fe5f7c2bf79c45407ee0b471d (patch)
tree35c82dbcdc0376332964c265712b8f744a074777
parentcf6c4da941be10b3c0d7d2f8ca407471c9c0f482 (diff)
downloadnix-73864e4da7edb08fe5f7c2bf79c45407ee0b471d.tar
nix-73864e4da7edb08fe5f7c2bf79c45407ee0b471d.tar.gz
nix-73864e4da7edb08fe5f7c2bf79c45407ee0b471d.tar.bz2
nix-73864e4da7edb08fe5f7c2bf79c45407ee0b471d.tar.lz
nix-73864e4da7edb08fe5f7c2bf79c45407ee0b471d.tar.xz
nix-73864e4da7edb08fe5f7c2bf79c45407ee0b471d.tar.zst
nix-73864e4da7edb08fe5f7c2bf79c45407ee0b471d.zip
Update deprecated optionsHEADmaster
-rw-r--r--home/nipsy/common/core/git.nix10
-rw-r--r--home/root/common/core/git.nix2
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;
};
}