fix: Remove incorrect ./parts/fleet-data.nix import from flake.nix and use correct flake-parts structure

2026-01-13 16:21:20 -05:00
parent 67e7a57402
commit d34325de53
16 changed files with 257 additions and 143 deletions
--- a/inventory.nix
+++ b/inventory.nix
@@ -70,85 +70,87 @@
 #       rev = "e1ccd7cc3e709afe4f50b0627e1c4bde49165014";
 #     };
 #   };
-{
-  # ========== Lab Laptops ==========
-  # Creates: nix-laptop1, nix-laptop2
-  # Both get hdh20267 user via overrides
-  nix-laptop = {
-    devices = 2;
-    overrides.athenix.users.hdh20267.enable = true;
-  };
-
-  # ========== Desktop ==========
-  # Creates: nix-desktop1
-  nix-desktop = {
-    devices = 1;
-  };
-
-  # ========== Surface Tablets (Kiosk Mode) ==========
-  # Creates: nix-surface1 (custom), nix-surface2, nix-surface3 (via defaultCount)
-  nix-surface = {
-    defaultCount = 3;
-    devices = {
-      "1".athenix.sw.kioskUrl = "https://google.com";
+{...}: {
+  athenix.fleet = {
+    # ========== Lab Laptops ==========
+    # Creates: nix-laptop1, nix-laptop2
+    # Both get hdh20267 user via overrides
+    nix-laptop = {
+      devices = 2;
+      overrides.athenix.users.hdh20267.enable = true;
    };
-    overrides = {
-      athenix.sw.kioskUrl = "https://yahoo.com";
-    };
-  };

-  # ========== LXC Containers ==========
-  # Creates: nix-builder (without lxc prefix)
-  nix-lxc = {
-    devices = {
-      "nix-builder" = {
-        # Gitea Actions self-hosted runner configuration
-        athenix.sw = {
-          type = [
-            "headless"
-            "builders"
-          ];
-          builders.giteaRunner = {
-            enable = true;
-            url = "https://git.factory.uga.edu";
-            # Token file must be created manually at this path with a Gitea runner token
-            # Generate in repository settings: Settings > Actions > Runners > Create new Runner
-            # echo "TOKEN=YOUR_TOKEN_HERE" | sudo tee /var/lib/gitea-runner-token > /dev/null
-            tokenFile = "/var/lib/gitea-runner-token";
-            # Labels to identify this runner in workflows
-            extraLabels = [
-              "self-hosted"
-              "nix-builder"
+    # ========== Desktop ==========
+    # Creates: nix-desktop1
+    nix-desktop = {
+      devices = 1;
+    };
+
+    # ========== Surface Tablets (Kiosk Mode) ==========
+    # Creates: nix-surface1 (custom), nix-surface2, nix-surface3 (via defaultCount)
+    nix-surface = {
+      defaultCount = 3;
+      devices = {
+        "1".athenix.sw.kioskUrl = "https://google.com";
+      };
+      overrides = {
+        athenix.sw.kioskUrl = "https://yahoo.com";
+      };
+    };
+
+    # ========== LXC Containers ==========
+    # Creates: nix-builder (without lxc prefix)
+    nix-lxc = {
+      devices = {
+        "nix-builder" = {
+          # Gitea Actions self-hosted runner configuration
+          athenix.sw = {
+            type = [
+              "headless"
+              "builders"
            ];
-            # Runner service name
-            name = "athenix";
+            builders.giteaRunner = {
+              enable = true;
+              url = "https://git.factory.uga.edu";
+              # Token file must be created manually at this path with a Gitea runner token
+              # Generate in repository settings: Settings > Actions > Runners > Create new Runner
+              # echo "TOKEN=YOUR_TOKEN_HERE" | sudo tee /var/lib/gitea-runner-token > /dev/null
+              tokenFile = "/var/lib/gitea-runner-token";
+              # Labels to identify this runner in workflows
+              extraLabels = [
+                "self-hosted"
+                "nix-builder"
+              ];
+              # Runner service name
+              name = "athenix";
+            };
          };
        };
+        "usda-dash".external = builtins.fetchGit {
+          url = "https://git.factory.uga.edu/MODEL/usda-dash-config.git";
+          rev = "dab32f5884895cead0fae28cb7d88d17951d0c12";
+          submodules = true;
+        };
      };
-      "usda-dash".external = builtins.fetchGit {
-        url = "https://git.factory.uga.edu/MODEL/usda-dash-config.git";
-        rev = "dab32f5884895cead0fae28cb7d88d17951d0c12";
-        submodules = true;
+      overrides = {
+        athenix.host.useHostPrefix = false;
      };
    };
-    overrides = {
-      athenix.host.useHostPrefix = false;
+
+    # ========== WSL Instances ==========
+    # Creates: nix-wsl-alireza
+    nix-wsl = {
+      devices = {
+        "alireza".athenix.forUser = "sv22900";
+      };
    };
+
+    # ========== ZimaBoard Desktops ==========
+    # Creates: nix-zima1, nix-zima2, nix-zima3
+    nix-zima.devices = 3;
+
+    # ========== Ephemeral/Netboot System ==========
+    # Creates: nix-ephemeral1
+    nix-ephemeral.devices = 1;
  };
-
-  # ========== WSL Instances ==========
-  # Creates: nix-wsl-alireza
-  nix-wsl = {
-    devices = {
-      "alireza".athenix.forUser = "sv22900";
-    };
-  };
-
-  # ========== ZimaBoard Desktops ==========
-  # Creates: nix-zima1, nix-zima2, nix-zima3
-  nix-zima.devices = 3;
-
-  # ========== Ephemeral/Netboot System ==========
-  # Creates: nix-ephemeral1
-  nix-ephemeral.devices = 1;
 }