From 4902f855c9818aaf78aa49378f4ba3f2c9924041 Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Thu, 18 May 2023 00:40:26 +0200
Subject: [PATCH] [Overlays] Move packages in more specific modules

---
 boot.nix            | 5 +++++
 desktop/browser.nix | 5 +++++
 overlays.nix        | 9 ---------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/boot.nix b/boot.nix
index 9bc02ec..ac126dc 100644
--- a/boot.nix
+++ b/boot.nix
@@ -187,6 +187,11 @@ in {
 
     };
 
+    nixpkgs.overlays = [(final: prev: {
+      # Use bleeding-edge linux firmware
+      linux-firmware = prev.unstable.linux-firmware;
+    })];
+
     boot = {
       initrd.kernelModules = [ ];
       initrd.availableKernelModules = [ "ehci_pci" ];
diff --git a/desktop/browser.nix b/desktop/browser.nix
index f457ea8..81df79f 100644
--- a/desktop/browser.nix
+++ b/desktop/browser.nix
@@ -44,6 +44,11 @@ in {
         vdhcoapp
       ];
 
+
+    nixpkgs.overlays = [(final: prev: {
+      myFirefox = (final.callPackage ../packages/firefox.nix cfg.browser.firefox.overrides);
+    })];
+
     aviallon.desktop.browser.firefox.overrides.extraNativeMessengingHosts = [
       vdhcoapp
     ];
diff --git a/overlays.nix b/overlays.nix
index 64b1890..e03ad8f 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -76,20 +76,11 @@ in
           ];
         });
 
-        myFFmpeg = let
-          withUnfree = super.unstable.ffmpeg-full.override { withUnfree = true; };
-          withTensorflow = withUnfree.overrideAttrs (old: {
-            buildInputs = (old.buildInputs or []) ++ [ super.libtensorflow ];
-            configureFlags = (old.configureFlags or []) ++ [ "--enable-libtensorflow" ];
           });
-        in withTensorflow;
 
         amdctl = super.callPackage ./packages/amdctl.nix {};
 
-        # Use bleeding-edge linux firmware
-        linux-firmware = super.unstable.linux-firmware;
 
-        myFirefox = (super.callPackage ./packages/firefox.nix config.aviallon.desktop.browser.firefox.overrides);
       })
       (final: prev: {
         # Use our kernel for generating linux man pages