1 files changed, 5 insertions, 55 deletions

diff --git a/flake.nix b/flake.nix
index 8cc182a..3e7839c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,75 +3,26 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     flake-utils.url = "github:numtide/flake-utils/main";
-    nix-filter.url = "github:numtide/nix-filter/main";
 
-    cq = {
-      url = "github:vinszent/cq-flake/main";
+    clef = {
+      url = "path:./clef";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
-
-    clef = {
-      url = "https://pub.npry.dev/clef";
-      flake = false;
-    };
   };
 
   description = "tiny kite-borne sensor node";
 
-  outputs = { self, nixpkgs, flake-utils, ... } @ inputs: let
-    kicadOverlay = final: prev: {
-      opencascade-occt_7_6 = prev.opencascade-occt_7_6.overrideAttrs (finalAttrs: prevAttrs: {
-        buildInputs = (prevAttrs.buildInputs or []) ++ [
-          prev.rapidjson
-        ];
-
-        cmakeFlags = (prevAttrs.cmakeFlags or []) ++ [
-          "-DUSE_RAPIDJSON=1"
-        ];
-      });
-
-      kicad = prev.kicad.override {
-        with3d = true;
-        withI18n = false;
-
-        addons = with prev.kicadAddons; [
-          kikit
-          kikit-library
-        ];
-      };
-
-      kikit = let
-        version = "1.6.0";
-
-      in prev.kikit.overridePythonAttrs {
-        inherit version;
-
-        src = final.fetchFromGitHub {
-          owner = "yaqwsx";
-          repo = "KiKit";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-r8LQcy3I6hmcrU/6HfPAYJd+cEZdhad6DUldC9HvXZU=";
-        };
-
-        doCheck = false;
-      };
-    };
-
+  outputs = { self, nixpkgs, flake-utils, clef, ... } @ inputs: let
     mkPkgs = system: import nixpkgs {
       inherit system;
 
       overlays = [
-        kicadOverlay
-        (final: prev: { nix-filter = inputs.nix-filter.lib; })
-
-        (final: prev: {
-          inherit (inputs.cq.packages.${system}) cadquery;
-        })
+        clef.overlays.default
       ];
     };
 
-    mkPkg = pkgs: pkgs.callPackage ./nix {
+    mkPkg = pkgs: pkgs.clef {
       name = "ocularium";
 
       src = ./.;
@@ -110,7 +61,6 @@
   ) // {
     overlays = {
       default = final: prev: self.packages.${prev.system};
-      kicad = kicadOverlay;
     };
   };
 }