refactor: condensed the lists

This commit is contained in:
Nick 2024-11-03 20:50:41 -06:00
parent d369bfaa5c
commit 98795adb7d

View file

@ -1,9 +1,20 @@
let let
serviceModules = [ modulesPath = ./modules;
"services"
];
fileModules = [ importFolder = name: {"${name}" = import (modulesPath + "/${name}");};
importFile = name: {"${name}" = import (modulesPath + "/${name}.nix");};
modules =
builtins.foldl' (
emptySet: importedModules:
emptySet // importedModules
) {} (map importFolder [
"services"
])
// builtins.foldl' (
emptySet: importedModules:
emptySet // importedModules
) {} (map importFile [
"accounts" "accounts"
"android" "android"
"audio" "audio"
@ -38,16 +49,7 @@ let
"system" "system"
"virtualization" "virtualization"
"xserver" "xserver"
]; ]);
modulesPath = ./modules;
importFolder = name: {"${name}" = import (modulesPath + "/${name}");};
importFile = name: {"${name}" = import (modulesPath + "/${name}.nix");};
modules =
builtins.foldl' (a: b: a // b) {} (map importFolder serviceModules)
// builtins.foldl' (a: b: a // b) {} (map importFile fileModules);
in { in {
flake.nixosModules = { flake.nixosModules = {
personal = { personal = {
@ -74,7 +76,7 @@ in {
desktop = { desktop = {
imports = with modules; [ imports = with modules; [
syncthing syncthing
ollama # ollama
]; ];
}; };