From 30cfdaf860acc182e56bdb8e6de682910b6eb2ee Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sun, 30 Apr 2023 14:06:25 +0200
Subject: [PATCH] refactor: remove meta.nix in favor of direct declaration in
 flake.nix

---
 flake.nix                | 17 ++++++++++++++++-
 hosts/nom/meta.nix       |  8 --------
 hosts/ward/fs.nix        |  4 ++++
 hosts/ward/meta.nix      |  9 ---------
 hosts/zackbiene/meta.nix |  7 -------
 nix/generate-node.nix    | 14 ++++++--------
 nix/hosts.nix            | 10 ----------
 7 files changed, 26 insertions(+), 43 deletions(-)
 delete mode 100644 hosts/nom/meta.nix
 delete mode 100644 hosts/ward/meta.nix
 delete mode 100644 hosts/zackbiene/meta.nix
 delete mode 100644 nix/hosts.nix

diff --git a/flake.nix b/flake.nix
index c1cfd0e..189d14d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,7 +86,22 @@
         content = import ./nix/secrets.nix inputs;
       };
 
-      hosts = import ./nix/hosts.nix inputs;
+      hosts = {
+        nom = {
+          type = "nixos";
+          system = "x86_64-linux";
+        };
+        ward = {
+          type = "nixos";
+          system = "x86_64-linux";
+          microVmHost = true;
+        };
+        zackbiene = {
+          type = "nixos";
+          system = "aarch64-linux";
+        };
+      };
+
       colmena = import ./nix/colmena.nix inputs;
       colmenaNodes = ((colmena.lib.makeHive self.colmena).introspect (x: x)).nodes;
       microvmNodes = import ./nix/microvms.nix inputs;
diff --git a/hosts/nom/meta.nix b/hosts/nom/meta.nix
deleted file mode 100644
index c575f4d..0000000
--- a/hosts/nom/meta.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  type = "nixos";
-  system = "x86_64-linux";
-  physicalConnections = {
-    "10-lan1" = "LAN 1";
-    "10-wlan1" = "WiFi";
-  };
-}
diff --git a/hosts/ward/fs.nix b/hosts/ward/fs.nix
index 6d305dc..b6f1579 100644
--- a/hosts/ward/fs.nix
+++ b/hosts/ward/fs.nix
@@ -39,6 +39,10 @@
     };
   };
 
+  #environment.persistence."/persist".directories = [
+  #  { directory = "/var/lib/acme"; user = "acme"; group = "acme"; }
+  #];
+
   # After importing the rpool, rollback the root system to be empty.
   boot.initrd.systemd.services = {
     impermanence-root = {
diff --git a/hosts/ward/meta.nix b/hosts/ward/meta.nix
deleted file mode 100644
index 35f371c..0000000
--- a/hosts/ward/meta.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  type = "nixos";
-  system = "x86_64-linux";
-  microVmHost = true;
-  physicalConnections = {
-    "10-lan" = "LAN";
-    "10-wan" = "WAN";
-  };
-}
diff --git a/hosts/zackbiene/meta.nix b/hosts/zackbiene/meta.nix
deleted file mode 100644
index 19520c9..0000000
--- a/hosts/zackbiene/meta.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  type = "nixos";
-  system = "aarch64-linux";
-  physicalConnections = {
-    "10-lan1" = "LAN 1";
-  };
-}
diff --git a/nix/generate-node.nix b/nix/generate-node.nix
index 95d9bab..8569950 100644
--- a/nix/generate-node.nix
+++ b/nix/generate-node.nix
@@ -1,15 +1,15 @@
 {
   self,
+  agenix,
+  agenix-rekey,
   colmena,
   disko,
   home-manager,
   #impermanence,
+  microvm,
   nixos-hardware,
   nixos-nftables-firewall,
   nixpkgs,
-  microvm,
-  agenix,
-  agenix-rekey,
   ...
 } @ inputs: let
   inherit (nixpkgs.lib) optionals;
@@ -22,23 +22,21 @@ in
       inherit (self) extraLib nodes;
       inherit inputs;
       inherit nodeName;
-      inherit nodeMeta;
       secrets = self.secrets.content;
       nodeSecrets = self.secrets.content.nodes.${nodeName};
       nixos-hardware = nixos-hardware.nixosModules;
-      #impermanence = impermanence.nixosModules;
     };
     imports =
       [
         (../hosts + "/${nodeName}")
-        home-manager.nixosModules.default
-        #impermanence.nixosModules.default
         agenix.nixosModules.default
         agenix-rekey.nixosModules.default
         disko.nixosModules.disko
+        home-manager.nixosModules.default
+        #impermanence.nixosModules.default
         nixos-nftables-firewall.nixosModules.default
       ]
-      ++ optionals nodeMeta.microVmHost [
+      ++ optionals (nodeMeta.microVmHost or false) [
         microvm.nixosModules.host
       ]
       ++ optionals (nodeMeta.type == "microvm") [
diff --git a/nix/hosts.nix b/nix/hosts.nix
deleted file mode 100644
index a97a512..0000000
--- a/nix/hosts.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{nixpkgs, ...}: let
-  hostDefaults = {
-    physicalConnections = {};
-    microVmHost = false;
-  };
-in
-  nixpkgs.lib.concatMapAttrs (nodeName: fileType:
-    if fileType == "directory" && nodeName != "common"
-    then {${nodeName} = hostDefaults // import (../hosts + "/${nodeName}/meta.nix");}
-    else {}) (builtins.readDir ../hosts)