diff --git a/flake.nix b/flake.nix index a9901b9..cdfadd9 100644 --- a/flake.nix +++ b/flake.nix @@ -393,7 +393,7 @@ imports = [ clan-core.flakeModules.default ./nix/formatter.nix - ./nix/packages.nix + ./nix/packages ]; # Define your clan diff --git a/nix/packages.nix b/nix/packages.nix deleted file mode 100644 index 02d7946..0000000 --- a/nix/packages.nix +++ /dev/null @@ -1,12 +0,0 @@ -_: { - perSystem = - { pkgs, ... }: - with pkgs; - { - packages.pkl = callPackage ../pkgs/pkl { }; - packages.otpmenu = callPackage ../pkgs/otpmenu { }; - #packages.sononym = callPackage ../pkgs/sononym { }; - #packages.sononym-crawler = callPackage ../pkgs/sononym-crawler { }; - packages.taskwarrior-hooks = callPackage ../pkgs/taskwarrior-hooks { }; - }; -} diff --git a/nix/packages/default.nix b/nix/packages/default.nix new file mode 100644 index 0000000..514b866 --- /dev/null +++ b/nix/packages/default.nix @@ -0,0 +1,12 @@ +_: { + perSystem = + { pkgs, ... }: + with pkgs; + { + packages.pkl = callPackage ./pkl { }; + packages.otpmenu = callPackage ./otpmenu { }; + #packages.sononym = callPackage ./sononym { }; + #packages.sononym-crawler = callPackage ./sononym-crawler { }; + packages.taskwarrior-hooks = callPackage ./taskwarrior-hooks { }; + }; +} diff --git a/pkgs/otpmenu/default.nix b/nix/packages/otpmenu/default.nix similarity index 100% rename from pkgs/otpmenu/default.nix rename to nix/packages/otpmenu/default.nix diff --git a/pkgs/pkl/default.nix b/nix/packages/pkl/default.nix similarity index 100% rename from pkgs/pkl/default.nix rename to nix/packages/pkl/default.nix diff --git a/pkgs/sononym-crawler/default.nix b/nix/packages/sononym-crawler/default.nix similarity index 100% rename from pkgs/sononym-crawler/default.nix rename to nix/packages/sononym-crawler/default.nix diff --git a/pkgs/sononym/default.nix b/nix/packages/sononym/default.nix similarity index 100% rename from pkgs/sononym/default.nix rename to nix/packages/sononym/default.nix diff --git a/pkgs/taskwarrior-hooks/default.nix b/nix/packages/taskwarrior-hooks/default.nix similarity index 100% rename from pkgs/taskwarrior-hooks/default.nix rename to nix/packages/taskwarrior-hooks/default.nix