move inherits and add attrset for imports

hosts/default.nix

@@ -0,0 +1,16 @@
+# Return a list of all hosts
+
+{ lib, ... }:
+
+lib.pipe (lib.filesystem.listFilesRecursive ./.) [
+  # Get only files ending in default.nix
+  (builtins.filter (name: lib.hasSuffix "default.nix" name))
+  # Import each host function
+  map
+  (file: {
+    name = builtins.baseNameOf (builtins.dirOf file);
+    value = import file;
+  })
+  # Convert to an attrset of hostname -> host function
+  (builtins.listToAttrs)
+]

overlays/pkgs.nix

@@ -13,7 +13,7 @@ let
   packagesDirectory = lib.filesystem.listFilesRecursive ../pkgs;
   packages = lib.pipe packagesDirectory [
     # Get only files called package.nix
-    (builtins.filter (name: (lib.hasSuffix "package.nix" name)))
+    (builtins.filter (name: (name == "package.nix")))
     # Apply callPackage to create a derivation
     (builtins.map prev.callPackage)
     # Convert the list to an attrset

platforms/home-manager/default.nix

@@ -1,4 +1,7 @@
 { lib, ... }:
 {
-  imports = lib.filesystem.listFilesRecursive ./.;
+  imports = lib.pipe (lib.filesystem.listFilesRecursive ./.) [
+    # Get only files ending in .nix
+    (builtins.filter (name: lib.hasSuffix ".nix" name))
+  ];
 }

platforms/nix-darwin/default.nix

@@ -1,4 +1,7 @@
 { lib, ... }:
 {
-  imports = lib.filesystem.listFilesRecursive ./.;
+  imports = lib.pipe (lib.filesystem.listFilesRecursive ./.) [
+    # Get only files ending in .nix
+    (builtins.filter (name: lib.hasSuffix ".nix" name))
+  ];
 }

platforms/nixos/default.nix

@@ -1,4 +1,7 @@
 { lib, ... }:
 {
-  imports = lib.filesystem.listFilesRecursive ./.;
+  imports = lib.pipe (lib.filesystem.listFilesRecursive ./.) [
+    # Get only files ending in .nix
+    (builtins.filter (name: lib.hasSuffix ".nix" name))
+  ];
 }

platforms/nixos/modules/nmasur/presets/services/actualbudget.nix

@@ -5,8 +5,8 @@
 }:
 
 let
-  cfg = config.nmasur.presets.services.actualbudget;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.actualbudget;
 in
 
 {

platforms/nixos/modules/nmasur/presets/services/arr.nix

@@ -7,8 +7,8 @@
 
 let
 
-  cfg = config.nmasur.presets.services.actualbudget;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.actualbudget;
 
   # This config specifies ports for Prometheus to scrape information
   arrConfig = {

platforms/nixos/modules/nmasur/presets/services/bind.nix

@@ -13,8 +13,8 @@
 }:
 
 let
-  cfg = config.nmasur.presets.services.bind;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.bind;
 
   localIp = "192.168.1.218";
   localServices = [

platforms/nixos/modules/nmasur/presets/services/calibre-web.nix

@@ -13,8 +13,8 @@
 
 let
 
-  cfg = config.nmasur.presets.services.calibre-web;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.calibre-web;
   libraryPath = "/data/books";
 in
 {

platforms/nixos/modules/nmasur/presets/services/filebrowser.nix

@@ -4,8 +4,8 @@
   ...
 }:
 let
-  cfg = config.nmasur.presets.services.filebrowser;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.filebrowser;
 in
 {
 

platforms/nixos/modules/nmasur/presets/services/gitea-runner-local.nix

@@ -12,8 +12,8 @@
 }:
 
 let
-  cfg = config.nmasur.presets.services.gitea-runner-local;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.gitea-runner-local;
 in
 
 {

platforms/nixos/modules/nmasur/presets/services/gitea.nix

@@ -6,8 +6,8 @@
 }:
 
 let
-  cfg = config.nmasur.presets.services.gitea;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.gitea;
   giteaPath = "/var/lib/gitea"; # Default service directory
 in
 {

platforms/nixos/modules/nmasur/presets/services/grafana.nix

@@ -6,8 +6,8 @@
 }:
 let
 
-  cfg = config.nmasur.presets.services.grafana;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.grafana;
   promUid = "victoriametrics";
 in
 {

platforms/nixos/modules/nmasur/presets/services/immich.nix

@@ -1,8 +1,8 @@
 { config, lib, ... }:
 
 let
-  cfg = config.nmasur.presets.services.immich;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.immich;
 in
 
 {

platforms/nixos/modules/nmasur/presets/services/influxdb2.nix

@@ -6,8 +6,8 @@
 { config, lib, ... }:
 
 let
-  cfg = config.nmasur.presets.services.influxdb2;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.influxdb2;
 in
 {
 

platforms/nixos/modules/nmasur/presets/services/jellyfin.nix

@@ -9,8 +9,8 @@
 }:
 
 let
-  cfg = config.nmasur.presets.services.jellyfin;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.jellyfin;
 in
 {
 

platforms/nixos/modules/nmasur/presets/services/minecraft-server.nix

@@ -6,8 +6,8 @@
 }:
 
 let
-  cfg = config.nmasur.presets.services.minecraft-server;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.minecraft-server;
   localPort = 25564;
   publicPort = 49732;
   rconPort = 25575;

platforms/nixos/modules/nmasur/presets/services/n8n.nix

@@ -4,8 +4,8 @@
 { config, lib, ... }:
 
 let
-  cfg = config.nmasur.presets.services.n8n;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.n8n;
 in
 
 {

platforms/nixos/modules/nmasur/presets/services/nextcloud.nix

@@ -6,8 +6,8 @@
 }:
 
 let
-  cfg = config.nmasur.presets.services.nextcloud;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.nextcloud;
 in
 {
 

platforms/nixos/modules/nmasur/presets/services/ntfy-sh.nix

@@ -1,8 +1,8 @@
 { config, lib, ... }:
 
 let
-  cfg = config.nmasur.presets.services.ntfy-sh;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.ntfy-sh;
 in
 
 {

platforms/nixos/modules/nmasur/presets/services/paperless.nix

@@ -3,8 +3,8 @@
 { config, lib, ... }:
 
 let
-  cfg = config.nmasur.presets.services.paperless;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.paperless;
 in
 {
 

platforms/nixos/modules/nmasur/presets/services/prometheus-remote-write.nix

@@ -11,8 +11,8 @@
 }:
 
 let
-  cfg = config.nmasur.presets.services.prometheus-remote-write;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.prometheus-remote-write;
 in
 {
 

platforms/nixos/modules/nmasur/presets/services/thelounge.nix

@@ -1,7 +1,7 @@
 { config, lib, ... }:
 let
-  cfg = config.nmasur.presets.services.thelounge;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.thelounge;
 in
 {
 

platforms/nixos/modules/nmasur/presets/services/transmission.nix

@@ -9,8 +9,8 @@
 }:
 
 let
-  cfg = config.nmasur.presets.services.transmission;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.transmission;
 in
 {
 

platforms/nixos/modules/nmasur/presets/services/uptime-kuma.nix

@@ -1,8 +1,8 @@
 { config, lib, ... }:
 
 let
-  cfg = config.nmasur.presets.services.uptime-kuma;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.uptime-kuma;
 in
 
 {

platforms/nixos/modules/nmasur/presets/services/vaultwarden.nix

@@ -10,8 +10,8 @@
 }:
 
 let
-  cfg = config.nmasur.presets.services.vaultwarden;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.vaultwarden;
   vaultwardenPath = "/var/lib/bitwarden_rs"; # Default service directory
 in
 {

platforms/nixos/modules/nmasur/presets/services/victoriametrics.nix

@@ -10,8 +10,8 @@
 
 let
 
-  cfg = config.nmasur.presets.services.victoriametrics;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.victoriametrics;
 
   username = "prometheus";
 

platforms/nixos/modules/nmasur/presets/services/vm-agent.nix

@@ -10,8 +10,8 @@
 
 let
 
-  cfg = config.nmasur.presets.services.vm-agent;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.nmasur.presets.services.vm-agent;
 
   username = "prometheus";
 

platforms/nixos/modules/services/filebrowser.nix

@@ -5,8 +5,8 @@
   ...
 }:
 let
-  cfg = config.services.filebrowser;
   inherit (config.nmasur.settings) hostnames;
+  cfg = config.services.filebrowser;
 
   dataDir = "/var/lib/filebrowser";