Merge staging-next into staging (a7e99502) · Commits · nix / nixpkgs

.devcontainer/devcontainer.json

+5 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,8 @@
		"ghcr.io/devcontainers/features/nix:1": {
		// fails in the devcontainer sandbox, enable sandbox via config instead
		"multiUser": false,
		"packages": "nixd,nixfmt-unstable",
		"packages": "nixpkgs.nixd,nixpkgs.nixfmt-rfc-style",
		"useAttributePath": true,
		"extraNixConfig": "experimental-features = nix-command flakes,sandbox = true"
		}
		},
		@@ -15,7 +16,9 @@
		"jnoortheen.nix-ide"
		],
		"settings": {
		"nix.formatterPath": "nixfmt-rfc-style",
		"[nix]": {
		"editor.formatOnSave": true
		},
		"nix.enableLanguageServer": true,
		"nix.serverPath": "nixd"
		}

+29 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,20 @@ in
		internal = true;
		};

		logout = lib.mkOption {
		# Reset the title bar when logging out. This protects against a remote
		# NixOS system clobbering your local terminal's title bar when you SSH
		# into the remote NixOS system and then log out.
		#
		# For more details, see: https://superuser.com/a/339946
		default = ''
		printf '\e]0;\a'
		'';
		description = ''
		Shell script code called during login bash shell logout.
		'';
		type = lib.types.lines;
		};
		};

		};
		@@ -197,6 +211,21 @@ in
		fi
		'';

		environment.etc.bash_logout.text = ''
		# /etc/bash_logout: DO NOT EDIT -- this file has been generated automatically.

		# Only execute this file once per shell.
		if [ -n "$__ETC_BASHLOGOUT_SOURCED" ] \|\| [ -n "$NOSYSBASHLOGOUT" ]; then return; fi
		__ETC_BASHLOGOUT_SOURCED=1

		${cfg.logout}

		# Read system-wide modifications.
		if test -f /etc/bash_logout.local; then
		. /etc/bash_logout.local
		fi
		'';

		# Configuration for readline in bash. We use "option default"
		# priority to allow user override using both .text and .source.
		environment.etc.inputrc.source = lib.mkOptionDefault ./inputrc;

+1 −1

Original line number	Diff line number	Diff line
		@@ -122,6 +122,6 @@ in
		usshAuth = true;
		};

		meta.maintainers = with lib.maintainers; [ azahi ];
		meta.maintainers = [ ];
		};
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,8 @@ in
		defaultText = lib.literalExpression ''
		{
		HBOX_STORAGE_DATA = "/var/lib/homebox/data";
		HBOX_STORAGE_SQLITE_URL = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
		HBOX_DATABASE_DRIVER = "sqlite3";
		HBOX_DATABASE_SQLITE_PATH = "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
		HBOX_OPTIONS_ALLOW_REGISTRATION = "false";
		HBOX_OPTIONS_CHECK_GITHUB_RELEASE = "false";
		HBOX_MODE = "production";
		@@ -44,7 +45,8 @@ in
		users.groups.homebox = { };
		services.homebox.settings = {
		HBOX_STORAGE_DATA = mkDefault "/var/lib/homebox/data";
		HBOX_STORAGE_SQLITE_URL = mkDefault "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
		HBOX_DATABASE_DRIVER = mkDefault "sqlite3";
		HBOX_DATABASE_SQLITE_PATH = mkDefault "/var/lib/homebox/data/homebox.db?_pragma=busy_timeout=999&_pragma=journal_mode=WAL&_fk=1";
		HBOX_OPTIONS_ALLOW_REGISTRATION = mkDefault "false";
		HBOX_OPTIONS_CHECK_GITHUB_RELEASE = mkDefault "false";
		HBOX_MODE = mkDefault "production";

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ import ./make-test-python.nix (
		{ lib, ... }:
		{
		name = "please";
		meta.maintainers = with lib.maintainers; [ azahi ];
		meta.maintainers = [ ];

		nodes.machine =
		{ ... }: