diff --git a/modules/wms/wayland/niri/module.nix b/modules/wms/wayland/niri/module.nix index e3bd50b..9c06a83 100644 --- a/modules/wms/wayland/niri/module.nix +++ b/modules/wms/wayland/niri/module.nix @@ -1,37 +1,15 @@ { config, - inputs, lib, pkgs, ... }: let inherit (lib.modules) mkForce mkIf; inherit (lib.options) mkEnableOption; - 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 = "805a355da574fed46e664606660e2499f02e2174"; - hash = "sha256-+sdV7NFueCeBLrsl7lrqzlG5tPNqDe/zlcIb8TYxQl8="; - }; - doInstallCheck = false; - - cargoDeps = pkgs.rustPlatform.fetchCargoVendor { - inherit (new-swww) src; - hash = "sha256-YH2gcy/8EtUmTHzwt38bBOFX3saN1wHIGQ5/eWqvSeM="; - }; - }); - patched-niri = pkgs.niri.overrideAttrs (prev: { src = pkgs.fetchFromGitHub { inherit (prev.src) owner repo; @@ -68,7 +46,6 @@ in { environment.systemPackages = builtins.attrValues { inherit (pkgs) xwayland-satellite avizo playerctl; - inherit new-swww; }; }; }