Merge master into staging-next (5db7542a) · Commits · nix / nixpkgs

nixos/modules/services/display-managers/cosmic-greeter.nix

+13 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,11 @@ in
		};

		config = lib.mkIf cfg.enable {
		environment.systemPackages = [
		pkgs.cosmic-comp
		cfg.package
		];

		services.greetd = {
		enable = true;
		settings = {
		@@ -50,14 +55,22 @@ in
		};
		};

		systemd.tmpfiles.settings.cosmic-greeter."/run/cosmic-greeter".d = {
		group = "cosmic-greeter";
		mode = "0755";
		user = "cosmic-greeter";
		};

		# The greeter user is hardcoded in `cosmic-greeter`
		users.groups.cosmic-greeter = { };
		users.users.cosmic-greeter = {
		description = "COSMIC login greeter user";
		isSystemUser = true;
		home = "/var/lib/cosmic-greeter";
		homeMode = "0750";
		createHome = true;
		group = "cosmic-greeter";
		extraGroups = [ "video" ];
		};
		# Required for authentication
		security.pam.services.cosmic-greeter = { };

+1 −1

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ in

		settings = mkOption {
		type = types.submodule {
		freeformType = types.attrsOf (
		freeformType = types.lazyAttrsOf (
		types.nullOr (
		types.oneOf [
		types.str

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@
		withGTK3 ? withPgtk && !noGui,
		withGlibNetworking ? withPgtk \|\| withGTK3 \|\| (withX && withXwidgets),
		withGpm ? stdenv.hostPlatform.isLinux,
		# https://github.com/emacs-mirror/emacs/blob/master/etc/NEWS.27#L140-L142
		# https://github.com/emacs-mirror/emacs/blob/emacs-27.2/etc/NEWS#L118-L120
		withImageMagick ? false,
		# Emacs 30+ has native JSON support
		withJansson ? lib.versionOlder version "30",

+2 −0

Original line number	Diff line number	Diff line
		@@ -3758,6 +3758,8 @@ let
		};
		};

		prince781.vala = callPackage ./prince781.vala { };

		prisma.prisma = buildVscodeMarketplaceExtension {
		mktplcRef = {
		name = "prisma";

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		{
		lib,
		vala-language-server,
		vscode-utils,
		}:

		vscode-utils.buildVscodeMarketplaceExtension {
		mktplcRef = {
		name = "vala";
		publisher = "prince781";
		version = "1.1.0";
		hash = "sha256-LJJDKhwzbGznyiXeB8SYir3LOM7/quYhGae1m4X/s3M=";
		};

		nativeBuildInputs = [
		vala-language-server
		];

		meta = {
		changelog = "https://marketplace.visualstudio.com/items/prince781.vala/changelog";
		description = "Syntax highlighting and language support for the Vala / Genie languages";
		downloadPage = "https://marketplace.visualstudio.com/items?itemName=prince781.vala";
		homepage = "https://github.com/vala-lang/vala-vscode#readme";
		license = lib.licenses.mit;
		};
		}