From b67e154777ec04614899c7fe36a30927a88d75ad Mon Sep 17 00:00:00 2001
From: Danilo Reyes <danilo.reyes.251@proton.me>
Date: Tue, 11 Nov 2025 16:14:10 -0600
Subject: [PATCH] lib fix?....

---
 flake.nix               | 65 ++++++++++++++++++-----------------------
 nixos/lidarr-mb-gap.nix |  1 -
 2 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/flake.nix b/flake.nix
index d995456..3ae0bcf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,36 +1,40 @@
 {
   description = "Lidarr to MusicBrainz Missing Albums Finder";
 
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
   outputs =
-    { nixpkgs, flake-utils, self }:
+    { nixpkgs }:
     let
-      # NixOS module output (not system-specific)
-      # The module accepts a package option, which can be set from the flake's packages
-      nixosModules = {
-        lidarr-mb-gap = import ./nixos/lidarr-mb-gap.nix;
+      system = "x86_64-linux";
+      pkgs = import nixpkgs { inherit system; };
+      lib = pkgs.lib;
+      lidarr-mb-gap = import ./nix/package.nix {
+        inherit pkgs;
+        src = lib.cleanSource ./src;
       };
     in
     {
-      # Export NixOS modules
-      nixosModules = nixosModules;
-    }
-    // flake-utils.lib.eachDefaultSystem (
-      system:
-      let
-        pkgs = import nixpkgs { inherit system; };
-        lib = pkgs.lib;
-        lidarr-mb-gap = import ./nix/package.nix {
-          inherit pkgs lib;
-          src = lib.cleanSource ./src;
+      nixosModules.lidarr-mb-gap = import ./nixos/lidarr-mb-gap.nix;
+
+      packages.${system} = {
+        default = lidarr-mb-gap;
+        lidarr-mb-gap = lidarr-mb-gap;
+      };
+
+      apps.${system} = {
+        default = {
+          type = "app";
+          program = "${lidarr-mb-gap}/bin/lidarr-mb-gap";
         };
-      in
-      {
-        devShells.default = pkgs.mkShell {
+        lidarr-mb-gap = {
+          type = "app";
+          program = "${lidarr-mb-gap}/bin/lidarr-mb-gap";
+        };
+      };
+
+      devShells.${system} = {
+        default = pkgs.mkShell {
           buildInputs = [
             (pkgs.python3.withPackages (
               ps: with ps; [
@@ -46,17 +50,6 @@
             echo "Format code with: black src/"
           '';
         };
-
-        packages.default = lidarr-mb-gap;
-        packages.lidarr-mb-gap = lidarr-mb-gap;
-        apps.default = {
-          type = "app";
-          program = "${lidarr-mb-gap}/bin/lidarr-mb-gap";
-        };
-        apps.lidarr-mb-gap = {
-          type = "app";
-          program = "${lidarr-mb-gap}/bin/lidarr-mb-gap";
-        };
-      }
-    );
+      };
+    };
 }
diff --git a/nixos/lidarr-mb-gap.nix b/nixos/lidarr-mb-gap.nix
index 74f425a..7ed95c1 100644
--- a/nixos/lidarr-mb-gap.nix
+++ b/nixos/lidarr-mb-gap.nix
@@ -16,7 +16,6 @@ let
     else if config.services.lidarr-mb-gap.src != null then
       import ../nix/package.nix {
         inherit pkgs;
-        lib = pkgs.lib;
         src = config.services.lidarr-mb-gap.src;
       }
     else