diff options
| -rw-r--r-- | modules/by-name/gi/git/module.nix | 41 | ||||
| -rw-r--r-- | modules/home.legacy/conf/mail/default.nix | 2 |
2 files changed, 23 insertions, 20 deletions
diff --git a/modules/by-name/gi/git/module.nix b/modules/by-name/gi/git/module.nix index a70c38d7..36449c06 100644 --- a/modules/by-name/gi/git/module.nix +++ b/modules/by-name/gi/git/module.nix @@ -21,21 +21,36 @@ in { enable = lib.mkEnableOption "an opinionated git config"; defaultBranchName = lib.mkOption { type = lib.types.str; - description = "The Name of the default branch."; + description = "The name of the default branch."; default = "prime"; }; }; config = lib.mkIf cfg.enable { home-manager.users.soispha = { + programs.delta = { + enable = true; + enableGitIntegration = true; + options = { + decorations = { + commit-decoration-style = "bold yellow box ul"; + file-decoration-style = "none"; + file-style = "bold yellow ul"; + }; + keep-plus-minus-markers = true; + features = "decorations"; + whitespace-error-style = "22 reverse"; + }; + }; + programs.git = { enable = true; #package = pkgs.gitAndTools.gitFull; # TODO: for git send-email support - aliases = import ./aliases.nix { - inherit lib; - inherit (cfg) defaultBranchName; - }; - extraConfig = { + settings = { + aliases = import ./aliases.nix { + inherit lib; + inherit (cfg) defaultBranchName; + }; core = { excludesFile = "${gitIgnoreFile}"; }; @@ -100,19 +115,7 @@ in { }; }; }; - delta = { - enable = true; - options = { - decorations = { - commit-decoration-style = "bold yellow box ul"; - file-decoration-style = "none"; - file-style = "bold yellow ul"; - }; - keep-plus-minus-markers = true; - features = "decorations"; - whitespace-error-style = "22 reverse"; - }; - }; + signing = { key = "8321ED3A8DB999A51F3BF80FF2682914EA42DE26"; signByDefault = true; diff --git a/modules/home.legacy/conf/mail/default.nix b/modules/home.legacy/conf/mail/default.nix index 17957c82..1805606c 100644 --- a/modules/home.legacy/conf/mail/default.nix +++ b/modules/home.legacy/conf/mail/default.nix @@ -58,5 +58,5 @@ in { inherit accounts; }; - programs.git.extraConfig = accountCredentials; + programs.git.settings = accountCredentials; } |