From 0a0cdf7188c39eb5c576be13dab11ff4d9a41d87 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sat, 2 Mar 2024 12:23:11 +0100
Subject: [PATCH] home: automatically create set of HM modules

---
 home/modules.nix             |  8 ++++++++
 home/modules/default.nix     | 16 ----------------
 home/modules/module-list.nix | 19 -------------------
 outputs.nix                  |  2 +-
 4 files changed, 9 insertions(+), 36 deletions(-)
 create mode 100644 home/modules.nix
 delete mode 100644 home/modules/default.nix
 delete mode 100644 home/modules/module-list.nix

diff --git a/home/modules.nix b/home/modules.nix
new file mode 100644
index 0000000..0e295c9
--- /dev/null
+++ b/home/modules.nix
@@ -0,0 +1,8 @@
+{ lib, ... }:
+with lib; let
+  modules' = dir: filterAttrs (name: type: (hasSuffix ".nix" name) || (type == "directory"))
+    (builtins.readDir dir);
+  modules = dir: mapAttrs' (name: _: nameValuePair (removeSuffix ".nix" name) (import (dir + "/${name}")))
+    (modules' dir);
+in
+(modules ./modules)
diff --git a/home/modules/default.nix b/home/modules/default.nix
deleted file mode 100644
index b1f117d..0000000
--- a/home/modules/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  alacritty = import ./alacritty;
-  colors = import ./colors.nix;
-  direnv = import ./direnv.nix;
-  git = import ./git.nix;
-  gpg = import ./gpg.nix;
-  gtk = import ./gtk.nix;
-  helix = import ./helix;
-  keyring = import ./keyring.nix;
-  session = import ./session.nix;
-  ssh = import ./ssh.nix;
-  syncthing = import ./syncthing.nix;
-  tmux = import ./tmux.nix;
-  xdg = import ./xdg.nix;
-  zsh = import ./zsh.nix;
-}
diff --git a/home/modules/module-list.nix b/home/modules/module-list.nix
deleted file mode 100644
index bbe6b3f..0000000
--- a/home/modules/module-list.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-  ./colors.nix
-  ./direnv.nix
-  ./fish.nix
-  ./git.nix
-  ./gpg.nix
-  ./gtk.nix
-  ./keyring.nix
-  ./kitty
-  ./mako.nix
-  ./session.nix
-  ./ssh.nix
-  ./sway
-  ./syncthing.nix
-  ./termite.nix
-  ./tmux.nix
-  ./xdg.nix
-  ./zsh.nix
-]
diff --git a/outputs.nix b/outputs.nix
index 8b6a45f..694a493 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -36,7 +36,7 @@
   }))
   // {
 
-  hmModules = import ./home/modules;
+  hmModules = import ./home/modules.nix { lib = nixpkgs.lib; };
 
   nixosConfigurations = import ./nixos/configurations.nix inputs;