feat: move overlays to modules

flake/config.nix

@@ -14,10 +14,9 @@
       };
 
       # TODO: Move these to custom modules
-      overlays = with inputs; [
-        lix.overlays.default
-        nur.overlays.default
-        niri-flake.overlays.niri
+      overlays = [
+        # Lix pollutes my terminal with warnings if I move this to a module :(
+        inputs.lix.overlays.default
 
         (import ./overlays/ddclient.nix)
         (import ./overlays/firefox-addons {
@@ -25,7 +24,6 @@
           inherit inputs;
         })
         (import ./overlays/jetbrains.nix {inherit inputs;})
-        (import ./overlays/maple-mono-NF.nix)
         (import ./overlays/marleyvim.nix {inherit inputs;})
         (import ./overlays/wezterm.nix {inherit inputs;})
 

modules/base/nix.nix

@@ -50,8 +50,14 @@
       };
     };
 
-    nixpkgs.config = {
-      allowUnfree = true;
+    nixpkgs = {
+      config = {
+        allowUnfree = true;
+      };
+
+      overlays = [
+        inputs.nur.overlays.default
+      ];
     };
 
     # More useful repl.

modules/base/stylix/default.nix

@@ -1,5 +1,7 @@
 {pkgs, ...}: {
   config = {
+    nixpkgs.overlays = [(import ../../../overlays/maple-mono-NF.nix)];
+
     stylix = {
       enable = true;
 

modules/home/shell/niri.nix

@@ -4,6 +4,7 @@
   osConfig,
   lib,
   pkgs,
+  inputs,
   ...
 }: let
   inherit (marleylib.module) mkEnableOption' enabled;
@@ -22,6 +23,8 @@ in {
   };
 
   config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
+    nixpkgs.overlays = [inputs.niri-flake.overlays.niri];
+
     marleyos = {
       shell.wayland = enabled;
       programs = {

modules/nixos/shell/niri.nix

@@ -14,6 +14,8 @@ in {
   imports = [inputs.niri-flake.nixosModules.niri];
 
   config = lib.mkIf cfg.enable {
+    nixpkgs.overlays = [inputs.niri-flake.overlays.niri];
+
     marleyos = {
       shell.hyprlock = enabled;
       programs = {