From 52c2b494255791a0fa01dd3e2ea7d9d4f4fe199e Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 25 Jul 2023 22:29:44 -0400 Subject: [PATCH] mkPkgs -> mkPackages ./pkgs -> ./packages --- flake.nix | 2 +- lib/default.nix | 2 +- {pkgs => packages}/fastfetch.nix | 0 {pkgs => packages}/images.nix | 0 {pkgs => packages}/parrot.nix | 0 {pkgs => packages}/t-rex.nix | 0 6 files changed, 2 insertions(+), 2 deletions(-) rename {pkgs => packages}/fastfetch.nix (100%) rename {pkgs => packages}/images.nix (100%) rename {pkgs => packages}/parrot.nix (100%) rename {pkgs => packages}/t-rex.nix (100%) diff --git a/flake.nix b/flake.nix index 9e852dd..db71b8d 100644 --- a/flake.nix +++ b/flake.nix @@ -87,7 +87,7 @@ ]; }; } - // lib.mkPkgs pkgs ./pkgs; + // lib.mkPackages ./packages pkgs ; } ); } diff --git a/lib/default.nix b/lib/default.nix index 07ea9dc..df59597 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -51,7 +51,7 @@ in { name: (import "${self}/hosts/${name}/disko.nix" inputs) ); - mkPkgs = pkgs: path: + mkPackages = path: pkgs: builtins.listToAttrs ( map (module: { name = lib.removeSuffix ".nix" (builtins.baseNameOf module); diff --git a/pkgs/fastfetch.nix b/packages/fastfetch.nix similarity index 100% rename from pkgs/fastfetch.nix rename to packages/fastfetch.nix diff --git a/pkgs/images.nix b/packages/images.nix similarity index 100% rename from pkgs/images.nix rename to packages/images.nix diff --git a/pkgs/parrot.nix b/packages/parrot.nix similarity index 100% rename from pkgs/parrot.nix rename to packages/parrot.nix diff --git a/pkgs/t-rex.nix b/packages/t-rex.nix similarity index 100% rename from pkgs/t-rex.nix rename to packages/t-rex.nix