From 5b5d8eb4dca4e93f755b7a591bb0d0fb00325c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 4 Apr 2023 02:08:52 +0200
Subject: [PATCH] Make harmonia overlay local

---
 flake.nix            | 10 ++++++++--
 overlays/default.nix |  3 ---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index f8742592..59f00a96 100644
--- a/flake.nix
+++ b/flake.nix
@@ -273,7 +273,6 @@
 
           self.nixosModules.c3d2
           c3d2-user-module.nixosModule
-          harmonia.nixosModules.harmonia
           nixos-modules.nixosModule
           ./config
           ./modules/audio-server.nix
@@ -284,7 +283,7 @@
       };
     in {
       overlays = import ./overlays {
-        inherit (inputs) bevy-julia bevy-mandelbrot harmonia tracer;
+        inherit (inputs) bevy-julia bevy-mandelbrot tracer;
       };
 
       legacyPackages = lib.attrsets.mapAttrs (_: pkgs: pkgs.appendOverlays overlayList) nixos.legacyPackages;
@@ -436,6 +435,13 @@
             skyflake.nixosModules.default
             harmonia.nixosModules.harmonia
             ./hosts/hydra
+            {
+              nixpkgs.overlays = [
+                (final: prev: with final; {
+                  harmonia = harmonia.packages.${system}.harmonia.override { pkgs = prev // { rustPlatform = rustPackages_1_66.rustPlatform; }; };
+                })
+              ];
+            }
           ];
         };
 
diff --git a/overlays/default.nix b/overlays/default.nix
index 9bef3115..e6bffb01 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,6 +1,5 @@
 {  bevy-julia
 , bevy-mandelbrot
-, harmonia
 , tracer
 }:
 
@@ -36,8 +35,6 @@ with final; {
     commandLineArgs = "--enable-features=VaapiVideoEncoder,VaapiVideoDecoder,CanvasOopRasterization --force-dark-mode";
   };
 
-  harmonia = harmonia.packages.${system}.harmonia.override { pkgs = prev // { rustPlatform = rustPackages_1_66.rustPlatform; }; };
-
   # hydra flake
   hydra = prev.hydra.overrideAttrs (oldAttrs: {
     patches = oldAttrs.patches or [ ] ++ [