From ddd440d87c1fd1b10d61f445b02b7e8f0435f10e Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Thu, 26 Jun 2025 20:48:39 +0200 Subject: [PATCH] niri: add lastest swww Waow, namespace support! --- modules/wms/wayland/niri/module.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/wms/wayland/niri/module.nix b/modules/wms/wayland/niri/module.nix index ced7ddb..82612dd 100644 --- a/modules/wms/wayland/niri/module.nix +++ b/modules/wms/wayland/niri/module.nix @@ -1,5 +1,6 @@ { config, + inputs, lib, pkgs, ... @@ -9,6 +10,27 @@ inherit (config.modules.system) isGraphical; cfg = config.modules.desktops.niri; + + latestNightly = (inputs.rust-overlay.lib.mkRustBin {} pkgs).nightly.latest.default; + rustPlatform = pkgs.makeRustPlatform { + rustc = latestNightly; + cargo = latestNightly; + stdenv = pkgs.clangStdenv; + }; + + new-swww = (pkgs.swww.override {inherit rustPlatform;}).overrideAttrs (prev: { + src = pkgs.fetchFromGitHub { + inherit (prev.src) owner repo; + rev = "398a4048e389341dfd55285c53518a8ea3930ec4"; + hash = "sha256-ZAC5TbkshztW2IeDorhaxUmVCHf2tJCSGIGHSNl91Ns"; + }; + doInstallCheck = false; + + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { + inherit (new-swww) src; + hash = "sha256-YH2gcy/8EtUmTHzwt38bBOFX3saN1wHIGQ5/eWqvSeM="; + }; + }); in { options.modules.desktops.niri.enable = mkEnableOption "Niri, a scolling tiling wayland compositor"; @@ -28,6 +50,7 @@ in { environment.systemPackages = builtins.attrValues { inherit (pkgs) xwayland-satellite avizo; + inherit new-swww; }; xdg.portal = { @@ -35,11 +58,15 @@ in { xdgOpenUsePortal = true; extraPortals = [ pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-gnome ]; config = { common.default = ["*"]; hyprland.default = ["gtk"]; }; + configPackages = [ + pkgs.niri + ]; }; }; }