nixos/hyprland: use generic wayland-session module (a4160dfe) · Commits · nix / nixpkgs

nixos/modules/programs/wayland/hyprland.nix

+21 −28

Original line number	Diff line number	Diff line
		{ config
		, lib
		, pkgs
		, ...
		}:
		{ config, lib, pkgs, ... }:

		let
		cfg = config.programs.hyprland;

		@@ -53,23 +50,13 @@ in
		};
		};

		config = lib.mkIf cfg.enable {
		config = lib.mkIf cfg.enable (lib.mkMerge [
		{
		environment.systemPackages = [ cfg.finalPackage ];

		fonts.enableDefaultPackages = lib.mkDefault true;
		hardware.opengl.enable = lib.mkDefault true;

		programs = {
		dconf.enable = lib.mkDefault true;
		xwayland.enable = lib.mkDefault cfg.xwayland.enable;
		};

		security.polkit.enable = true;

		services.displayManager.sessionPackages = [ cfg.finalPackage ];

		xdg.portal = {
		enable = lib.mkDefault true;
		extraPortals = [ finalPortalPackage ];
		configPackages = lib.mkDefault [ cfg.finalPackage ];
		};
		@@ -79,7 +66,13 @@ in
		DefaultEnvironment="PATH=$PATH:/run/current-system/sw/bin:/etc/profiles/per-user/%u/bin:/run/wrappers/bin"
		'';
		};
		};
		}

		(import ./wayland-session.nix {
		inherit lib pkgs;
		xwayland = cfg.xwayland.enable;
		})
		]);

		imports = [
		(lib.mkRemovedOptionModule

+1 −8

Original line number	Diff line number	Diff line
		@@ -14,12 +14,5 @@
		xwayland.enable = lib.mkDefault xwayland;
		};

		xdg.portal = {
		enable = lib.mkDefault true;

		extraPortals = [
		# For screen sharing
		pkgs.xdg-desktop-portal-wlr
		];
		};
		xdg.portal.wlr.enable = lib.mkDefault true;
		}