diff --git a/nixos/default.nix b/nixos/default.nix index c270403..f24fe13 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,53 +1,55 @@ let - serviceModules = [ - "services" - ]; - - fileModules = [ - "accounts" - "android" - "audio" - "bluetooth" - "corectrl" - "dconf" - "disks" - "doas" - "environment" - "firejail" - "flatpak" - "fonts" - "gnome" - "greetd" - "gvfs" - "home-manager" - "locale" - "network" - "nix" - "nur" - "ollama" - "plasma" - "printing" - "regreet" - "rsyncd" - "sddm" - "sops" - "ssh" - "steam" - "syncthing" - "sysstat" - "system" - "virtualization" - "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); + builtins.foldl' ( + emptySet: importedModules: + emptySet // importedModules + ) {} (map importFolder [ + "services" + ]) + // builtins.foldl' ( + emptySet: importedModules: + emptySet // importedModules + ) {} (map importFile [ + "accounts" + "android" + "audio" + "bluetooth" + "corectrl" + "dconf" + "disks" + "doas" + "environment" + "firejail" + "flatpak" + "fonts" + "gnome" + "greetd" + "gvfs" + "home-manager" + "locale" + "network" + "nix" + "nur" + "ollama" + "plasma" + "printing" + "regreet" + "rsyncd" + "sddm" + "sops" + "ssh" + "steam" + "syncthing" + "sysstat" + "system" + "virtualization" + "xserver" + ]); in { flake.nixosModules = { personal = { @@ -74,7 +76,7 @@ in { desktop = { imports = with modules; [ syncthing - ollama + # ollama ]; };