Git - Revision history

RyoKimball: editing "settings.user" gets an error; intended property is "config.user"

2026-04-24T05:12:41Z

editing "settings.user" gets an error; intended property is "config.user"

← Older revision		Revision as of 05:12, 24 April 2026
Line 32:		Line 32:
	programs.git = {		programs.git = {
	enable = true;		enable = true;
	~~settings~~.user = {		config.user = {
	name = "John Doe";		name = "John Doe";
	email = "johndoe@example.com";		email = "johndoe@example.com";

Loligh: set KbdInteractiveAuthentication to no for the git user, since it allows for access via password instead of an ssh key

2026-04-16T13:48:44Z

set KbdInteractiveAuthentication to no for the git user, since it allows for access via password instead of an ssh key

← Older revision		Revision as of 13:48, 16 April 2026
Line 189:		Line 189:
	AllowAgentForwarding no		AllowAgentForwarding no
	PasswordAuthentication no		PasswordAuthentication no
			KbdInteractiveAuthentication no
	PermitTTY no		PermitTTY no
	X11Forwarding no		X11Forwarding no

Phobos at 01:50, 20 January 2026

2026-01-20T01:50:43Z

← Older revision		Revision as of 01:50, 20 January 2026
Line 1:		Line 1:
	[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 ~~linux~~ kernel). Git is used to maintain NixOS packages, as well as many other projects, including sources for the Linux kernel.		[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 ==		== Installing and configuring Git ==

Isabelroses: extraConfig -> settings

2025-12-23T19:44:13Z

extraConfig -> settings

← Older revision		Revision as of 19:44, 23 December 2025
Line 81:		Line 81:
	</syntaxhighlight>		</syntaxhighlight>

	To your <code>~/.config/git/config</code>, you can add the below to <code>~~extraConfig~~</code>		To your <code>~/.config/git/config</code>, you can add the below to <code>settings</code>

	<syntaxhighlight lang="nix">		<syntaxhighlight lang="nix">

Pigs: improve wording, add additional information on git installation and configuring

2025-12-21T17:33:38Z

improve wording, add additional information on git installation and configuring

← Older revision		Revision as of 17:33, 21 December 2025
Line 1:		Line 1:
	[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 linux kernel). Git is used to maintain NixOS packages, as well as many other projects, including sources for the Linux kernel.		[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 linux kernel). Git is used to maintain NixOS packages, as well as many other projects, including sources for the Linux kernel.

	== ~~Installation~~ ==		== Installing and configuring Git ==

	~~Install~~ the ~~<code>git</code> package~~.		On NixOS, Git can be installed and configured at either the system level or the user level with [[Home Manager]].

	=== ~~Additional features~~ ===		=== System-wide installation ===

	~~Install~~ <~~code~~>tk</~~code~~> ~~to use~~ the git ~~gui~~:		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}}.

	~~<syntaxhighlight lang=console>~~		{{note\|Configuration options provided by this module are applied at the system level and therefore apply to all users on the system.}}
	~~$ git citool~~
	~~</syntaxhighlight>~~

	~~Or you may wish to install the <code>gitFull</code> package, which includes <code>git gui</code>, <code>gitk</code>, etc.~~		=== User-level configuration with Home Manager ===

	~~== Configuration ==~~
	Git can be configured using [[Home Manager]]:		Git can be configured using [[Home Manager]]:

Line 63:		Line 74:
	}</syntaxhighlight>		}</syntaxhighlight>

	~~For example to~~ add additional configuration you can specify options in an attribute set, so to add something like this:		To add additional configuration you can specify options in an attribute set, so to add something like this:

	<syntaxhighlight lang="ini">		<syntaxhighlight lang="ini">
Line 85:		Line 96:
	</syntaxhighlight>		</syntaxhighlight>

	=== Using your public SSH key as a signing key ===		==== Using your public SSH key as a signing key ====
	~~You can naturally~~ configure git to automatically sign your commits using your public SSH key like so:<syntaxhighlight lang="nix">
			To configure git to automatically sign your commits using your public SSH key like so:

			<syntaxhighlight lang="nix">
	{		{
	programs.git = {		programs.git = {
Line 101:		Line 115:
	};		};
	}		}
	</syntaxhighlight>However, note that this will also require Home Manager to manage your SSH configuration:<syntaxhighlight lang="nix">{		</syntaxhighlight>

			However, note that this will also require Home Manager to manage your SSH configuration:

			<syntaxhighlight lang="nix">{
	programs.ssh = {		programs.ssh = {
	enable = true;		enable = true;
Line 107:		Line 125:
	};		};
	}</syntaxhighlight>		}</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 ==		== Management of the <code>nixpkgs</code> git repository ==
Line 112:		Line 147:
	<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.		<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.

	=== ~~git ===~~		=== Garbage collecting ===

	~~git itself might not perform as usual with the default settings~~

	~~==== <code>git-gc</code> =~~===

	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 200:		Line 231:
	== Bisecting Nix regressions ==		== Bisecting Nix regressions ==

	~~see [[~~bisecting]]		{{main\|bisecting}}

	[[Category:Applications]]		[[Category:Applications]]
	[[Category:CLI Applications]]		[[Category:CLI Applications]]
	[[Category:Version control]]		[[Category:Version control]]

Kaya: Replace deprecated extraConfig with settings

2025-11-18T21:31:17Z

Replace deprecated extraConfig with settings

← Older revision		Revision as of 21:31, 18 November 2025
Line 51:		Line 51:
	Configure git-credential-helper with libsecret:		Configure git-credential-helper with libsecret:

	<syntaxhighlight lang="nix">		<syntaxhighlight lang="nix">{ pkgs, ... }:
	{ pkgs, ... }:

	{		{
Line 58:		Line 57:
	enable = true;		enable = true;
	package = pkgs.git.override { withLibsecret = true; };		package = pkgs.git.override { withLibsecret = true; };
	~~extraConfig~~ = {		settings = {
	credential.helper = "libsecret";		credential.helper = "libsecret";
	};		};
	};		};
	}		}</syntaxhighlight>
	</syntaxhighlight>

	For example to add additional configuration you can specify options in an attribute set, so to add something like this:		For example to add additional configuration you can specify options in an attribute set, so to add something like this:
Line 80:		Line 78:
	programs.git = {		programs.git = {
	enable = true;		enable = true;
	~~extraConfig~~ = {		settings = {
	push = { autoSetupRemote = true; };		push = { autoSetupRemote = true; };
	};		};
Line 96:		Line 94:
	signByDefault = true;		signByDefault = true;
	};		};
	~~extraConfig~~ = {		settings = {
	gpg = {		gpg = {
	format = "ssh";		format = "ssh";
Line 103:		Line 101:
	};		};
	}		}
	</syntaxhighlight>However, note that this will also require Home Manager to manage your SSH configuration:<syntaxhighlight lang="nix">		</syntaxhighlight>However, note that this will also require Home Manager to manage your SSH configuration:<syntaxhighlight lang="nix">{
	{
	programs.ssh = {		programs.ssh = {
	enable = true;		enable = true;
	addKeysToAgent = "yes";		addKeysToAgent = "yes";
	};		};
	}		}</syntaxhighlight>
	</syntaxhighlight>

	== Management of the <code>nixpkgs</code> git repository ==		== Management of the <code>nixpkgs</code> git repository ==

Kaya: Update aliases from deprecated options

2025-11-18T21:18:12Z

Update aliases from deprecated options

← Older revision		Revision as of 21:18, 18 November 2025
Line 33:		Line 33:
	programs.git = {		programs.git = {
	enable = true;		enable = true;
	~~aliases~~ = {		settings.alias = {
	ci = "commit";		ci = "commit";
	co = "checkout";		co = "checkout";

Kaya: Update git example from deprecated user options to new ones

2025-11-18T21:10:56Z

Update git example from deprecated user options to new ones

← Older revision		Revision as of 21:10, 18 November 2025
Line 21:		Line 21:
	programs.git = {		programs.git = {
	enable = true;		enable = true;
	~~userName~~ = "John Doe";		settings.user = {
	~~userEmail~~ = "johndoe@example.com";		name = "John Doe";
			email = "johndoe@example.com";
			};
	};		};
	</syntaxhighlight>		</syntaxhighlight>

Aljustiet: change number of commits said in the page from 160 000 to 889 000.

2025-11-04T12:05:15Z

change number of commits said in the page from 160 000 to 889 000.

← Older revision		Revision as of 12:05, 4 November 2025
Line 112:		Line 112:
	== Management of the <code>nixpkgs</code> git repository ==		== Management of the <code>nixpkgs</code> git repository ==

	<code>nixpkgs</code> has become a git repository of quite substantial size with > ~~160 000~~ commits (as of ~~early 2019~~). 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.		<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.

	=== git ===		=== git ===

Aljustiet at 11:42, 4 November 2025

2025-11-04T11:42:35Z

← Older revision		Revision as of 11:42, 4 November 2025
Line 1:		Line 1:
	[https://en.wikipedia.org/wiki/Git_(software) Git] is the version control system (VCS) designed ~~and developed~~ by Linus Torvalds~~, the~~ creator of ~~the Linux~~ kernel. Git is used to maintain NixOS packages, as well as many other projects, including sources for the Linux kernel.		[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 linux kernel). Git is used to maintain NixOS packages, as well as many other projects, including sources for the Linux kernel.

	== Installation ==		== Installation ==