From cfacd69575b5888bf3e054c9f8056a19c4b5903e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Tue, 16 Jan 2024 17:00:20 +0100
Subject: Rework

---
 nixos/machine/default.nix | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

(limited to 'nixos/machine/default.nix')

diff --git a/nixos/machine/default.nix b/nixos/machine/default.nix
index aba8b6e..4aa05ba 100644
--- a/nixos/machine/default.nix
+++ b/nixos/machine/default.nix
@@ -1,21 +1,9 @@
-self: {
-  machine-albert = import ./albert.nix;
-  machine-binky = import ./binky.nix;
-  machine-dean = import ./dean.nix;
-  machine-errol = import ./errol.nix;
-  machine-ridcully = import ./ridcully.nix;
-  machine-susan = import ./susan.nix;
-
-  machine-lipwig = import ./lipwig.nix;
-
-  machine-gaspode = import ./gaspode.nix;
-
-  machine-spt-omnia = import ./spt-omnia.nix;
-  machine-spt-mox = import ./spt-mox.nix;
-  machine-spt-mox2 = import ./spt-mox2.nix;
-  machine-spt-mpd = import ./spt-mpd.nix;
-
-  machine-adm-omnia = import ./adm-omnia.nix;
-  machine-adm-omnia2 = import ./adm-omnia2.nix;
-  machine-adm-mpd = import ./adm-mpd.nix;
-}
+self: let
+  inherit (builtins) readDir;
+  inherit (self.inputs.nixpkgs.lib) filterAttrs nameValuePair mapAttrs' hasSuffix removeSuffix;
+in
+  mapAttrs'
+  (n: v: nameValuePair "machine-${removeSuffix ".nix" n}" (import (./. + "/${n}")))
+  (filterAttrs
+    (n: v: v == "regular" && hasSuffix ".nix" n && n != "default.nix")
+    (readDir ./.))
-- 
cgit v1.2.3