From a7749005bc0d6f622cf09aafb936c55c47035e2a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 2 Jun 2020 01:17:38 +0200
Subject: [PATCH] flake: Fix overlays for `nix flake check`

It complains that:

	value is a list while a set was expected, at /nix/store/0qdcc831rj27wz07lrri6bnfmhvm4wrm-source/flake.nix:26:7

But nixpkgs still expects a list, so we need to pass it just the values.
---
 flake.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index ce60012..fe7165d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
 
   outputs = inputs@{ self, home, nixpkgs }:
     let
-      inherit (builtins) listToAttrs baseNameOf attrNames readDir;
+      inherit (builtins) listToAttrs baseNameOf attrNames attrValues readDir;
       inherit (nixpkgs.lib) removeSuffix;
       system = "x86_64-linux";
 
@@ -24,7 +24,7 @@
 
       pkgs = import nixpkgs {
         inherit system;
-        overlays = self.overlays;
+        overlays = attrValues self.overlays;
         config = { allowUnfree = true; };
       };
 
@@ -35,10 +35,12 @@
 
       overlay = import ./pkgs;
 
-      overlays = let
-        overlays = map (name: import (./overlays + "/${name}"))
-          (attrNames (readDir ./overlays));
-      in overlays;
+      overlays =
+        let
+          overlayDir = ./overlays;
+          fullPath = name: overlayDir + "/${name}";
+          overlayPaths = map fullPath (attrNames (readDir overlayDir));
+        in pathsToImportedAttrs overlayPaths;
 
       packages.x86_64-linux = {
         inherit (pkgs) sddm-chili dejavu_nerdfont purs pure;