From ae303b39fdf6077bb79d4b35f23ba6438f60b17b Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Sat, 4 Jan 2020 16:08:49 -0700
Subject: [PATCH] modules: convert to list to match nixpkg sematics

---
 flake.nix           | 14 +++++++++++++-
 modules/default.nix |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0d189d5..82be66d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,9 @@
 
   outputs = args@{ self, home, nixpkgs }:
     let
+      inherit (builtins) listToAttrs baseNameOf;
+      inherit (nixpkgs.lib) removeSuffix;
+
       pkgs = import nixpkgs {
         system = "x86_64-linux";
         overlays = self.overlays;
@@ -25,6 +28,15 @@
         inherit (pkgs) sddm-chili dejavu_nerdfont purs;
       };
 
-      nixosModules = (import ./modules) // { profiles = import ./profiles; };
+      nixosModules = let
+        moduleList = import ./modules;
+
+        modulesAttrs = listToAttrs (map (path: {
+          name = removeSuffix ".nix" (baseNameOf path);
+          value = import path;
+        }) moduleList);
+
+        profilesAttrs = { profiles = import ./profiles; };
+      in modulesAttrs // profilesAttrs;
     };
 }
diff --git a/modules/default.nix b/modules/default.nix
index 254143a..7146630 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1 +1 @@
-{ qbittorrent-nox = import ./services/torrent/qbittorrent.nix; }
+[ ./services/torrent/qbittorrent.nix ]