Git - Revision history

Sohomdatta1: added a more complex command to show how that can be added

2026-08-23T05:12:28Z

added a more complex command to show how that can be added

← Older revision		Revision as of 05:12, 23 August 2026
Line 47:		Line 47:
	co = "checkout";		co = "checkout";
	s = "status";		s = "status";
			sync = "!git pull --rebase && git push";
	};		};
	};</syntaxhighlight>		};</syntaxhighlight>

CNap: Changed `config.user` to correctly match `settings.user`

2026-07-28T04:04:58Z

Changed `config.user` to correctly match `settings.user`

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

Airone01: Links, citations, typos

2026-07-25T13:35:06Z

Links, citations, typos

← Older revision		Revision as of 13:35, 25 July 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 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 [[wikipedia:Version_control\|version control system (VCS)]] developed by Junio C Hamano and designed by [[wikipedia:Linus_Torvalds\|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 ==

	On NixOS, Git can be installed and configured at either the system level or the user level with [[Home Manager]].		On NixOS, Git can be installed and configured at either the system level with the NixOS module or the user level with [[Home Manager]].

	=== System-wide installation ===		=== System-wide installation ===
Line 41:		Line 41:
	Aliases can be added with:		Aliases can be added with:

	<syntaxhighlight lang="nix">		<syntaxhighlight lang="nix">programs.git = {
	programs.git = {
	enable = true;		enable = true;
	settings.alias = {		settings.alias = {
Line 49:		Line 48:
	s = "status";		s = "status";
	};		};
	};		};</syntaxhighlight>
	</syntaxhighlight>

	Git [https://git-lfs.com/ LFS] can be enabled with:		Git [https://git-lfs.com/ LFS] can be enabled with:
Line 60:		Line 58:
	};		};
	</syntaxhighlight>		</syntaxhighlight>
	Configure git-credential-helper with libsecret:		Configure git-credential-helper with <code>libsecret</code>:

	<syntaxhighlight lang="nix">{ pkgs, ... }:		<syntaxhighlight lang="nix">{ pkgs, ... }:
Line 76:		Line 74:
	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">[push]
	[push]		autoSetupRemote = true</syntaxhighlight>
	autoSetupRemote = true
	</syntaxhighlight>

	To your <code>~/.config/git/config</code>, you can add the below to <code>settings</code>		To your <code>~/.config/git/config</code>, you can add the below to <code>settings</code>
Line 145:		Line 141:
	== 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 > 1M commits (as of 2026). 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 > 1M commits<ref>https://github.com/NixOS/nixpkgs</ref> (as of 2026). 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 ===		=== 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.

	<syntaxhighlight lang=console>		<syntaxhighlight lang=console>
Line 156:		Line 152:
	</syntaxhighlight>		</syntaxhighlight>

	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.		This 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 =		= Serve Git repos via SSH =

Airone01: update nixpkgs commit count

2026-07-25T13:25:15Z

update nixpkgs commit count

← Older revision		Revision as of 13:25, 25 July 2026
Line 145:		Line 145:
	== 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 > ~~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 > 1M commits (as of 2026). 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 ===		=== Garbage collecting ===

DHCP: style fixes

2026-07-16T07:05:26Z

style fixes

← Older revision		Revision as of 07:05, 16 July 2026
Line 10:		Line 10:

	{{file\|/etc/nixos/configuration.nix\|nix\|<nowiki>		{{file\|/etc/nixos/configuration.nix\|nix\|<nowiki>
	environment.systemPackages = with pkgs; [		environment.systemPackages = with pkgs; [
	git		git
	];		];
	</nowiki>}}		</nowiki>}}

Line 18:		Line 18:

	{{file\|/etc/nixos/configuration.nix\|nix\|<nowiki>		{{file\|/etc/nixos/configuration.nix\|nix\|<nowiki>
	programs.git.enable = true;		programs.git.enable = true;
	</nowiki>}}		</nowiki>}}

Line 30:		Line 30:

	<syntaxhighlight lang="nix">		<syntaxhighlight lang="nix">
	programs.git = {		programs.git = {
	enable = true;		enable = true;
	config.user = {		config.user = {
	name = "John Doe";		name = "John Doe";
	email = "johndoe@example.com";		email = "johndoe@example.com";
	};
	};		};
			};
	</syntaxhighlight>		</syntaxhighlight>

Line 42:		Line 42:

	<syntaxhighlight lang="nix">		<syntaxhighlight lang="nix">
	programs.git = {		programs.git = {
	enable = true;		enable = true;
	settings.alias = {		settings.alias = {
	ci = "commit";		ci = "commit";
	co = "checkout";		co = "checkout";
	s = "status";		s = "status";
	};
	};		};
			};
	</syntaxhighlight>		</syntaxhighlight>

Line 55:		Line 55:

	<syntaxhighlight lang="nix">		<syntaxhighlight lang="nix">
	programs.git = {		programs.git = {
	enable = true;		enable = true;
	lfs.enable = true;		lfs.enable = true;
	};		};
	</syntaxhighlight>		</syntaxhighlight>
	Configure git-credential-helper with libsecret:		Configure git-credential-helper with libsecret:
Line 137:		Line 137:

	<syntaxhighlight lang="nix">		<syntaxhighlight lang="nix">
	programs.git = {		programs.git = {
	enable = true;		enable = true;
	package = pkgs.gitFull;		package = pkgs.gitFull;
	};		};
	</syntaxhighlight>		</syntaxhighlight>

Line 201:		Line 201:
	1. Run this on the server to create repo <code>myproject</code> accessible by user <code>git</code>		1. Run this on the server to create repo <code>myproject</code> accessible by user <code>git</code>

	<syntaxhighlight lang="~~bash~~">		<syntaxhighlight lang="console">
	sudo -u git bash -c "git init --bare ~/myproject.git"		$ sudo -u git bash -c "git init --bare ~/myproject.git"
	</syntaxhighlight>		</syntaxhighlight>
	(<code>~</code> here is the home of the user <code>git</code>, which is <code>/var/lib/git-server</code>)		(<code>~</code> here is the home of the user <code>git</code>, which is <code>/var/lib/git-server</code>)
Line 208:		Line 208:
	2. Push to the server repo from another system		2. Push to the server repo from another system

	<syntaxhighlight lang="~~bash~~">		<syntaxhighlight lang="console">
	mkdir myproject		$ mkdir myproject
	cd myproject		$ cd myproject
	echo hello > a		$ echo "hello" > a
	git init		$ git init
	git add .		$ git add .
	git commit -m init		$ git commit -m "init"
	git remote add origin git@myserver:myproject.git		$ git remote add origin git@myserver:myproject.git
	git push origin master		$ git push origin master
	</syntaxhighlight>		</syntaxhighlight>

	3. Clone and edit the server repo from another system		3. Clone and edit the server repo from another system

	<syntaxhighlight lang="~~bash~~">		<syntaxhighlight lang="console">
	git clone git@myserver:myproject.git		$ git clone git@myserver:myproject.git
	cd myproject		$ cd myproject
	cat a		$ cat a
	echo world >> a		$ echo "world" >> a
	git commit -am hello		$ git commit -am "hello"
	git push origin master		$ git push origin master
	</syntaxhighlight>		</syntaxhighlight>

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]]