From abeb3538524429290a91892f1e9e0fba0ce99bc8 Mon Sep 17 00:00:00 2001 From: jeirmeister Date: Wed, 30 Oct 2024 03:44:30 -0700 Subject: [PATCH] holy cow methinks it works --- users/jeirmeister/programs/git.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/users/jeirmeister/programs/git.nix b/users/jeirmeister/programs/git.nix index ff88375..7e6ad4b 100644 --- a/users/jeirmeister/programs/git.nix +++ b/users/jeirmeister/programs/git.nix @@ -3,6 +3,7 @@ { programs.git = { enable = true; + package = pkgs.git; # Explicitly specify git package lfs.enable = true; userName = "jeirmeister"; userEmail = "jeir@jeirslab.xyz"; @@ -11,21 +12,15 @@ init.defaultBranch = "main"; pull.rebase = false; - # Configure credential helper + # More explicit credential configuration credential = { - helper = "${pkgs.git-credential-manager}/bin/git-credential-manager"; + helper = lib.mkForce "${pkgs.git-credential-manager}/bin/git-credential-manager"; + credentialStore = "plaintext"; + interactive = false; }; - # Add additional required configurations safe.directory = "*"; }; - - ignores = [ - ".DS_Store" - "*.swp" - ".vscode/" - ".idea/" - ]; }; # Ensure required packages are installed @@ -33,6 +28,5 @@ git-credential-manager ]; - # Enable XDG directories xdg.enable = true; } \ No newline at end of file