From 21739b152d503181e1d9f7dc22f17a3d51dd8492 Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Sun, 21 Jul 2024 03:27:42 +0200
Subject: [PATCH] only apply overlays where needed

---
 modules/default.nix      | 10 ++--------
 modules/niri/default.nix |  9 +++++++--
 modules/user/default.nix |  1 -
 modules/user/firefox.nix |  3 ++-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/modules/default.nix b/modules/default.nix
index 2dac065..6806cd0 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -10,14 +10,8 @@
     ./vm
   ];
 
-  nixpkgs = {
-    overlays = [
-      inputs.nur.overlay
-    ];
-    config = {
-      allowUnfree = true;
-    };
-  };
+
+    nixpkgs.config.allowUnfree = true;
 
   environment.sessionVariables = {
     NIXOS_OZONE_WL = "1";
diff --git a/modules/niri/default.nix b/modules/niri/default.nix
index b30c237..4ce0eb4 100644
--- a/modules/niri/default.nix
+++ b/modules/niri/default.nix
@@ -1,5 +1,10 @@
-{ lib, config, pkgs, ... }: lib.mkIf config.withNiri {
-  programs.niri.enable = true;
+{ inputs, lib, config, pkgs, ... }: lib.mkIf config.withNiri {
+  nixpkgs.overlays = [ inputs.niri.overlays.niri ];
+
+  programs.niri = {
+    enable = true;
+    package = pkgs.niri-unstable;
+  };
 
   home-manager.users.${config.username} = {
     home.packages = with pkgs; [
diff --git a/modules/user/default.nix b/modules/user/default.nix
index e712ea9..302f4e9 100644
--- a/modules/user/default.nix
+++ b/modules/user/default.nix
@@ -5,7 +5,6 @@
   ];
 
   config = lib.mkIf config.full {
-
     # Audio
     security.rtkit.enable = true;
 
diff --git a/modules/user/firefox.nix b/modules/user/firefox.nix
index d0caed6..79f0819 100644
--- a/modules/user/firefox.nix
+++ b/modules/user/firefox.nix
@@ -1,4 +1,5 @@
-{ lib, config, pkgs, ... }: lib.mkIf config.full {
+{ inputs, lib, config, pkgs, ... }: lib.mkIf config.full {
+  nixpkgs.overlays = [ inputs.nur.overlay ];
   home-manager.users.${config.username} = {
     programs.firefox = {
       enable = true;