wrap niri and spotx overlays into overlay.modifications.

flake.nix

@@ -95,6 +95,7 @@
 
         overlays = {
           modifications = (import ./overlays/modifications { inherit inputs; });
+          additions = (import ./overlays/additions { inherit inputs; });
         };
 
         nixosConfigurations =

nixos/modules/default.nix

@@ -18,13 +18,10 @@
 
   config = {
     nixpkgs = {
-      overlays =
+      overlays = with outputs.overlays; [
-        (with outputs; [
+        modifications
-          overlays.modifications
+        additions
-        ])
+      ];
-        ++ (with inputs; [
-          niri-flake.overlays.niri
-        ]);
     };
   };
 }

overlays/additions/default.nix

@@ -0,0 +1,9 @@
+{ ... }@args:
+final: prev:
+let
+  inherit (prev) lib;
+  overlay-files = [
+  ];
+  overlay-list = map (file: import file args) overlay-files;
+in
+(lib.composeManyExtensions overlay-list) final prev

overlays/modifications/default.nix

@@ -4,6 +4,8 @@ let
   inherit (prev) lib;
   overlay-files = [
     ./helix.nix
+    ./spotify.nix
+    ./niri.nix
   ];
   overlay-list = map (file: import file args) overlay-files;
 in

overlays/modifications/niri.nix

@@ -0,0 +1 @@
+{ inputs, ... }: inputs.niri-flake.overlays.niri

overlays/modifications/spotify.nix

@@ -1 +1 @@
-
+{ inputs, ... }: inputs.oskars-dotfiles.overlays.spotx

users/spotify.nix

@@ -1,8 +1,5 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
-  nixpkgs.overlays = [
-    inputs.oskars-dotfiles.overlays.spotx
-  ];
   environment.systemPackages = with pkgs; [
     spotify
   ];