From 19b1e357a39285491cc8a8a4deea2182d3f66957 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sun, 27 Oct 2024 10:46:10 -0700 Subject: this may simplify things ? --- nix/profiles/home-manager/git.nix | 50 ++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'nix/profiles/home-manager/git.nix') diff --git a/nix/profiles/home-manager/git.nix b/nix/profiles/home-manager/git.nix index 149af48..cba49f9 100644 --- a/nix/profiles/home-manager/git.nix +++ b/nix/profiles/home-manager/git.nix @@ -1,14 +1,26 @@ -{ pkgs, config, ... }: -{ +{ pkgs, config, lib, ... }: { programs.git = { enable = true; userName = "Franck Cuny"; aliases = { amend = "commit --amend"; - ll = "log --pretty=\"format:%h %G? %aN %s\""; + ll = ''log --pretty="format:%h %G? %aN %s"''; }; + includes = [ + { + condition = "hasconfig:remote.*.url:git@github.rbx.com:**"; + path = pkgs.writeText "finsitGitConfig" + (lib.generators.toGitINI { user.email = "fcuny@roblox.com"; }); + } + { + condition = "hasconfig:remote.*.url:git@github.com:Roblox/**"; + path = pkgs.writeText "finsitGitConfig" + (lib.generators.toGitINI { user.email = "fcuny@roblox.com"; }); + } + ]; + extraConfig = { core.whitespace = "trailing-space,space-before-tab"; color.ui = "true"; @@ -42,29 +54,23 @@ }; }; - ignores = [ - "*~" - ".direnv" - "__pycache__" - ]; + ignores = [ "*~" ".envrc" ".direnv" "__pycache__" ]; }; - xdg.dataFile."git/commit.template".source = pkgs.writeText "commit.template" '' + xdg.dataFile."git/commit.template".source = + pkgs.writeText "commit.template" '' - # (If applied, this commit will...) + # (If applied, this commit will...) - # Explain why this change is being made + # Explain why this change is being made - # --- COMMIT END --- - # Remember to - # Use the imperative mood, present tense: `change' not `changed' nor `changes' - # Do not end the subject line with a period - # Use the body to explain what and why vs. how - # Can use multiple lines with "-" for bullet points in body -''; + # --- COMMIT END --- + # Remember to + # Use the imperative mood, present tense: `change' not `changed' nor `changes' + # Do not end the subject line with a period + # Use the body to explain what and why vs. how + # Can use multiple lines with "-" for bullet points in body + ''; - home.packages = with pkgs; [ - gitAndTools.pre-commit - git-credential-manager - ]; + home.packages = with pkgs; [ gitAndTools.pre-commit git-credential-manager ]; } -- cgit 1.4.1