From 0b14dbbc2df8dc13c4a96dac21092cc6cf8f14a1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 2 Jun 2020 01:14:33 +0200
Subject: [PATCH] flake: Refactor nixosModules collection

We will want to reuse the prep method for overlays so let's move it higher and simplify it a bit.
---
 flake.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6dbb2572..ce60012b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,18 @@
       inherit (nixpkgs.lib) removeSuffix;
       system = "x86_64-linux";
 
+      # Generate an attribute set by mapping a function over a list of values.
+      genAttrs' = values: f: listToAttrs (map f values);
+
+      # Convert a list to file paths to attribute set
+      # that has the filenames stripped of nix extension as keys
+      # and imported content of the file as value.
+      pathsToImportedAttrs = paths:
+        genAttrs' paths (path: {
+          name = removeSuffix ".nix" (baseNameOf path);
+          value = import path;
+        });
+
       pkgs = import nixpkgs {
         inherit system;
         overlays = self.overlays;
@@ -33,18 +45,13 @@
       };
 
       nixosModules = let
-        prep = map (path: {
-          name = removeSuffix ".nix" (baseNameOf path);
-          value = import path;
-        });
-
         # modules
         moduleList = import ./modules/list.nix;
-        modulesAttrs = listToAttrs (prep moduleList);
+        modulesAttrs = pathsToImportedAttrs moduleList;
 
         # profiles
         profilesList = import ./profiles/list.nix;
-        profilesAttrs = { profiles = listToAttrs (prep profilesList); };
+        profilesAttrs = { profiles = pathsToImportedAttrs profilesList; };
 
       in modulesAttrs // profilesAttrs;
     };