Git: Difference between revisions
imported>IgorM m Fixed syntax highlighting |
mNo edit summary |
||
| (22 intermediate revisions by 13 users not shown) | |||
| Line 1: | Line 1: | ||
[https://en.wikipedia.org/wiki/Git_(software) Git] is the version control system (VCS) designed | [https://en.wikipedia.org/wiki/Git_(software) Git] is the version control system (VCS) developed by Junio C Hamano and designed by Linus Torvalds (Creator of the Linux kernel). Git is used to maintain NixOS packages, as well as many other projects, including sources for the Linux kernel. | ||
== | == Installing and configuring Git == | ||
On NixOS, Git can be installed and configured at either the system level or the user level with [[Home Manager]]. | |||
=== | === System-wide installation === | ||
Git can be installed system-wide either by adding it to the list of system environment packages: | |||
{{file|/etc/nixos/configuration.nix|nix|<nowiki> | |||
environment.systemPackages = with pkgs; [ | |||
git | |||
]; | |||
</nowiki>}} | |||
Or by enabling the NixOS Git module: | |||
{{file|/etc/nixos/configuration.nix|nix|<nowiki> | |||
programs.git.enable = true; | |||
</nowiki>}} | |||
Additional Git module configuration options can be found at {{nixos:option|programs.git}}. | |||
{{note|Configuration options provided by this module are applied at the system level and therefore apply to all users on the system.}} | |||
== | === User-level configuration with Home Manager === | ||
Git can be configured using [[Home Manager]]: | Git can be configured using [[Home Manager]]: | ||
| Line 22: | Line 32: | ||
programs.git = { | programs.git = { | ||
enable = true; | enable = true; | ||
settings.user = { | |||
name = "John Doe"; | |||
email = "johndoe@example.com"; | |||
}; | |||
}; | }; | ||
</syntaxhighlight> | </syntaxhighlight> | ||
| Line 32: | Line 44: | ||
programs.git = { | programs.git = { | ||
enable = true; | enable = true; | ||
settings.alias = { | |||
ci = "commit"; | ci = "commit"; | ||
co = "checkout"; | co = "checkout"; | ||
| Line 40: | Line 52: | ||
</syntaxhighlight> | </syntaxhighlight> | ||
Git [https://git-lfs.com/ LFS] can be enabled with: | |||
<syntaxhighlight lang="nix"> | |||
programs.git = { | |||
enable = true; | |||
lfs.enable = true; | |||
}; | |||
</syntaxhighlight> | |||
Configure git-credential-helper with libsecret: | Configure git-credential-helper with libsecret: | ||
<syntaxhighlight lang="nix">{ pkgs, ... }: | |||
{ | |||
programs.git = { | |||
enable = true; | |||
package = pkgs.git.override { withLibsecret = true; }; | |||
settings = { | |||
credential.helper = "libsecret"; | |||
}; | |||
}; | |||
}</syntaxhighlight> | |||
To add additional configuration you can specify options in an attribute set, so to add something like this: | |||
<syntaxhighlight lang="ini"> | |||
[push] | |||
autoSetupRemote = true | |||
</syntaxhighlight> | |||
To your <code>~/.config/git/config</code>, you can add the below to <code>settings</code> | |||
<syntaxhighlight lang="nix"> | <syntaxhighlight lang="nix"> | ||
| Line 48: | Line 89: | ||
programs.git = { | programs.git = { | ||
enable = true; | enable = true; | ||
settings = { | |||
push = { autoSetupRemote = true; }; | |||
}; | |||
} | }; | ||
} | |||
</syntaxhighlight> | |||
==== Using your public SSH key as a signing key ==== | |||
To configure git to automatically sign your commits using your public SSH key like so: | |||
<syntaxhighlight lang="nix"> | |||
{ | |||
programs.git = { | |||
enable = true; | |||
signing = { | |||
key = "ssh-ed25519 AAAAAAAAAAAA...AA username@hostname"; | |||
signByDefault = true; | |||
}; | |||
settings = { | |||
gpg = { | |||
format = "ssh"; | |||
}; | |||
}; | }; | ||
}; | }; | ||
| Line 57: | Line 117: | ||
</syntaxhighlight> | </syntaxhighlight> | ||
== | However, note that this will also require Home Manager to manage your SSH configuration: | ||
<syntaxhighlight lang="nix">{ | |||
programs.ssh = { | |||
enable = true; | |||
addKeysToAgent = "yes"; | |||
}; | |||
}</syntaxhighlight> | |||
=== Enabling Git UI === | |||
Install <code>tk</code> to use the git gui: | |||
<syntaxhighlight lang=console> | |||
$ git citool | |||
</syntaxhighlight> | |||
Or you may wish to install the <code>gitFull</code> package, which includes <code>git gui</code>, <code>gitk</code>, etc. This can be installed either through system environment packages or by setting the package module option: | |||
< | <syntaxhighlight lang="nix"> | ||
programs.git = { | |||
enable = true; | |||
package = pkgs.gitFull; | |||
}; | |||
</syntaxhighlight> | |||
== | == Management of the <code>nixpkgs</code> git repository == | ||
git | <code>nixpkgs</code> has become a git repository of quite substantial size with > 889 000 commits (as of late 2025). This brings many unoptimized tools to their limits, leading to long waiting times on certain operations. Here we’ll collect useful info on how to manage that. | ||
=== | === Garbage collecting === | ||
Normal <code>git gc</code> should work as usual, but you should force a full garbage collect every half a year or so. <code>git gc --aggressive</code> is the command for that. For the author it did not work on the first try, since their laptop’s memory was too small and it went out of memory. According to [https://stackoverflow.com/a/4829883/1382925|this StackOverflow] answer it suffices to set some local repository config variables. | Normal <code>git gc</code> should work as usual, but you should force a full garbage collect every half a year or so. <code>git gc --aggressive</code> is the command for that. For the author it did not work on the first try, since their laptop’s memory was too small and it went out of memory. According to [https://stackoverflow.com/a/4829883/1382925|this StackOverflow] answer it suffices to set some local repository config variables. | ||
| Line 75: | Line 157: | ||
worked well on a machine with about 6–8 GB of free RAM and two processor threads, and reduced the size of the <code>nixpkgs</code> checkout from ~1.3 GB to ~0.95 GB. | worked well on a machine with about 6–8 GB of free RAM and two processor threads, and reduced the size of the <code>nixpkgs</code> checkout from ~1.3 GB to ~0.95 GB. | ||
= Serve Git repos via SSH = | |||
This section implements [https://git-scm.com/book/en/v2/Git-on-the-Server-Setting-Up-the-Server Git on the Server - Setting Up the Server] on NixOS. | |||
See also: [[gitolite]]. | |||
== Configuration == | |||
<syntaxhighlight lang="nix"> | |||
{ config, pkgs, ... }: { | |||
users.users.git = { | |||
isSystemUser = true; | |||
group = "git"; | |||
home = "/var/lib/git-server"; | |||
createHome = true; | |||
shell = "${pkgs.git}/bin/git-shell"; | |||
openssh.authorizedKeys.keys = [ | |||
# FIXME: Add pubkeys of authorized users | |||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF38sHxXn/r7KzWL1BVCqcKqmZA/V76N/y5p52UQghw7 example" | |||
]; | |||
}; | |||
users.groups.git = {}; | |||
services.openssh = { | |||
enable = true; | |||
extraConfig = '' | |||
Match user git | |||
AllowTcpForwarding no | |||
AllowAgentForwarding no | |||
PasswordAuthentication no | |||
PermitTTY no | |||
X11Forwarding no | |||
''; | |||
}; | |||
} | |||
</syntaxhighlight> | |||
== Usage == | |||
1. Run this on the server to create repo <code>myproject</code> accessible by user <code>git</code> | |||
<syntaxhighlight lang="bash"> | |||
sudo -u git bash -c "git init --bare ~/myproject.git" | |||
</syntaxhighlight> | |||
(<code>~</code> here is the home of the user <code>git</code>, which is <code>/var/lib/git-server</code>) | |||
2. Push to the server repo from another system | |||
<syntaxhighlight lang="bash"> | |||
mkdir myproject | |||
cd myproject | |||
echo hello > a | |||
git init | |||
git add . | |||
git commit -m init | |||
git remote add origin git@myserver:myproject.git | |||
git push origin master | |||
</syntaxhighlight> | |||
3. Clone and edit the server repo from another system | |||
<syntaxhighlight lang="bash"> | |||
git clone git@myserver:myproject.git | |||
cd myproject | |||
cat a | |||
echo world >> a | |||
git commit -am hello | |||
git push origin master | |||
</syntaxhighlight> | |||
== Bisecting Nix regressions == | |||
{{main|bisecting}} | |||
[[Category:Applications]] | [[Category:Applications]] | ||
[[Category:CLI Applications]] | |||
[[Category:Version control]] | |||
Latest revision as of 01:50, 20 January 2026
Git is the version control system (VCS) developed by Junio C Hamano and designed by Linus Torvalds (Creator of the Linux kernel). Git is used to maintain NixOS packages, as well as many other projects, including sources for the Linux kernel.
Installing and configuring Git
On NixOS, Git can be installed and configured at either the system level or the user level with Home Manager.
System-wide installation
Git can be installed system-wide either by adding it to the list of system environment packages:
environment.systemPackages = with pkgs; [
git
];
Or by enabling the NixOS Git module:
programs.git.enable = true;
Additional Git module configuration options can be found at programs.git.
User-level configuration with Home Manager
Git can be configured using Home Manager:
programs.git = {
enable = true;
settings.user = {
name = "John Doe";
email = "johndoe@example.com";
};
};
Aliases can be added with:
programs.git = {
enable = true;
settings.alias = {
ci = "commit";
co = "checkout";
s = "status";
};
};
Git LFS can be enabled with:
programs.git = {
enable = true;
lfs.enable = true;
};
Configure git-credential-helper with libsecret:
{ pkgs, ... }:
{
programs.git = {
enable = true;
package = pkgs.git.override { withLibsecret = true; };
settings = {
credential.helper = "libsecret";
};
};
}
To add additional configuration you can specify options in an attribute set, so to add something like this:
[push]
autoSetupRemote = true
To your ~/.config/git/config, you can add the below to settings
{ pkgs, ... }:
{
programs.git = {
enable = true;
settings = {
push = { autoSetupRemote = true; };
};
};
}
Using your public SSH key as a signing key
To configure git to automatically sign your commits using your public SSH key like so:
{
programs.git = {
enable = true;
signing = {
key = "ssh-ed25519 AAAAAAAAAAAA...AA username@hostname";
signByDefault = true;
};
settings = {
gpg = {
format = "ssh";
};
};
};
}
However, note that this will also require Home Manager to manage your SSH configuration:
{
programs.ssh = {
enable = true;
addKeysToAgent = "yes";
};
}
Enabling Git UI
Install tk to use the git gui:
$ git citool
Or you may wish to install the gitFull package, which includes git gui, gitk, etc. This can be installed either through system environment packages or by setting the package module option:
programs.git = {
enable = true;
package = pkgs.gitFull;
};
Management of the nixpkgs git repository
nixpkgs has become a git repository of quite substantial size with > 889 000 commits (as of late 2025). This brings many unoptimized tools to their limits, leading to long waiting times on certain operations. Here we’ll collect useful info on how to manage that.
Garbage collecting
Normal git gc should work as usual, but you should force a full garbage collect every half a year or so. git gc --aggressive is the command for that. For the author it did not work on the first try, since their laptop’s memory was too small and it went out of memory. According to StackOverflow answer it suffices to set some local repository config variables.
$ git config pack.windowMemory 2g
$ git config pack.packSizeLimit 1g
worked well on a machine with about 6–8 GB of free RAM and two processor threads, and reduced the size of the nixpkgs checkout from ~1.3 GB to ~0.95 GB.
Serve Git repos via SSH
This section implements Git on the Server - Setting Up the Server on NixOS.
See also: gitolite.
Configuration
{ config, pkgs, ... }: {
users.users.git = {
isSystemUser = true;
group = "git";
home = "/var/lib/git-server";
createHome = true;
shell = "${pkgs.git}/bin/git-shell";
openssh.authorizedKeys.keys = [
# FIXME: Add pubkeys of authorized users
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF38sHxXn/r7KzWL1BVCqcKqmZA/V76N/y5p52UQghw7 example"
];
};
users.groups.git = {};
services.openssh = {
enable = true;
extraConfig = ''
Match user git
AllowTcpForwarding no
AllowAgentForwarding no
PasswordAuthentication no
PermitTTY no
X11Forwarding no
'';
};
}
Usage
1. Run this on the server to create repo myproject accessible by user git
sudo -u git bash -c "git init --bare ~/myproject.git"
(~ here is the home of the user git, which is /var/lib/git-server)
2. Push to the server repo from another system
mkdir myproject
cd myproject
echo hello > a
git init
git add .
git commit -m init
git remote add origin git@myserver:myproject.git
git push origin master
3. Clone and edit the server repo from another system
git clone git@myserver:myproject.git
cd myproject
cat a
echo world >> a
git commit -am hello
git push origin master
Bisecting Nix regressions
- Main article: bisecting