From b308e7191e51c576188eb362a049c9de1ed03d6e Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sat, 6 Aug 2022 13:21:59 -0700 Subject: ref(flake): tools and users packages are managed the same way Configure the way we import these packages the same way, that way it's consistent and easy to use. Change-Id: I0e218f8fe9dd4cd2045bfee11c80de84ff769fe1 Reviewed-on: https://cl.fcuny.net/c/world/+/703 Tested-by: CI Reviewed-by: Franck Cuny --- flake.nix | 6 +----- users/fcuny/default.nix | 9 +++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 users/fcuny/default.nix diff --git a/flake.nix b/flake.nix index 8afc3c2..6e48370 100644 --- a/flake.nix +++ b/flake.nix @@ -61,11 +61,7 @@ tools = import ./tools { inherit pkgs; }; - users.fcuny = { - blog = import ./users/fcuny/blog { inherit pkgs; }; - notes = import ./users/fcuny/notes { inherit pkgs; }; - resume = import ./users/fcuny/resume { inherit pkgs; }; - }; + users.fcuny = import ./users/fcuny { inherit pkgs; }; }; checks = { diff --git a/users/fcuny/default.nix b/users/fcuny/default.nix new file mode 100644 index 0000000..f5b0914 --- /dev/null +++ b/users/fcuny/default.nix @@ -0,0 +1,9 @@ +{ pkgs }: + +pkgs.lib.makeScope pkgs.newScope (pkgs: { + resume = pkgs.callPackage ./resume { }; + + blog = pkgs.callPackage ./blog { }; + + notes = pkgs.callPackage ./notes { }; +}) -- cgit 1.4.1