1 files changed, 30 insertions, 24 deletions

diff --git a/flake.nix b/flake.nix
index 6ab086f..f38ee8d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Wezterm configuration a la nixCats";
+  description = "Wezterm configuration à la nixCats";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs";
@@ -15,9 +15,13 @@
     };
   };
 
-  outputs = inputs@{ self, flake-parts, ... }: let
-    weznix = import ./modules/flake-module.nix;
-  in flake-parts.lib.mkFlake { inherit inputs self; } {
+  outputs =
+    inputs@{ flake-parts, ... }:
+    let
+      weznix = import ./modules/flake-module.nix;
+      nixToLua = import inputs.nixToLua;
+    in
+    flake-parts.lib.mkFlake { inherit inputs; } {
       systems = import inputs.systems;
 
       imports = [
@@ -26,33 +30,35 @@
       ];
 
       flake = {
-        overlays.default = import ./overlays { nixToLua = import inputs.nixToLua; };
+        overlays.default = _final: prev: { weznix = prev.callPackage ./pkgs/weznix { inherit nixToLua; }; };
         flakeModules.default = weznix;
       };
 
-      perSystem = { system, pkgs, config, ... }: {
-        treefmt = {
-          programs.nixfmt = {
-            enable = true;
-            strict = true;
+      perSystem =
+        { pkgs, config, ... }:
+        {
+          treefmt = {
+            programs.nixfmt = {
+              enable = true;
+              strict = true;
+            };
           };
-        };
 
-        devShells.default = pkgs.mkShellNoCC {
-          inputsFrom = [ config.treefmt.devShell ];
-          nativeBuildInputs = with pkgs; [
-            nixd
-            statix
-            deadnix
-          ];
-        };
+          devShells.default = pkgs.mkShellNoCC {
+            inputsFrom = [ config.treefmt.build.devShell ];
+            nativeBuildInputs = with pkgs; [
+              nixd
+              statix
+              deadnix
+            ];
+          };
 
-        weznix = {
-          wrapConfig = true;
-          luaPath = ./test;
-        };
+          weznix = {
+            wrapConfig = true;
+            luaPath = ./test;
+          };
 
-      };
+        };
 
     };
 }