From f727e15f2ce2a599937f5409e49396fb7e47ff51 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Wed, 8 Mar 2023 20:49:31 -0500
Subject: [PATCH] switched from a package overlay to having packages as an
 output

---
 flake.nix                       | 21 +++++++++++----------
 pkgs/default.nix                | 10 +++++-----
 systems/gerg-desktop/parrot.nix |  3 ++-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index 90ebb1e..40c4766 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,7 +65,6 @@
             (import ./systems/gerg-desktop inputs)
             {
               nixpkgs.overlays = [
-                (import ./pkgs)
                 nvim-flake.overlays.default
               ];
             }
@@ -115,15 +114,17 @@
           };
           default = nix;
         };
-        packages = {
-          nixos-iso = nixos-generators.nixosGenerate {
-            inherit system;
-            format = "install-iso";
-            modules = [
-              (import ./iso inputs)
-            ];
-          };
-        };
+        packages =
+          {
+            nixos-iso = nixos-generators.nixosGenerate {
+              inherit system;
+              format = "install-iso";
+              modules = [
+                (import ./iso inputs)
+              ];
+            };
+          }
+          // (import ./pkgs pkgs);
       }
     );
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 6045afc..43f1590 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,5 +1,5 @@
-(final: _: {
-  t-rex-miner = final.callPackage ./t-rex-miner {};
-  afk-cmds = final.callPackage ./afk-cmds {};
-  parrot = final.callPackage ./parrot {};
-})
+pkgs: {
+  t-rex-miner = pkgs.callPackage ./t-rex-miner {};
+  afk-cmds = pkgs.callPackage ./afk-cmds {};
+  parrot = pkgs.callPackage ./parrot {};
+}
diff --git a/systems/gerg-desktop/parrot.nix b/systems/gerg-desktop/parrot.nix
index 3da061d..c55bec6 100644
--- a/systems/gerg-desktop/parrot.nix
+++ b/systems/gerg-desktop/parrot.nix
@@ -1,6 +1,7 @@
 _: {
   pkgs,
   config,
+  self,
   ...
 }: {
   #discord bot stuff
@@ -9,7 +10,7 @@ _: {
     wantedBy = ["multi-user.target"];
     wants = ["network-online.target"];
     after = ["network-online.target"];
-    script = "${pkgs.parrot}/bin/parrot";
+    script = "${self.packages.${pkgs.system}.parrot}/bin/parrot";
     serviceConfig = {
       EnvironmentFile = config.sops.secrets.discordenv.path;
       Restart = "on-failure";