aaaaa

modules/desktop/niri.nix

@@ -28,6 +28,7 @@ in
   options.xyno.desktop.niri.enable = lib.mkEnableOption "enable the niri desktop with xynos config";
   options.xyno.desktop.niri.launcher = lib.mkOption { type = lib.types.str; };
   options.xyno.desktop.niri.term = lib.mkOption { type = lib.types.str; };
+  options.xyno.desktop.niri.extraConfig = lib.mkOption { type = lib.types.lines; };
   config = lib.mkIf cfg.enable {
     xyno.desktop = {
       foot.enable = lib.mkDefault true;
@@ -38,6 +39,9 @@ in
       waybar.enable = lib.mkDefault true;
       wpaperd.enable = lib.mkDefault true;
     };
+    nixpkgs.overlays = [
+        inputs.niri.overlays.default
+    ];
     home-manager.users.${config.xyno.system.user.name} =
       lib.mkIf config.xyno.presets.home-manager.enable
         (
@@ -77,17 +81,11 @@ in
       xwayland-satellite
     ];
     programs.niri.enable = true;
-    programs.niri.package = inputs.niri.packages.${pkgs.system}.default.overrideAttrs (prev: {
-      patches = prev.patches ++ [
-        (pkgs.fetchurl {
-          url = "https://patch-diff.githubusercontent.com/raw/YaLTeR/niri/pull/1907.patch";
-          hash = "sha256-XhG8Ga1/QMPXrF0FjQuBk8KZISbof4Md4kM73cG1SYQ=";
-        })
-      ];
-      
-    });
     environment.etc."niri/config.kdl".mode = "444"; # copy file so niri detects changes
     environment.etc."niri/config.kdl".text = ''
+      xwayland-satellite {
+        path "${pkgs.xwayland-satellite}/bin/xwayland-satellite"
+      }
       animations {
         off
       }
@@ -351,11 +349,6 @@ in
       // scratchpad
       // workspace "scratchpad"
 
-      // Put swaybg inside the overview backdrop.
-      layer-rule {
-          match namespace="^wpaperd.*$"
-          place-within-backdrop true
-      }
 
       screenshot-path "~/Pictures/screenshots/screenshot-%Y-%m-%d %H-%M-%S.png"
       // Indicate screencasted windows with red colors.
@@ -425,6 +418,7 @@ in
       }
       // autogenerated from here on
       ${matchFloat}
+      ${cfg.extraConfig}
     '';
   };
 }