diff --git a/flake.nix b/flake.nix index e5ace4e..76dd665 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,7 @@ rec { outputs = { self, nixpkgs, nixpkgs-unstable, ... }@inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" "aarch64-linux" ]; - imports = [ ./lib ./overlays.nix ]; + imports = [ ./pkgs/flake-module.nix ./lib ./overlays.nix ]; flake = { inherit nixConfig; @@ -195,13 +195,6 @@ rec { config.allowUnfree = true; }; - packages = import ./pkgs { inherit pkgs; }; - - apps = { - deconz = - inputs.flake-utils.lib.mkApp { drv = config.packages.deconz; }; - }; - devShells.default = pkgs.mkShell { inherit (config.checks.pre-commit) shellHook; }; diff --git a/pkgs/default.nix b/pkgs/default.nix deleted file mode 100644 index 81f2944..0000000 --- a/pkgs/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: - -{ - brlaser = pkgs.callPackage ./brlaser { }; - deconz = pkgs.qt5.callPackage ./deconz { }; -} diff --git a/pkgs/flake-module.nix b/pkgs/flake-module.nix new file mode 100644 index 0000000..e719dce --- /dev/null +++ b/pkgs/flake-module.nix @@ -0,0 +1,12 @@ +_: { + perSystem = { inputs, self', pkgs, ... }: { + packages = { + brlaser = pkgs.callPackage ./brlaser { }; + deconz = pkgs.qt5.callPackage ./deconz { }; + }; + + apps = { + deconz = inputs.flake-utils.lib.mkApp { drv = self'.packages.deconz; }; + }; + }; +}