From 9b64b50ee89166212eed6998fa15c364eb2c4a1e Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 10 Jan 2020 22:39:42 -0700 Subject: [PATCH] flake.nix: consistent `default.nix` semantics --- flake.nix | 9 +++++---- modules/{default.nix => list.nix} | 0 profiles/{default.nix => list.nix} | 0 3 files changed, 5 insertions(+), 4 deletions(-) rename modules/{default.nix => list.nix} (100%) rename profiles/{default.nix => list.nix} (100%) diff --git a/flake.nix b/flake.nix index 479f52d..27657db 100644 --- a/flake.nix +++ b/flake.nix @@ -37,13 +37,14 @@ value = import path; }); - moduleList = import ./modules; - + # modules + moduleList = import ./modules/list.nix; modulesAttrs = listToAttrs (prep moduleList); - profilesList = import ./profiles; - + # profiles + profilesList = import ./profiles/list.nix; profilesAttrs = { profiles = listToAttrs (prep profilesList); }; + in modulesAttrs // profilesAttrs; }; } diff --git a/modules/default.nix b/modules/list.nix similarity index 100% rename from modules/default.nix rename to modules/list.nix diff --git a/profiles/default.nix b/profiles/list.nix similarity index 100% rename from profiles/default.nix rename to profiles/list.nix