modules.server: split git, use system direnv

This commit is contained in:
2024-05-30 14:08:44 +08:00
parent 7c1fba7939
commit 0a672ca144
2 changed files with 53 additions and 48 deletions

52
modules/packages/git.nix Normal file
View File

@@ -0,0 +1,52 @@
inputs:
{
config = inputs.lib.mkIf (builtins.elem "server" inputs.config.nixos.packages._packageSets)
{
home-manager.users.chn.config.programs.git =
{
enable = true;
package = inputs.pkgs.gitFull;
extraConfig =
{
core.editor = if inputs.config.nixos.system.gui.preferred then "code --wait" else "vim";
http.postBuffer = 624288000;
advice.detachedHead = false;
merge.conflictstyle = "diff3";
diff.colorMoved = "default";
lfs =
{
concurrenttransfers = 10;
activitytimeout = 3600;
dialtimeout = 3600;
keepalive = 3600;
tlstimeout = 3600;
transfer.maxretries = 1;
};
};
delta =
{
enable = true;
options =
{
side-by-side = true;
navigate = true;
syntax-theme = "GitHub";
light = true;
zero-style = "syntax white";
line-numbers-zero-style = "#ffffff";
};
};
};
programs.git =
{
enable = true;
package = inputs.pkgs.gitFull;
lfs.enable = true;
config =
{
init.defaultBranch = "main";
core = { quotepath = false; editor = "vim"; };
};
};
};
}

View File

@@ -45,43 +45,6 @@ inputs:
{
config.programs =
{
direnv = { enable = true; nix-direnv.enable = true; };
git =
{
enable = true;
lfs.enable = true;
extraConfig =
{
core.editor = if inputs.config.nixos.system.gui.preferred then "code --wait" else "vim";
http.postBuffer = 624288000;
advice.detachedHead = false;
merge.conflictstyle = "diff3";
diff.colorMoved = "default";
lfs =
{
concurrenttransfers = 10;
activitytimeout = 3600;
dialtimeout = 3600;
keepalive = 3600;
tlstimeout = 3600;
transfer.maxretries = 1;
};
};
package = inputs.pkgs.gitFull;
delta =
{
enable = true;
options =
{
side-by-side = true;
navigate = true;
syntax-theme = "GitHub";
light = true;
zero-style = "syntax white";
line-numbers-zero-style = "#ffffff";
};
};
};
vim =
{
enable = true;
@@ -109,17 +72,7 @@ inputs:
nix-index.enable = true;
command-not-found.enable = false;
autojump.enable = true;
git =
{
enable = true;
package = inputs.pkgs.gitFull;
lfs.enable = true;
config =
{
init.defaultBranch = "main";
core = { quotepath = false; editor = "vim"; };
};
};
direnv = { enable = true; nix-direnv.enable = true; };
};
services.udev.packages = with inputs.pkgs; [ yubikey-personalization libfido2 ];
home-manager = { useGlobalPkgs = true; useUserPackages = true; };