Merge pull request 'pinned-clan-core' (#3574) from pinned-clan-core into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3574

.gitea/workflows/update-clan-core-for-checks.yml

@@ -0,0 +1,29 @@
+name: "Update pinned clan-core for checks"
+on:
+  repository_dispatch:
+  workflow_dispatch:
+  schedule:
+    - cron: "51 2 * * *"
+jobs:
+  update-pinned-clan-core:
+    runs-on: nix
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Update clan-core for checks
+        run: nix run .#update-clan-core-for-checks
+      - name: Create pull request
+        run: |
+          git commit -am ""
+          git push origin HEAD:update-clan-core-for-checks
+          curl -X POST \
+            -H "Authorization: token $GITEA_TOKEN" \
+            -H "Content-Type: application/json" \
+            -d '{
+              "head": "update-clan-core-branch",
+              "base": "main",
+              "title": "Automated Update: Clan Core",
+              "body": "This PR updates the pinned clan-core for checks."
+            }' \
+            "${GITEA_SERVER_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/pulls"

checks/backups/flake-module.nix

@@ -147,25 +147,7 @@
   perSystem =
     { pkgs, ... }:
     let
-      clanCore = self.filter {
-        include = [
-          "checks/backups"
-          "checks/flake-module.nix"
-          "clanModules/borgbackup"
-          "clanModules/flake-module.nix"
-          "clanModules/localbackup"
-          "clanModules/packages"
-          "clanModules/single-disk"
-          "clanModules/zerotier"
-          "flake.lock"
-          "flakeModules"
-          "inventory.json"
-          "nixosModules"
-          # Just include everything in 'lib'
-          # If anything changes in /lib that may affect everything
-          "lib"
-        ];
-      };
+      clanCore = self.checks.x86_64-linux.clan-core-for-checks;
     in
     {
       checks = pkgs.lib.mkIf pkgs.stdenv.isLinux {
@@ -182,11 +164,6 @@
               # import the inventory generated nixosModules
               self.clanInternals.inventoryClass.machines.test-backup.machineImports;
             clan.core.settings.directory = ./.;
-            environment.systemPackages = [
-              (pkgs.writeShellScriptBin "foo" ''
-                echo ${clanCore}
-              '')
-            ];
           };
 
           testScript = ''

checks/clan-core-for-checks.nix

@@ -0,0 +1,6 @@
+{ fetchgit }:
+fetchgit {
+  url = "https://git.clan.lol/clan/clan-core.git";
+  rev = "1e8b9def2a021877342491ca1f4c45533a580759";
+  sha256 = "0f12vwr1abwa1iwjbb5z5xx8jlh80d9njwdm6iaw1z1h2m76xgzc";
+}

checks/dummy-inventory-test/default.nix

@@ -34,33 +34,33 @@ clanLib.test.makeTestClan {
 
           modules = {
             legacy-module = ./legacy-module;
-            new-service = {
-              _class = "clan.service";
-              manifest.name = "new-service";
-              roles.peer = { };
-              perMachine = {
-                nixosModule = {
-                  # This should be generated by:
-                  # nix run .#generate-test-vars -- checks/dummy-inventory-test dummy-inventory-test
-                  clan.core.vars.generators.new-service = {
-                    files.not-a-secret = {
-                      secret = false;
-                      deploy = true;
-                    };
-                    files.a-secret = {
-                      secret = true;
-                      deploy = true;
-                      owner = "nobody";
-                      group = "users";
-                      mode = "0644";
-                    };
-                    script = ''
-                      # This is a dummy script that does nothing
-                      echo -n "not-a-secret" > $out/not-a-secret
-                      echo -n "a-secret" > $out/a-secret
-                    '';
-                  };
+          };
+        };
+        modules.new-service = {
+          _class = "clan.service";
+          manifest.name = "new-service";
+          roles.peer = { };
+          perMachine = {
+            nixosModule = {
+              # This should be generated by:
+              # nix run .#generate-test-vars -- checks/dummy-inventory-test dummy-inventory-test
+              clan.core.vars.generators.new-service = {
+                files.not-a-secret = {
+                  secret = false;
+                  deploy = true;
                 };
+                files.a-secret = {
+                  secret = true;
+                  deploy = true;
+                  owner = "nobody";
+                  group = "users";
+                  mode = "0644";
+                };
+                script = ''
+                  # This is a dummy script that does nothing
+                  echo -n "not-a-secret" > $out/not-a-secret
+                  echo -n "a-secret" > $out/a-secret
+                '';
               };
             };
           };

checks/flake-module.nix

@@ -14,7 +14,7 @@ in
     ./installation/flake-module.nix
     ./morph/flake-module.nix
     ./nixos-documentation/flake-module.nix
-    ./sanity-checks/dont-depend-on-repo-root.nix
+    ./dont-depend-on-repo-root.nix
   ];
   perSystem =
     {
@@ -101,6 +101,12 @@ in
                 mkdir -p $out
                 cat $schemaFile > $out/allSchemas.json
               '';
+
+          clan-core-for-checks = pkgs.runCommand "clan-core-for-checks" { } ''
+            cp -r ${pkgs.callPackage ./clan-core-for-checks.nix { }} $out
+            chmod +w $out/flake.lock
+            cp ${../flake.lock} $out/flake.lock
+          '';
         };
       legacyPackages = {
         nixosTests =

checks/flash/flake-module.nix

@@ -43,6 +43,7 @@
     let
       dependencies = [
         pkgs.disko
+        pkgs.buildPackages.xorg.lndir
         self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".pkgs.perlPackages.ConfigIniFiles
         self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".pkgs.perlPackages.FileSlurp
 
@@ -80,7 +81,7 @@
 
             # Some distros like to automount disks with spaces
             machine.succeed('mkdir -p "/mnt/with spaces" && mkfs.ext4 /dev/vdb && mount /dev/vdb "/mnt/with spaces"')
-            machine.succeed("clan flash write --debug --flake ${../..} --yes --disk main /dev/vdb test-flash-machine-${pkgs.hostPlatform.system}")
+            machine.succeed("clan flash write --debug --flake ${self.checks.x86_64-linux.clan-core-for-checks} --yes --disk main /dev/vdb test-flash-machine-${pkgs.hostPlatform.system}")
           '';
         } { inherit pkgs self; };
       };

checks/installation/flake-module.nix

@@ -15,6 +15,7 @@ let
         pkgs.bash.drvPath
         pkgs.nixos-anywhere
         pkgs.bubblewrap
+        pkgs.buildPackages.xorg.lndir
       ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
       closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
     in
@@ -197,7 +198,7 @@ in
             installer.succeed("${pkgs.coreutils}/bin/install -Dm 600 ${../assets/ssh/privkey} /root/.ssh/id_ed25519")
 
             installer.wait_until_succeeds("timeout 2 ssh -o StrictHostKeyChecking=accept-new -v nonrootuser@localhost hostname")
-            installer.succeed("cp -r ${../..} test-flake && chmod -R +w test-flake")
+            installer.succeed("cp -r ${self.checks.x86_64-linux.clan-core-for-checks} test-flake && chmod -R +w test-flake")
 
             installer.succeed("clan machines install --no-reboot --debug --flake test-flake --yes test-install-machine-without-system --target-host nonrootuser@localhost --update-hardware-config nixos-facter >&2")
             installer.shutdown()
@@ -217,7 +218,7 @@ in
             installer.start()
             installer.succeed("${pkgs.coreutils}/bin/install -Dm 600 ${../assets/ssh/privkey} /root/.ssh/id_ed25519")
             installer.wait_until_succeeds("timeout 2 ssh -o StrictHostKeyChecking=accept-new -v nonrootuser@localhost hostname")
-            installer.succeed("cp -r ${../..} test-flake && chmod -R +w test-flake")
+            installer.succeed("cp -r ${self.checks.x86_64-linux.clan-core-for-checks} test-flake && chmod -R +w test-flake")
             installer.fail("test -f test-flake/machines/test-install-machine/hardware-configuration.nix")
             installer.fail("test -f test-flake/machines/test-install-machine/facter.json")
 

checks/morph/flake-module.nix

@@ -32,7 +32,6 @@
               { pkgs, ... }:
               let
                 dependencies = [
-                  self
                   pkgs.stdenv.drvPath
                   pkgs.stdenvNoCC
                   self.nixosConfigurations.test-morph-machine.config.system.build.toplevel
@@ -55,7 +54,7 @@
           testScript = ''
             start_all()
             actual.fail("cat /etc/testfile")
-            actual.succeed("env CLAN_DIR=${self} clan machines morph test-morph-template --i-will-be-fired-for-using-this --debug --name test-morph-machine")
+            actual.succeed("env CLAN_DIR=${self.checks.x86_64-linux.clan-core-for-checks} clan machines morph test-morph-template --i-will-be-fired-for-using-this --debug --name test-morph-machine")
             assert actual.succeed("cat /etc/testfile") == "morphed"
           '';
         } { inherit pkgs self; };

clanModules/data-mesher/shared.nix

@@ -105,10 +105,7 @@ in
           private_key = {
             inherit owner;
           };
-          public_key = {
-            inherit owner;
-            secret = false;
-          };
+          public_key.secret = false;
         };
 
       runtimeInputs = [
@@ -134,10 +131,7 @@ in
           private_key = {
             inherit owner;
           };
-          public_key = {
-            inherit owner;
-            secret = false;
-          };
+          public_key.secret = false;
         };
 
       runtimeInputs = [

clanServices/hello-world/flake-module.nix

@@ -10,9 +10,6 @@ let
   };
 in
 {
-  clan.inventory.modules = {
-    hello-world = module;
-  };
   clan.modules = {
     hello-world = module;
   };

clanServices/hello-world/tests/eval-tests.nix

@@ -18,7 +18,7 @@ let
     };
 
     # Register the module for the test
-    inventory.modules.hello-world = module;
+    modules.hello-world = module;
 
     # Use the module in the test
     inventory.instances = {

clanServices/hello-world/tests/vm/default.nix

@@ -14,6 +14,9 @@ clanLib.test.makeTestClan {
 
       clan = {
         directory = ./.;
+        modules = {
+          hello-service = module;
+        };
         inventory = {
           machines.peer1 = { };
 
@@ -21,10 +24,6 @@ clanLib.test.makeTestClan {
             module.name = "hello-service";
             roles.peer.machines.peer1 = { };
           };
-
-          modules = {
-            hello-service = module;
-          };
         };
       };
 

docs/mkdocs.yml

@@ -58,7 +58,7 @@ nav:
       - Autoincludes: manual/adding-machines.md
       - Inventory:
           - Inventory: manual/inventory.md
-          - Instances: manual/distributed-services.md
+          - Services: manual/distributed-services.md
       - Secure Boot: manual/secure-boot.md
       - Flake-parts: manual/flake-parts.md
       - Authoring:

docs/site/authoring/clanServices/index.md

@@ -12,7 +12,7 @@ We discussed the initial architecture in [01-clan-service-modules](https://git.c
 
 ### A Minimal module
 
-First of all we need to register our module into the `inventory.modules` attribute. Make sure to choose a unique name so the module doesn't have a name collision with any of the core modules.
+First of all we need to register our module into the `clan.modules` attribute. Make sure to choose a unique name so the module doesn't have a name collision with any of the core modules.
 
 While not required we recommend to prefix your module attribute name.
 
@@ -22,20 +22,15 @@ i.e. `@hsjobeki/customNetworking`
 
 ```nix title="flake.nix"
 # ...
-
-outputs = inputs: flake-parts.lib.mkFlake { inherit inputs; } ({
+outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } ({
     imports = [ inputs.clan-core.flakeModules.default ];
     # ...
     clan = {
-        inventory = {
-            # We could also inline the complete module spec here
-            # For example
-            # {...}: { _class = "clan.service"; ... };
-            modules."@hsjobeki/customNetworking" = import ./service-modules/networking.nix;
-        };
-
         # If needed: Exporting the module for other people
         modules."@hsjobeki/customNetworking" = import ./service-modules/networking.nix;
+        # We could also inline the complete module spec here
+        # For example
+        # {...}: { _class = "clan.service"; ... };
     };
 })
 ```
@@ -221,9 +216,6 @@ outputs = inputs: flake-parts.lib.mkFlake { inherit inputs; } ({self, lib, ...}:
     # ...
     clan = {
         # Register the module
-        inventory.modules."@hsjobeki/messaging" = lib.importApply ./service-modules/messaging.nix { inherit self; };
-
-        # Expose the module for downstream users, 'self' would always point to this flake.
         modules."@hsjobeki/messaging" = lib.importApply ./service-modules/messaging.nix { inherit self; };
     };
 })
@@ -250,7 +242,7 @@ outputs = inputs: flake-parts.lib.mkFlake { inherit inputs; } ({self, lib, ...}:
     # ...
     clan = {
         # Register the module
-        inventory.modules."@hsjobeki/messaging" = {
+        modules."@hsjobeki/messaging" = {
             # Create an option 'myClan' and assign it to 'self'
             options.myClan = lib.mkOption {
                 default = self;

docs/site/contributing/testing.md

@@ -32,7 +32,7 @@ VM tests should be avoided wherever it is possible to implement a cheaper unit t
 
 Existing nixos vm tests in clan-core can be found by using ripgrep:
 ```shellSession
-rg "import.*/lib/test-base.nix"
+rg self.clanLib.test.baseTest
 ```
 
 ### Locating definitions of failing VM tests
@@ -50,7 +50,7 @@ example: locating the vm test named `borgbackup`:
 ```shellSession
 $ rg "borgbackup =" ./checks
 ./checks/flake-module.nix
-41:            borgbackup = import ./borgbackup nixosTestArgs;
+44-            wayland-proxy-virtwl = self.clanLib.test.baseTest ./wayland-proxy-virtwl nixosTestArgs;
 ```
 
 -> the location of that test is `/checks/flake-module.nix` line `41`.
@@ -99,15 +99,15 @@ Basically everything stated under the NixOS VM tests sections applies here, exce
 
 Limitations:
 
-- does not yet support networking
-- supports only one machine as of now
-
+- Cannot run in interactive mode, however while the container test runs, it logs a nsenter command that can be used to log into each of the container.
+- setuid binaries don't work
 
 ### Where to find examples for NixOS container tests
 
 Existing nixos container tests in clan-core can be found by using ripgrep:
+
 ```shellSession
-rg "import.*/lib/container-test.nix"
+rg self.clanLib.test.containerTest
 ```
 
 

flake.lock

@@ -16,11 +16,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746459034,
-        "narHash": "sha256-VHHc8EFPu2uk8mf4ItTHwxgrQxFixNHkclPQMXZfYig=",
-        "rev": "d63db1621463918966e8e0ec2eb7ddbe8aae332e",
+        "lastModified": 1747008053,
+        "narHash": "sha256-rob/qftmEuk+/JVGCIrOpv+LWjdmayFtebEKqRZXVAI=",
+        "rev": "2666bb11f4287cfbdf3b7c5f55231c6b5772a436",
         "type": "tarball",
-        "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/d63db1621463918966e8e0ec2eb7ddbe8aae332e.tar.gz"
+        "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/2666bb11f4287cfbdf3b7c5f55231c6b5772a436.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -34,11 +34,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746411114,
-        "narHash": "sha256-mLlkVX1kKbAa/Ns5u26wDYw4YW4ziMFM21fhtRmfirU=",
+        "lastModified": 1746729224,
+        "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "b5d1320ebc2f34dbea4655f95167f55e2130cdb3",
+        "rev": "85555d27ded84604ad6657ecca255a03fd878607",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746254942,
-        "narHash": "sha256-Y062AuRx6l+TJNX8wxZcT59SSLsqD9EedAY0mqgTtQE=",
+        "lastModified": 1746708654,
+        "narHash": "sha256-GeC99gu5H6+AjBXsn5dOhP4/ApuioGCBkufdmEIWPRs=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "760a11c87009155afa0140d55c40e7c336d62d7a",
+        "rev": "6cb36e8327421c61e5a3bbd08ed63491b616364a",
         "type": "github"
       },
       "original": {
@@ -184,11 +184,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746216483,
-        "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
+        "lastModified": 1746989248,
+        "narHash": "sha256-uoQ21EWsAhyskNo8QxrTVZGjG/dV4x5NM1oSgrmNDJY=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
+        "rev": "708ec80ca82e2bbafa93402ccb66a35ff87900c5",
         "type": "github"
       },
       "original": {

flakeModules/demo_iso.nix

@@ -37,7 +37,7 @@ let
       done
       if ! test -e ~/clan-core; then
         # git clone https://git.clan.lol/clan/clan-core.git ~/clan-core
-        cp -rv ${self} clan-core
+        cp -rv ${self.checks.x86_64-linux.clan-core-for-checks} clan-core
       fi
       cd clan-core
       clan machines morph demo-template --i-will-be-fired-for-using-this

lib/build-clan/module.nix

@@ -45,7 +45,9 @@ let
       inherit inventory directory;
       flakeInputs = config.self.inputs;
       prefix = config._prefix ++ [ "inventoryClass" ];
-      localModuleSet = config.self.clan.modules;
+      # TODO: remove inventory.modules, this is here for backwards compatibility
+      localModuleSet =
+        lib.filterAttrs (n: _: !inventory._legacyModules ? ${n}) inventory.modules // config.modules;
     }
   );
 
@@ -179,6 +181,7 @@ in
     # Merge the meta attributes from the buildClan function
     {
       inventory.modules = clan-core.clanModules;
+      inventory._legacyModules = clan-core.clanModules;
     }
     # config.inventory.meta <- config.meta
     { inventory.meta = config.meta; }

lib/inventory/build-inventory/default.nix

@@ -33,6 +33,7 @@ let
 
             distributedServices = clanLib.inventory.mapInstances {
               inherit (config) inventory;
+              inherit localModuleSet;
               inherit flakeInputs;
               prefix = prefix ++ [ "distributedServices" ];
             };

lib/inventory/build-inventory/interface.nix

@@ -96,6 +96,12 @@ in
     ./assertions.nix
   ];
   options = {
+    _legacyModules = lib.mkOption {
+      internal = true;
+      visible = false;
+      default = { };
+    };
+
     options = lib.mkOption {
       internal = true;
       visible = false;
@@ -138,6 +144,28 @@ in
             };
             ```
       '';
+
+      apply =
+        moduleSet:
+        let
+          allowedNames = lib.attrNames config._legacyModules;
+        in
+        if builtins.all (moduleName: builtins.elem moduleName allowedNames) (lib.attrNames moduleSet) then
+          moduleSet
+        else
+          lib.warn ''
+            `inventory.modules` will be deprecated soon.
+
+            Please migrate the following modules into `clan.service` modules
+            and register them in `clan.modules`
+
+            ${lib.concatStringsSep "\n" (
+              map (m: "'${m}'") (lib.attrNames (lib.filterAttrs (n: _v: !builtins.elem n allowedNames) moduleSet))
+            )}
+
+            See: https://docs.clan.lol/manual/distributed-services/
+            And: https://docs.clan.lol/authoring/clanServices/
+          '' moduleSet;
     };
 
     assertions = lib.mkOption {

lib/inventory/distributed-service/inventory-adapter.nix

@@ -54,7 +54,7 @@ let
                   )
                 }
 
-                To import a local module from 'inventory.modules' remove the 'input' attribute from the module definition
+                To import a local module from 'clan.modules' remove the 'input' attribute from the module definition
                 Remove the following line from the module definition:
 
                 ...
@@ -81,6 +81,7 @@ in
       flakeInputs,
       # The clan inventory
       inventory,
+      localModuleSet,
       prefix ? [ ],
     }:
     let
@@ -92,7 +93,7 @@ in
         let
           resolvedModule = resolveModule {
             moduleSpec = instance.module;
-            localModuleSet = inventory.modules;
+            inherit localModuleSet;
             inherit flakeInputs;
           };
 

lib/inventory/distributed-service/tests/default.nix

@@ -41,9 +41,13 @@ let
 
   callInventoryAdapter =
     inventoryModule:
+    let
+      inventory = evalInventory inventoryModule;
+    in
     clanLib.inventory.mapInstances {
       flakeInputs = flakeInputsFixture;
-      inventory = evalInventory inventoryModule;
+      inherit inventory;
+      localModuleSet = inventory.modules;
     };
 in
 {

lib/test/container-test-driver/test_driver/__init__.py

@@ -2,9 +2,11 @@ import argparse
 import ctypes
 import os
 import re
+import shutil
 import subprocess
 import time
 import types
+import uuid
 from collections.abc import Callable
 from contextlib import _GeneratorContextManager
 from dataclasses import dataclass
@@ -13,6 +15,8 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Any
 
+from colorama import Fore, Style
+
 from .logger import AbstractLogger, CompositeLogger, TerminalLogger
 
 # Load the C library
@@ -244,7 +248,7 @@ class Machine:
         """
 
         # Always run command with shell opts
-        command = f"set -eo pipefail; source /etc/profile; set -u; {command}"
+        command = f"set -eo pipefail; source /etc/profile; set -xu; {command}"
 
         proc = subprocess.run(
             self.nsenter_command(command),
@@ -468,8 +472,42 @@ class Driver:
             print(f"Starting {machine.name}")
             machine.start()
 
+        # Print copy-pastable nsenter command to debug container tests
         for machine in self.machines:
-            print(" ".join(machine.nsenter_command("bash")))
+            nspawn_uuid = uuid.uuid4()
+
+            # We lauch a sleep here, so we can pgrep the process cmdline for
+            # the uuid
+            sleep = shutil.which("sleep")
+            assert sleep is not None, "sleep command not found"
+            machine.execute(
+                f"systemd-run /bin/sh -c '{sleep} 999999999 && echo {nspawn_uuid}'",
+            )
+
+            print(f"nsenter for {machine.name}:")
+            print(
+                " ".join(
+                    [
+                        Style.BRIGHT,
+                        Fore.CYAN,
+                        "sudo",
+                        "nsenter",
+                        "--user",
+                        "--target",
+                        f"$(\\pgrep -f '^/bin/sh.*{nspawn_uuid}')",
+                        "--mount",
+                        "--uts",
+                        "--ipc",
+                        "--net",
+                        "--pid",
+                        "--cgroup",
+                        "/bin/sh",
+                        "-c",
+                        "bash",
+                        Style.RESET_ALL,
+                    ]
+                )
+            )
 
     def test_symbols(self) -> dict[str, Any]:
         general_symbols = {

module.nix

@@ -0,0 +1,21 @@
+{ lib, ... }:
+{
+  _class = "clan.service";
+  manifest.name = "test";
+
+  roles.peer.interface =
+    { ... }:
+    {
+      options.debug = lib.mkOption { default = 1; };
+    };
+
+  roles.peer.perInstance =
+    { settings, ... }:
+    {
+      nixosModule = {
+        options.debug = lib.mkOption {
+          default = settings;
+        };
+      };
+    };
+}

nixosModules/clanCore/vars/default.nix

@@ -58,7 +58,16 @@ in
               )
             )
             ''
-              The config.clan.core.vars.generators.${generator.name}.files.${file.name} is not secret, but has non-default owner/group/mode set.
+              The config.clan.core.vars.generators.${generator.name}.files.${file.name} is not secret:
+              ${lib.optionalString (file.owner != "root") ''
+                The owner is set to ${file.owner}, but should be root.
+              ''}
+              ${lib.optionalString (file.group != (if _class == "darwin" then "wheel" else "root")) ''
+                The group is set to ${file.group}, but should be ${if _class == "darwin" then "wheel" else "root"}.
+              ''}
+              ${lib.optionalString (file.mode != "0400") ''
+                The mode is set to ${file.mode}, but should be 0400.
+              ''}
               This doesn't work because the file will be added to the nix store
             ''
       ) [ ] (lib.attrValues generator.files)

nixosModules/clanCore/vars/secret/sops/default.nix

@@ -18,7 +18,7 @@ let
       config.clan.core.settings.directory
       + "/vars/per-machine/${machineName}/${secret.generator}/${secret.name}/secret";
 
-  vars = collectFiles config.clan.core.vars;
+  vars = collectFiles config.clan.core.vars.generators;
 in
 {
   config.clan.core.vars.settings = lib.mkIf (config.clan.core.vars.settings.secretStore == "sops") {

nixosModules/clanCore/vars/secret/sops/funcs.nix

@@ -13,7 +13,7 @@ in
 {
 
   collectFiles =
-    vars:
+    generators:
     let
       relevantFiles =
         generator:
@@ -30,7 +30,7 @@ in
             inherit (generator) share;
             inherit (file) owner group mode;
           }) (relevantFiles generator)
-        ) vars.generators
+        ) generators
       );
     in
     allFiles;

pkgs/clan-cli/clan_cli/clan/show.py

@@ -6,8 +6,9 @@ from urllib.parse import urlparse
 
 from clan_lib.api import API
 
-from clan_cli.cmd import run_no_stdout
+from clan_cli.cmd import run
 from clan_cli.errors import ClanCmdError, ClanError
+from clan_cli.flake import Flake
 from clan_cli.inventory import Meta
 from clan_cli.nix import nix_eval
 
@@ -15,26 +16,26 @@ log = logging.getLogger(__name__)
 
 
 @API.register
-def show_clan_meta(uri: str) -> Meta:
-    if uri.startswith("/") and not Path(uri).exists():
-        msg = f"Path {uri} does not exist"
+def show_clan_meta(flake: Flake) -> Meta:
+    if flake.is_local and not flake.path.exists():
+        msg = f"Path {flake} does not exist"
         raise ClanError(msg, description="clan directory does not exist")
     cmd = nix_eval(
         [
-            f"{uri}#clanInternals.inventory.meta",
+            f"{flake}#clanInternals.inventory.meta",
             "--json",
         ]
     )
     res = "{}"
 
     try:
-        proc = run_no_stdout(cmd)
+        proc = run(cmd)
         res = proc.stdout.strip()
     except ClanCmdError as e:
         msg = "Evaluation failed on meta attribute"
         raise ClanError(
             msg,
-            location=f"show_clan {uri}",
+            location=f"show_clan {flake}",
             description=str(e.cmd),
         ) from e
 
@@ -53,16 +54,16 @@ def show_clan_meta(uri: str) -> Meta:
                 msg = "Invalid absolute path"
                 raise ClanError(
                     msg,
-                    location=f"show_clan {uri}",
+                    location=f"show_clan {flake}",
                     description="Icon path must be a URL or a relative path",
                 )
 
-            icon_path = str((Path(uri) / meta_icon).resolve())
+            icon_path = str((flake.path / meta_icon).resolve())
         else:
             msg = "Invalid schema"
             raise ClanError(
                 msg,
-                location=f"show_clan {uri}",
+                location=f"show_clan {flake}",
                 description="Icon path must be a URL or a relative path",
             )
 

pkgs/clan-cli/clan_cli/cmd.py

@@ -403,23 +403,3 @@ def run(
         raise ClanCmdError(cmd_out)
 
     return cmd_out
-
-
-def run_no_stdout(
-    cmd: list[str],
-    opts: RunOpts | None = None,
-) -> CmdOut:
-    """
-    Like run, but automatically suppresses all output, if not in DEBUG log level.
-    If in DEBUG log level the stdout of commands will be shown.
-    """
-    if opts is None:
-        opts = RunOpts()
-
-    if cmdlog.isEnabledFor(logging.DEBUG):
-        opts.log = opts.log if opts.log.value > Log.STDERR.value else Log.STDERR
-
-    return run(
-        cmd,
-        opts,
-    )

pkgs/clan-cli/clan_cli/dirs.py

@@ -10,6 +10,7 @@ from .errors import ClanError
 
 if TYPE_CHECKING:
     from clan_cli.flake import Flake
+    from clan_cli.machines.machines import Machine
 
 log = logging.getLogger(__name__)
 
@@ -144,8 +145,8 @@ def machines_dir(flake: "Flake") -> Path:
     return Path(store_path) / "machines"
 
 
-def specific_machine_dir(flake: "Flake", machine: str) -> Path:
-    return machines_dir(flake) / machine
+def specific_machine_dir(machine: "Machine") -> Path:
+    return machines_dir(machine.flake) / machine.name
 
 
 def module_root() -> Path:

pkgs/clan-cli/clan_cli/facts/generate.py

@@ -48,6 +48,7 @@ def bubblewrap_cmd(generator: str, facts_dir: Path, secrets_dir: Path) -> list[s
             "--unshare-all",
             "--tmpfs",  "/",
             "--ro-bind", "/nix/store", "/nix/store",
+            "--ro-bind", "/bin/sh", "/bin/sh",
             "--dev", "/dev",
             # not allowed to bind procfs in some sandboxes
             "--bind", str(facts_dir), str(facts_dir),

pkgs/clan-cli/clan_cli/facts/upload.py

@@ -5,28 +5,27 @@ from tempfile import TemporaryDirectory
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
 from clan_cli.machines.machines import Machine
-from clan_cli.ssh.host import Host
 from clan_cli.ssh.upload import upload
 
 log = logging.getLogger(__name__)
 
 
-def upload_secrets(machine: Machine, host: Host) -> None:
-    if not machine.secret_facts_store.needs_upload(host):
-        machine.info("Secrets already uploaded")
-        return
+def upload_secrets(machine: Machine) -> None:
+    with machine.target_host() as host:
+        if not machine.secret_facts_store.needs_upload(host):
+            machine.info("Secrets already uploaded")
+            return
 
-    with TemporaryDirectory(prefix="facts-upload-") as _tempdir:
-        local_secret_dir = Path(_tempdir).resolve()
-        machine.secret_facts_store.upload(local_secret_dir)
-        remote_secret_dir = Path(machine.secrets_upload_directory)
-        upload(host, local_secret_dir, remote_secret_dir)
+        with TemporaryDirectory(prefix="facts-upload-") as _tempdir:
+            local_secret_dir = Path(_tempdir).resolve()
+            machine.secret_facts_store.upload(local_secret_dir)
+            remote_secret_dir = Path(machine.secrets_upload_directory)
+            upload(host, local_secret_dir, remote_secret_dir)
 
 
 def upload_command(args: argparse.Namespace) -> None:
     machine = Machine(name=args.machine, flake=args.flake)
-    with machine.target_host() as host:
-        upload_secrets(machine, host)
+    upload_secrets(machine)
 
 
 def register_upload_parser(parser: argparse.ArgumentParser) -> None:

pkgs/clan-cli/clan_cli/flake.py

@@ -575,12 +575,12 @@ class Flake:
     identifier: str
     inputs_from: str | None = None
     hash: str | None = None
-    flake_cache_path: Path | None = None
     store_path: str | None = None
-    cache: FlakeCache | None = None
-    _cache: FlakeCache | None = None
-    _path: Path | None = None
-    _is_local: bool | None = None
+
+    _flake_cache_path: Path | None = field(init=False, default=None)
+    _cache: FlakeCache | None = field(init=False, default=None)
+    _path: Path | None = field(init=False, default=None)
+    _is_local: bool | None = field(init=False, default=None)
 
     @classmethod
     def from_json(cls: type["Flake"], data: dict[str, Any]) -> "Flake":

pkgs/clan-cli/clan_cli/inventory/__init__.py

@@ -21,7 +21,7 @@ from typing import Any
 
 from clan_lib.api import API, dataclass_to_dict, from_dict
 
-from clan_cli.cmd import run_no_stdout
+from clan_cli.cmd import run
 from clan_cli.errors import ClanCmdError, ClanError
 from clan_cli.flake import Flake
 from clan_cli.git import commit_file
@@ -80,7 +80,7 @@ def load_inventory_eval(flake_dir: Flake) -> Inventory:
         ]
     )
 
-    proc = run_no_stdout(cmd)
+    proc = run(cmd)
 
     try:
         res = proc.stdout.strip()
@@ -380,7 +380,7 @@ def get_inventory_current_priority(flake: Flake) -> dict:
         ]
     )
 
-    proc = run_no_stdout(cmd)
+    proc = run(cmd)
 
     try:
         res = proc.stdout.strip()

pkgs/clan-cli/clan_cli/machines/create.py

@@ -110,7 +110,7 @@ def create_machine(opts: CreateOptions, commit: bool = True) -> None:
         new_machine["deploy"] = {"targetHost": target_host}
 
     patch_inventory_with(
-        Flake(str(clan_dir)), f"machines.{machine_name}", dataclass_to_dict(new_machine)
+        opts.clan_dir, f"machines.{machine_name}", dataclass_to_dict(new_machine)
     )
 
     # Commit at the end in that order to avoid committing halve-baked machines

pkgs/clan-cli/clan_cli/machines/delete.py

@@ -5,9 +5,10 @@ from pathlib import Path
 
 from clan_lib.api import API
 
-from clan_cli import Flake, inventory
+from clan_cli import inventory
 from clan_cli.completions import add_dynamic_completer, complete_machines
 from clan_cli.dirs import specific_machine_dir
+from clan_cli.machines.machines import Machine
 from clan_cli.secrets.folders import sops_secrets_folder
 from clan_cli.secrets.machines import has_machine as secrets_has_machine
 from clan_cli.secrets.machines import remove_machine as secrets_machine_remove
@@ -15,49 +16,46 @@ from clan_cli.secrets.secrets import (
     list_secrets,
 )
 
-from .machines import Machine
-
 log = logging.getLogger(__name__)
 
 
 @API.register
-def delete_machine(flake: Flake, name: str) -> None:
+def delete_machine(machine: Machine) -> None:
     try:
-        inventory.delete(flake, {f"machines.{name}"})
+        inventory.delete(machine.flake, {f"machines.{machine.name}"})
     except KeyError as exc:
         # louis@(2025-03-09): test infrastructure does not seem to set the
         # inventory properly, but more importantly only one machine in my
         # personal clan ended up in the inventory for some reason, so I think
         # it makes sense to eat the exception here.
         log.warning(
-            f"{name} was missing or already deleted from the machines inventory: {exc}"
+            f"{machine.name} was missing or already deleted from the machines inventory: {exc}"
         )
 
     changed_paths: list[Path] = []
 
-    folder = specific_machine_dir(flake, name)
+    folder = specific_machine_dir(machine)
     if folder.exists():
         changed_paths.append(folder)
         shutil.rmtree(folder)
 
     # louis@(2025-02-04): clean-up legacy (pre-vars) secrets:
-    sops_folder = sops_secrets_folder(flake.path)
-    filter_fn = lambda secret_name: secret_name.startswith(f"{name}-")
-    for secret_name in list_secrets(flake.path, filter_fn):
+    sops_folder = sops_secrets_folder(machine.flake.path)
+    filter_fn = lambda secret_name: secret_name.startswith(f"{machine.name}-")
+    for secret_name in list_secrets(machine.flake.path, filter_fn):
         secret_path = sops_folder / secret_name
         changed_paths.append(secret_path)
         shutil.rmtree(secret_path)
 
-    machine = Machine(name, flake)
     changed_paths.extend(machine.public_vars_store.delete_store())
     changed_paths.extend(machine.secret_vars_store.delete_store())
     # Remove the machine's key, and update secrets & vars that referenced it:
-    if secrets_has_machine(flake.path, name):
-        secrets_machine_remove(flake.path, name)
+    if secrets_has_machine(machine.flake.path, machine.name):
+        secrets_machine_remove(machine.flake.path, machine.name)
 
 
 def delete_command(args: argparse.Namespace) -> None:
-    delete_machine(args.flake, args.name)
+    delete_machine(Machine(flake=args.flake, name=args.name))
 
 
 def register_delete_parser(parser: argparse.ArgumentParser) -> None:

pkgs/clan-cli/clan_cli/machines/hardware.py

@@ -7,11 +7,10 @@ from pathlib import Path
 
 from clan_lib.api import API
 
-from clan_cli.cmd import RunOpts, run_no_stdout
+from clan_cli.cmd import RunOpts, run
 from clan_cli.completions import add_dynamic_completer, complete_machines
 from clan_cli.dirs import specific_machine_dir
 from clan_cli.errors import ClanCmdError, ClanError
-from clan_cli.flake import Flake
 from clan_cli.git import commit_file
 from clan_cli.machines.machines import Machine
 from clan_cli.nix import nix_config, nix_eval
@@ -26,39 +25,35 @@ class HardwareConfig(Enum):
     NIXOS_GENERATE_CONFIG = "nixos-generate-config"
     NONE = "none"
 
-    def config_path(self, flake: Flake, machine_name: str) -> Path:
-        machine_dir = specific_machine_dir(flake, machine_name)
+    def config_path(self, machine: Machine) -> Path:
+        machine_dir = specific_machine_dir(machine)
         if self == HardwareConfig.NIXOS_FACTER:
             return machine_dir / "facter.json"
         return machine_dir / "hardware-configuration.nix"
 
     @classmethod
-    def detect_type(
-        cls: type["HardwareConfig"], flake: Flake, machine_name: str
-    ) -> "HardwareConfig":
-        hardware_config = HardwareConfig.NIXOS_GENERATE_CONFIG.config_path(
-            flake, machine_name
-        )
+    def detect_type(cls: type["HardwareConfig"], machine: Machine) -> "HardwareConfig":
+        hardware_config = HardwareConfig.NIXOS_GENERATE_CONFIG.config_path(machine)
 
         if hardware_config.exists() and "throw" not in hardware_config.read_text():
             return HardwareConfig.NIXOS_GENERATE_CONFIG
 
-        if HardwareConfig.NIXOS_FACTER.config_path(flake, machine_name).exists():
+        if HardwareConfig.NIXOS_FACTER.config_path(machine).exists():
             return HardwareConfig.NIXOS_FACTER
 
         return HardwareConfig.NONE
 
 
 @API.register
-def show_machine_hardware_config(flake: Flake, machine_name: str) -> HardwareConfig:
+def show_machine_hardware_config(machine: Machine) -> HardwareConfig:
     """
     Show hardware information for a machine returns None if none exist.
     """
-    return HardwareConfig.detect_type(flake, machine_name)
+    return HardwareConfig.detect_type(machine)
 
 
 @API.register
-def show_machine_hardware_platform(flake: Flake, machine_name: str) -> str | None:
+def show_machine_hardware_platform(machine: Machine) -> str | None:
     """
     Show hardware information for a machine returns None if none exist.
     """
@@ -66,13 +61,13 @@ def show_machine_hardware_platform(flake: Flake, machine_name: str) -> str | Non
     system = config["system"]
     cmd = nix_eval(
         [
-            f"{flake}#clanInternals.machines.{system}.{machine_name}",
+            f"{machine.flake}#clanInternals.machines.{system}.{machine.name}",
             "--apply",
             "machine: { inherit (machine.pkgs) system; }",
             "--json",
         ]
     )
-    proc = run_no_stdout(cmd, RunOpts(prefix=machine_name))
+    proc = run(cmd, RunOpts(prefix=machine.name))
     res = proc.stdout.strip()
 
     host_platform = json.loads(res)
@@ -81,11 +76,8 @@ def show_machine_hardware_platform(flake: Flake, machine_name: str) -> str | Non
 
 @dataclass
 class HardwareGenerateOptions:
-    flake: Flake
-    machine: str
+    machine: Machine
     backend: HardwareConfig
-    target_host: str | None = None
-    keyfile: str | None = None
     password: str | None = None
 
 
@@ -96,14 +88,9 @@ def generate_machine_hardware_info(opts: HardwareGenerateOptions) -> HardwareCon
     and place the resulting *.nix file in the machine's directory.
     """
 
-    machine = Machine(
-        opts.machine,
-        flake=opts.flake,
-        private_key=Path(opts.keyfile) if opts.keyfile else None,
-        override_target_host=opts.target_host,
-    )
+    machine = opts.machine
 
-    hw_file = opts.backend.config_path(opts.flake, opts.machine)
+    hw_file = opts.backend.config_path(opts.machine)
     hw_file.parent.mkdir(parents=True, exist_ok=True)
 
     if opts.backend == HardwareConfig.NIXOS_FACTER:
@@ -148,11 +135,11 @@ def generate_machine_hardware_info(opts: HardwareGenerateOptions) -> HardwareCon
 
     commit_file(
         hw_file,
-        opts.flake.path,
+        opts.machine.flake.path,
         f"machines/{opts.machine}/{hw_file.name}: update hardware configuration",
     )
     try:
-        show_machine_hardware_platform(opts.flake, opts.machine)
+        show_machine_hardware_platform(opts.machine)
         if backup_file:
             backup_file.unlink(missing_ok=True)
     except ClanCmdError as e:
@@ -173,10 +160,13 @@ def generate_machine_hardware_info(opts: HardwareGenerateOptions) -> HardwareCon
 
 
 def update_hardware_config_command(args: argparse.Namespace) -> None:
-    opts = HardwareGenerateOptions(
+    machine = Machine(
         flake=args.flake,
-        machine=args.machine,
-        target_host=args.target_host,
+        name=args.machine,
+        override_target_host=args.target_host,
+    )
+    opts = HardwareGenerateOptions(
+        machine=machine,
         password=args.password,
         backend=HardwareConfig(args.backend),
     )

pkgs/clan-cli/clan_cli/machines/install.py

@@ -111,11 +111,7 @@ def install_machine(opts: InstallOptions) -> None:
                 [
                     "--generate-hardware-config",
                     str(opts.update_hardware_config.value),
-                    str(
-                        opts.update_hardware_config.config_path(
-                            machine.flake, machine.name
-                        )
-                    ),
+                    str(opts.update_hardware_config.config_path(machine)),
                 ]
             )
 

pkgs/clan-cli/clan_cli/machines/list.py

@@ -67,9 +67,9 @@ def get_machine_details(machine: Machine) -> MachineDetails:
         msg = f"Machine {machine.name} not found in inventory"
         raise ClanError(msg)
 
-    hw_config = HardwareConfig.detect_type(machine.flake, machine.name)
+    hw_config = HardwareConfig.detect_type(machine)
 
-    machine_dir = specific_machine_dir(machine.flake, machine.name)
+    machine_dir = specific_machine_dir(machine)
     disk_schema: MachineDiskMatter | None = None
     disk_path = machine_dir / "disko.nix"
     if disk_path.exists():

pkgs/clan-cli/clan_cli/machines/machines.py

@@ -9,7 +9,7 @@ from functools import cached_property
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
-from clan_cli.cmd import Log, RunOpts, run_no_stdout
+from clan_cli.cmd import Log, RunOpts, run
 from clan_cli.errors import ClanCmdError, ClanError
 from clan_cli.facts import public_modules as facts_public_modules
 from clan_cli.facts import secret_modules as facts_secret_modules
@@ -188,7 +188,7 @@ class Machine:
         # however there is a soon to be merged PR that requires deployment
         # as root to match NixOS: https://github.com/nix-darwin/nix-darwin/pull/1341
         return json.loads(
-            run_no_stdout(
+            run(
                 nix_eval(
                     [
                         f"{self.flake}#darwinConfigurations.{self.name}.options.system",

pkgs/clan-cli/clan_cli/machines/update.py

@@ -10,7 +10,7 @@ from contextlib import ExitStack
 from clan_lib.api import API
 
 from clan_cli.async_run import AsyncContext, AsyncOpts, AsyncRuntime, is_async_cancelled
-from clan_cli.cmd import MsgColor, RunOpts, run
+from clan_cli.cmd import Log, MsgColor, RunOpts, run
 from clan_cli.colors import AnsiColor
 from clan_cli.completions import (
     add_dynamic_completer,
@@ -141,7 +141,7 @@ def deploy_machine(machine: Machine) -> None:
         generate_facts([machine], service=None, regenerate=False)
         generate_vars([machine], generator_name=None, regenerate=False)
 
-        upload_secrets(machine, target_host)
+        upload_secrets(machine)
         upload_secret_vars(machine, target_host)
 
         path = upload_sources(machine, host)
@@ -182,16 +182,16 @@ def deploy_machine(machine: Machine) -> None:
         remote_env = host.nix_ssh_env(None, local_ssh=False)
         ret = host.run(
             switch_cmd,
-            RunOpts(check=False, msg_color=MsgColor(stderr=AnsiColor.DEFAULT)),
+            RunOpts(
+                check=False,
+                log=Log.BOTH,
+                msg_color=MsgColor(stderr=AnsiColor.DEFAULT),
+                needs_user_terminal=True,
+            ),
             extra_env=remote_env,
             become_root=become_root,
         )
 
-        # Last output line (config store path) is printed to stdout instead of stderr
-        lines = ret.stdout.splitlines()
-        if lines:
-            print(lines[-1])
-
         if is_async_cancelled():
             return
 
@@ -206,6 +206,7 @@ def deploy_machine(machine: Machine) -> None:
             ret = host.run(
                 test_cmd if is_mobile else switch_cmd,
                 RunOpts(
+                    log=Log.BOTH,
                     msg_color=MsgColor(stderr=AnsiColor.DEFAULT),
                     needs_user_terminal=True,
                 ),

pkgs/clan-cli/clan_cli/nix/__init__.py

@@ -1,12 +1,13 @@
 import json
 import logging
 import os
+import shutil
 import tempfile
 from functools import cache
 from pathlib import Path
 from typing import Any
 
-from clan_cli.cmd import run, run_no_stdout
+from clan_cli.cmd import run
 from clan_cli.dirs import nixpkgs_flake, nixpkgs_source
 from clan_cli.errors import ClanError
 from clan_cli.locked_open import locked_open
@@ -55,7 +56,7 @@ def nix_add_to_gcroots(nix_path: Path, dest: Path) -> None:
 @cache
 def nix_config() -> dict[str, Any]:
     cmd = nix_command(["config", "show", "--json"])
-    proc = run_no_stdout(cmd)
+    proc = run(cmd)
     data = json.loads(proc.stdout)
     config = {}
     for key, value in data.items():
@@ -131,7 +132,16 @@ class Packages:
             cls.static_packages = set(
                 os.environ.get("CLAN_PROVIDED_PACKAGES", "").split(":")
             )
-        return program in cls.static_packages
+
+        if program in cls.static_packages:
+            if shutil.which(program) is None:
+                log.warning(
+                    "Program %s is not in the path even though it should be shipped with clan",
+                    program,
+                )
+                return False
+            return True
+        return False
 
 
 #   Features:

pkgs/clan-cli/clan_cli/nix/allowed-packages.json

@@ -6,6 +6,7 @@
   "age-plugin-sss",
   "age-plugin-tpm",
   "age-plugin-yubikey",
+  "age-plugin-1p",
   "avahi",
   "bash",
   "bubblewrap",

pkgs/clan-cli/clan_cli/ssh/upload.py

@@ -63,7 +63,8 @@ def upload(
                     for mdir in dirs:
                         dir_path = Path(root) / mdir
                         tarinfo = tar.gettarinfo(
-                            dir_path, arcname=str(dir_path.relative_to(str(local_src)))
+                            dir_path,
+                            arcname=str(dir_path.relative_to(str(local_src))),
                         )
                         tarinfo.mode = dir_mode
                         tarinfo.uname = file_user

pkgs/clan-cli/clan_cli/state/list.py

@@ -3,7 +3,7 @@ import json
 import logging
 from pathlib import Path
 
-from clan_cli.cmd import RunOpts, run_no_stdout
+from clan_cli.cmd import RunOpts, run
 from clan_cli.completions import (
     add_dynamic_completer,
     complete_machines,
@@ -32,7 +32,7 @@ def list_state_folders(machine: Machine, service: None | str = None) -> None:
     res = "{}"
 
     try:
-        proc = run_no_stdout(cmd, opts=RunOpts(prefix=machine.name))
+        proc = run(cmd, RunOpts(prefix=machine.name))
         res = proc.stdout.strip()
     except ClanCmdError as e:
         msg = "Clan might not have meta attributes"

pkgs/clan-cli/clan_cli/tags.py

@@ -2,7 +2,7 @@ import json
 from pathlib import Path
 from typing import Any
 
-from clan_cli.cmd import run_no_stdout
+from clan_cli.cmd import run
 from clan_cli.errors import ClanError
 from clan_cli.nix import nix_eval
 
@@ -18,7 +18,7 @@ def list_tagged_machines(flake_url: str | Path) -> dict[str, Any]:
             "--json",
         ]
     )
-    proc = run_no_stdout(cmd)
+    proc = run(cmd)
 
     try:
         res = proc.stdout.strip()

pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py

@@ -10,8 +10,15 @@ from pathlib import Path
 from typing import Any, NamedTuple
 
 import pytest
-from clan_cli.dirs import TemplateType, clan_templates, nixpkgs_source
+from clan_cli.dirs import (
+    TemplateType,
+    clan_templates,
+    nixpkgs_source,
+    specific_machine_dir,
+)
+from clan_cli.flake import Flake
 from clan_cli.locked_open import locked_open
+from clan_cli.machines.machines import Machine
 from clan_cli.nix import nix_test_store
 from clan_cli.tests import age_keys
 from clan_cli.tests.fixture_error import FixtureError
@@ -70,11 +77,10 @@ class FlakeForTest(NamedTuple):
 
 
 def set_machine_settings(
-    flake: Path,
-    machine_name: str,
+    machine: Machine,
     machine_settings: dict,
 ) -> None:
-    config_path = flake / "machines" / machine_name / "configuration.json"
+    config_path = specific_machine_dir(machine) / "configuration.json"
     config_path.write_text(json.dumps(machine_settings, indent=2))
 
 
@@ -202,7 +208,8 @@ class ClanFlake:
                 }}
             """
             )
-            set_machine_settings(self.path, machine_name, machine_config)
+            machine = Machine(name=machine_name, flake=Flake(str(self.path)))
+            set_machine_settings(machine, machine_config)
         sp.run(["git", "add", "."], cwd=self.path, check=True)
         sp.run(
             ["git", "commit", "-a", "-m", "Update by flake generator"],

pkgs/clan-cli/clan_cli/tests/test_modules.py

@@ -11,7 +11,7 @@ from clan_cli.inventory import (
     set_inventory,
 )
 from clan_cli.machines.create import CreateOptions, create_machine
-from clan_cli.nix import nix_eval, run_no_stdout
+from clan_cli.nix import nix_eval, run
 from clan_cli.tests.fixtures_flakes import FlakeForTest
 from clan_lib.api.modules import list_modules
 
@@ -27,10 +27,8 @@ def test_list_modules(test_flake_with_core: FlakeForTest) -> None:
     base_path = test_flake_with_core.path
     modules_info = list_modules(str(base_path))
 
-    assert len(modules_info.items()) > 1
-    # Random test for those two modules
-    assert "borgbackup" in modules_info
-    assert "syncthing" in modules_info
+    assert "localModules" in modules_info
+    assert "modulesPerSource" in modules_info
 
 
 @pytest.mark.impure
@@ -122,7 +120,7 @@ def test_add_module_to_inventory(
                 "--json",
             ]
         )
-        proc = run_no_stdout(cmd)
+        proc = run(cmd)
         res = json.loads(proc.stdout.strip())
 
         assert res["machine1"]["authorizedKeys"] == [ssh_key.decode()]

pkgs/clan-cli/clan_cli/tests/test_vars.py

@@ -12,7 +12,12 @@ from clan_cli.tests.age_keys import SopsSetup
 from clan_cli.tests.fixtures_flakes import ClanFlake
 from clan_cli.tests.helpers import cli
 from clan_cli.vars.check import check_vars
-from clan_cli.vars.generate import Generator, generate_vars_for_machine_interactive
+from clan_cli.vars.generate import (
+    Generator,
+    generate_vars_for_machine,
+    generate_vars_for_machine_interactive,
+    get_generators_closure,
+)
 from clan_cli.vars.get import get_var
 from clan_cli.vars.graph import all_missing_closure, requested_closure
 from clan_cli.vars.list import stringify_all_vars
@@ -640,9 +645,6 @@ def test_api_set_prompts(
     monkeypatch: pytest.MonkeyPatch,
     flake: ClanFlake,
 ) -> None:
-    from clan_cli.vars._types import GeneratorUpdate
-    from clan_cli.vars.list import get_generators, set_prompts
-
     config = flake.machines["my_machine"]
     config["nixpkgs"]["hostPlatform"] = "x86_64-linux"
     my_generator = config["clan"]["core"]["vars"]["generators"]["my_generator"]
@@ -652,33 +654,39 @@ def test_api_set_prompts(
     flake.refresh()
 
     monkeypatch.chdir(flake.path)
-    params = {"machine_name": "my_machine", "base_dir": str(flake.path)}
 
-    set_prompts(
-        **params,
-        updates=[
-            GeneratorUpdate(
-                generator="my_generator",
-                prompt_values={"prompt1": "input1"},
-            )
-        ],
+    generate_vars_for_machine(
+        machine_name="my_machine",
+        base_dir=flake.path,
+        generators=["my_generator"],
+        all_prompt_values={
+            "my_generator": {
+                "prompt1": "input1",
+            }
+        },
     )
     machine = Machine(name="my_machine", flake=Flake(str(flake.path)))
     store = in_repo.FactStore(machine)
     assert store.exists(Generator("my_generator"), "prompt1")
     assert store.get(Generator("my_generator"), "prompt1").decode() == "input1"
-    set_prompts(
-        **params,
-        updates=[
-            GeneratorUpdate(
-                generator="my_generator",
-                prompt_values={"prompt1": "input2"},
-            )
-        ],
+    generate_vars_for_machine(
+        machine_name="my_machine",
+        base_dir=flake.path,
+        generators=["my_generator"],
+        all_prompt_values={
+            "my_generator": {
+                "prompt1": "input2",
+            }
+        },
     )
     assert store.get(Generator("my_generator"), "prompt1").decode() == "input2"
 
-    generators = get_generators(**params)
+    generators = get_generators_closure(
+        machine_name="my_machine",
+        base_dir=flake.path,
+        regenerate=True,
+        include_previous_values=True,
+    )
     assert len(generators) == 1
     assert generators[0].name == "my_generator"
     assert generators[0].prompts[0].name == "prompt1"

pkgs/clan-cli/clan_cli/vars/generate.py

@@ -103,6 +103,7 @@ def bubblewrap_cmd(generator: str, tmpdir: Path) -> list[str]:
             "--unshare-all",
             "--tmpfs",  "/",
             "--ro-bind", "/nix/store", "/nix/store",
+            "--ro-bind", "/bin/sh", "/bin/sh",
             *(["--ro-bind", str(test_store), str(test_store)] if test_store else []),
             "--dev", "/dev",
             # not allowed to bind procfs in some sandboxes
@@ -294,10 +295,28 @@ def _ask_prompts(
     return prompt_values
 
 
+def _get_previous_value(
+    machine: "Machine",
+    generator: Generator,
+    prompt: Prompt,
+) -> str | None:
+    if not prompt.persist:
+        return None
+
+    pub_store = machine.public_vars_store
+    if pub_store.exists(generator, prompt.name):
+        return pub_store.get(generator, prompt.name).decode()
+    sec_store = machine.secret_vars_store
+    if sec_store.exists(generator, prompt.name):
+        return sec_store.get(generator, prompt.name).decode()
+    return None
+
+
 def get_closure(
     machine: "Machine",
     generator_name: str | None,
     regenerate: bool,
+    include_previous_values: bool = False,
 ) -> list[Generator]:
     from .graph import all_missing_closure, full_closure
 
@@ -310,14 +329,24 @@ def get_closure(
     for generator in vars_generators:
         generator.machine(machine)
 
+    result_closure = []
     if generator_name is None:  # all generators selected
         if regenerate:
-            return full_closure(generators)
-        return all_missing_closure(generators)
+            result_closure = full_closure(generators)
+        else:
+            result_closure = all_missing_closure(generators)
     # specific generator selected
-    if regenerate:
-        return requested_closure([generator_name], generators)
-    return minimal_closure([generator_name], generators)
+    elif regenerate:
+        result_closure = requested_closure([generator_name], generators)
+    else:
+        result_closure = minimal_closure([generator_name], generators)
+
+    if include_previous_values:
+        for generator in result_closure:
+            for prompt in generator.prompts:
+                prompt.previous_value = _get_previous_value(machine, generator, prompt)
+
+    return result_closure
 
 
 @API.register
@@ -325,6 +354,7 @@ def get_generators_closure(
     machine_name: str,
     base_dir: Path,
     regenerate: bool = False,
+    include_previous_values: bool = False,
 ) -> list[Generator]:
     from clan_cli.machines.machines import Machine
 
@@ -332,13 +362,14 @@ def get_generators_closure(
         machine=Machine(name=machine_name, flake=Flake(str(base_dir))),
         generator_name=None,
         regenerate=regenerate,
+        include_previous_values=include_previous_values,
     )
 
 
 def _generate_vars_for_machine(
     machine: "Machine",
     generators: list[Generator],
-    all_prompt_values: dict[str, dict],
+    all_prompt_values: dict[str, dict[str, str]],
     no_sandbox: bool = False,
 ) -> bool:
     for generator in generators:
@@ -350,7 +381,7 @@ def _generate_vars_for_machine(
                 generator=generator,
                 secret_vars_store=machine.secret_vars_store,
                 public_vars_store=machine.public_vars_store,
-                prompt_values=all_prompt_values[generator.name],
+                prompt_values=all_prompt_values.get(generator.name, {}),
                 no_sandbox=no_sandbox,
             )
     return True

pkgs/clan-cli/clan_lib/api/directory.py

@@ -4,9 +4,10 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Literal
 
-from clan_cli.cmd import RunOpts
+from clan_cli.cmd import RunOpts, run
 from clan_cli.errors import ClanError
-from clan_cli.nix import nix_shell, run_no_stdout
+from clan_cli.flake import Flake
+from clan_cli.nix import nix_shell
 
 from . import API
 
@@ -52,8 +53,8 @@ class Directory:
 
 
 @API.register
-def get_directory(current_path: str) -> Directory:
-    curr_dir = Path(current_path)
+def get_directory(flake: Flake) -> Directory:
+    curr_dir = flake.path
     directory = Directory(path=str(curr_dir))
 
     if not curr_dir.is_dir():
@@ -135,7 +136,7 @@ def show_block_devices() -> Blockdevices:
             "PATH,NAME,RM,SIZE,RO,MOUNTPOINTS,TYPE,ID-LINK",
         ],
     )
-    proc = run_no_stdout(cmd, RunOpts(needs_user_terminal=True))
+    proc = run(cmd, RunOpts(needs_user_terminal=True))
     res = proc.stdout.strip()
 
     blk_info: dict[str, Any] = json.loads(res)

pkgs/clan-cli/clan_lib/api/disk.py

@@ -7,9 +7,9 @@ from uuid import uuid4
 
 from clan_cli.dirs import TemplateType, clan_templates
 from clan_cli.errors import ClanError
-from clan_cli.flake import Flake
 from clan_cli.git import commit_file
 from clan_cli.machines.hardware import HardwareConfig, show_machine_hardware_config
+from clan_cli.machines.machines import Machine
 
 from clan_lib.api import API
 from clan_lib.api.modules import Frontmatter, extract_frontmatter
@@ -74,9 +74,7 @@ templates: dict[str, dict[str, Callable[[dict[str, Any]], Placeholder]]] = {
 
 
 @API.register
-def get_disk_schemas(
-    flake: Flake, machine_name: str | None = None
-) -> dict[str, DiskSchema]:
+def get_disk_schemas(machine: Machine) -> dict[str, DiskSchema]:
     """
     Get the available disk schemas
     """
@@ -84,13 +82,12 @@ def get_disk_schemas(
     disk_schemas = {}
     hw_report = {}
 
-    if machine_name is not None:
-        hw_report_path = HardwareConfig.NIXOS_FACTER.config_path(flake, machine_name)
-        if not hw_report_path.exists():
-            msg = "Hardware configuration missing"
-            raise ClanError(msg)
-        with hw_report_path.open("r") as hw_report_file:
-            hw_report = json.load(hw_report_file)
+    hw_report_path = HardwareConfig.NIXOS_FACTER.config_path(machine)
+    if not hw_report_path.exists():
+        msg = "Hardware configuration missing"
+        raise ClanError(msg)
+    with hw_report_path.open("r") as hw_report_file:
+        hw_report = json.load(hw_report_file)
 
     for disk_template in disk_templates.iterdir():
         if disk_template.is_dir():
@@ -130,8 +127,7 @@ class MachineDiskMatter(TypedDict):
 
 @API.register
 def set_machine_disk_schema(
-    flake: Flake,
-    machine_name: str,
+    machine: Machine,
     schema_name: str,
     # Placeholders are used to fill in the disk schema
     # Use get disk schemas to get the placeholders and their options
@@ -142,8 +138,8 @@ def set_machine_disk_schema(
     Set the disk placeholders of the template
     """
     # Assert the hw-config must exist before setting the disk
-    hw_config = show_machine_hardware_config(flake, machine_name)
-    hw_config_path = hw_config.config_path(flake, machine_name)
+    hw_config = show_machine_hardware_config(machine)
+    hw_config_path = hw_config.config_path(machine)
 
     if not hw_config_path.exists():
         msg = "Hardware configuration must exist before applying disk schema"
@@ -160,7 +156,7 @@ def set_machine_disk_schema(
         raise ClanError(msg)
 
     # Check that the placeholders are valid
-    disk_schema = get_disk_schemas(flake, machine_name)[schema_name]
+    disk_schema = get_disk_schemas(machine)[schema_name]
     # check that all required placeholders are present
     for placeholder_name, schema_placeholder in disk_schema.placeholders.items():
         if schema_placeholder.required and placeholder_name not in placeholders:
@@ -221,6 +217,6 @@ def set_machine_disk_schema(
 
         commit_file(
             disko_file_path,
-            flake.path,
-            commit_message=f"Set disk schema of machine: {machine_name} to {schema_name}",
+            machine.flake.path,
+            commit_message=f"Set disk schema of machine: {machine.name} to {schema_name}",
         )

pkgs/clan-cli/clan_lib/api/mdns_discovery.py

@@ -2,7 +2,7 @@ import argparse
 import re
 from dataclasses import dataclass
 
-from clan_cli.cmd import run_no_stdout
+from clan_cli.cmd import run
 from clan_cli.nix import nix_shell
 
 from . import API
@@ -100,7 +100,7 @@ def show_mdns() -> DNSInfo:
             "--terminate",
         ],
     )
-    proc = run_no_stdout(cmd)
+    proc = run(cmd)
     data = parse_avahi_output(proc.stdout)
 
     return data

pkgs/clan-cli/clan_lib/api/modules.py

@@ -1,13 +1,11 @@
-import json
 import re
 import tomllib
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, TypedDict
 
-from clan_cli.cmd import run_no_stdout
-from clan_cli.errors import ClanCmdError, ClanError
-from clan_cli.nix import nix_eval
+from clan_cli.errors import ClanError
+from clan_cli.flake import Flake
 
 from . import API
 
@@ -143,53 +141,50 @@ def get_roles(module_path: Path) -> None | list[str]:
     ]
 
 
+class ModuleManifest(TypedDict):
+    name: str
+    features: dict[str, bool]
+
+
 @dataclass
 class ModuleInfo:
-    description: str
-    readme: str
-    categories: list[str]
-    roles: list[str] | None
-    features: list[str] = field(default_factory=list)
-    constraints: dict[str, Any] = field(default_factory=dict)
+    manifest: ModuleManifest
+    roles: dict[str, None]
 
 
-def get_modules(base_path: str) -> dict[str, str]:
-    cmd = nix_eval(
-        [
-            f"{base_path}#clanInternals.inventory.modules",
-            "--json",
-        ]
-    )
-    try:
-        proc = run_no_stdout(cmd)
-        res = proc.stdout.strip()
-    except ClanCmdError as e:
-        msg = "clanInternals might not have inventory.modules attributes"
-        raise ClanError(
-            msg,
-            location=f"list_modules {base_path}",
-            description="Evaluation failed on clanInternals.inventory.modules attribute",
-        ) from e
-    modules: dict[str, str] = json.loads(res)
-    return modules
+class ModuleLists(TypedDict):
+    modulesPerSource: dict[str, dict[str, ModuleInfo]]
+    localModules: dict[str, ModuleInfo]
 
 
 @API.register
-def list_modules(base_path: str) -> dict[str, ModuleInfo]:
+def list_modules(base_path: str) -> ModuleLists:
     """
     Show information about a module
     """
-    modules = get_modules(base_path)
-    return {
-        module_name: get_module_info(module_name, Path(module_path))
-        for module_name, module_path in modules.items()
-    }
+    flake = Flake(base_path)
+    modules = flake.select(
+        "clanInternals.inventoryClass.{?modulesPerSource,?localModules}"
+    )
+    print("Modules found:", modules)
+
+    return modules
+
+
+@dataclass
+class LegacyModuleInfo:
+    description: str
+    categories: list[str]
+    roles: None | list[str]
+    readme: str
+    features: list[str]
+    constraints: dict[str, Any]
 
 
 def get_module_info(
     module_name: str,
     module_path: Path,
-) -> ModuleInfo:
+) -> LegacyModuleInfo:
     """
     Retrieves information about a module
     """
@@ -214,7 +209,7 @@ def get_module_info(
             readme, f"{module_path}/README.md"
         )
 
-    return ModuleInfo(
+    return LegacyModuleInfo(
         description=frontmatter.description,
         categories=frontmatter.categories,
         roles=get_roles(module_path),

pkgs/clan-cli/clan_lib/tests/test_create.py

@@ -240,7 +240,7 @@ def test_clan_create_api(
     facter_json = test_lib_root / "assets" / "facter.json"
     assert facter_json.exists(), f"Source facter file not found: {facter_json}"
 
-    dest_dir = specific_machine_dir(Flake(str(clan_dir_flake.path)), machine.name)
+    dest_dir = specific_machine_dir(machine)
     # specific_machine_dir should create the directory, but ensure it exists just in case
     dest_dir.mkdir(parents=True, exist_ok=True)
 
@@ -253,10 +253,7 @@ def test_clan_create_api(
     )
 
     # ===== Create Disko Config ======
-    facter_path = (
-        specific_machine_dir(Flake(str(clan_dir_flake.path)), machine.name)
-        / "facter.json"
-    )
+    facter_path = specific_machine_dir(machine) / "facter.json"
     with facter_path.open("r") as f:
         facter_report = json.load(f)
 
@@ -265,7 +262,7 @@ def test_clan_create_api(
     assert disk_devs is not None
 
     placeholders = {"mainDisk": disk_devs[0]}
-    set_machine_disk_schema(clan_dir_flake, machine.name, "single-disk", placeholders)
+    set_machine_disk_schema(machine, "single-disk", placeholders)
     clan_dir_flake.invalidate_cache()
 
     with pytest.raises(ClanError) as exc_info:

pkgs/flake-module.nix

@@ -36,6 +36,7 @@
         classgen = pkgs.callPackage ./classgen { };
         zerotierone = pkgs.callPackage ./zerotierone { };
         webview-lib = pkgs.callPackage ./webview-lib { };
+        update-clan-core-for-checks = pkgs.callPackage ./update-clan-core-for-checks { };
       };
     };
 }

pkgs/update-clan-core-for-checks/default.nix

@@ -0,0 +1,35 @@
+{
+  writeShellApplication,
+  git,
+  jq,
+  nix-prefetch-git,
+}:
+writeShellApplication {
+  name = "update-clan-core-for-checks";
+  runtimeInputs = [
+    git
+    jq
+    nix-prefetch-git
+  ];
+  text = ''
+    reporoot=$(git rev-parse --show-toplevel)
+    if [ -z "$reporoot" ]; then
+      echo "Not in a git repository. Please run this script from the root of the repository."
+      exit 1
+    fi
+    cd "$reporoot"
+    # get latest commit of clan-core
+    json=$(nix-prefetch-git "$(pwd)")
+    sha256=$(jq -r '.sha256' <<< "$json")
+    rev=$(jq -r '.rev' <<< "$json")
+
+    cat > ./checks/clan-core-for-checks.nix <<EOF
+    { fetchgit }:
+    fetchgit {
+      url = "https://git.clan.lol/clan/clan-core.git";
+      rev = "$rev";
+      sha256 = "$sha256";
+    }
+    EOF
+  '';
+}

pkgs/webview-ui/app/src/App.tsx

@@ -22,7 +22,9 @@ export { clanList, setClanList };
 (async function () {
   const curr = activeURI();
   if (curr) {
-    const result = await callApi("show_clan_meta", { uri: curr });
+    const result = await callApi("show_clan_meta", {
+      flake: { identifier: curr },
+    });
     console.log("refetched meta for ", curr);
     if (result.status === "error") {
       result.errors.forEach((error) => {

pkgs/webview-ui/app/src/Form/fields/Select.tsx

@@ -142,91 +142,87 @@ export function SelectInput(props: SelectInputpProps) {
           </InputLabel>
         }
         field={
-          <>
-            <InputBase
-              error={!!props.error}
-              disabled={props.disabled}
-              required={props.required}
-              class="!justify-start"
-              divRef={setReference}
-              inputElem={
-                <button
-                  // TODO: Keyboard acessibililty
-                  // Currently the popover only opens with onClick
-                  // Options are not selectable with keyboard
-                  tabIndex={-1}
-                  disabled={props.disabled}
-                  onClick={() => {
-                    const popover = document.getElementById(_id);
-                    if (popover) {
-                      popover.togglePopover(); // Show or hide the popover
-                    }
-                  }}
-                  type="button"
-                  class="flex w-full items-center gap-2"
-                  formnovalidate
-                  // TODO: Use native popover once Webkit supports it within <form>
-                  // popovertarget={_id}
-                  // popovertargetaction="toggle"
+          <InputBase
+            error={!!props.error}
+            disabled={props.disabled}
+            required={props.required}
+            class="!justify-start"
+            divRef={setReference}
+            inputElem={
+              <button
+                // TODO: Keyboard acessibililty
+                // Currently the popover only opens with onClick
+                // Options are not selectable with keyboard
+                tabIndex={-1}
+                disabled={props.disabled}
+                onClick={() => {
+                  const popover = document.getElementById(_id);
+                  if (popover) {
+                    popover.togglePopover(); // Show or hide the popover
+                  }
+                }}
+                type="button"
+                class="flex w-full items-center gap-2"
+                formnovalidate
+                // TODO: Use native popover once Webkit supports it within <form>
+                // popovertarget={_id}
+                // popovertargetaction="toggle"
+              >
+                <Show
+                  when={props.adornment && props.adornment.position === "start"}
                 >
+                  {props.adornment?.content}
+                </Show>
+                {props.inlineLabel}
+                <div class="flex cursor-default flex-row gap-2">
                   <Show
                     when={
-                      props.adornment && props.adornment.position === "start"
+                      getValues() &&
+                      getValues.length !== 1 &&
+                      getValues()[0] !== ""
                     }
+                    fallback={props.placeholder}
                   >
-                    {props.adornment?.content}
+                    <For each={getValues()} fallback={"Select"}>
+                      {(item) => (
+                        <div class="rounded-xl bg-slate-800 px-4 py-1 text-sm text-white">
+                          {item}
+                          <Show when={props.multiple}>
+                            <button
+                              class=""
+                              type="button"
+                              onClick={(_e) => {
+                                // @ts-expect-error: fieldName is not known ahead of time
+                                props.selectProps.onInput({
+                                  currentTarget: {
+                                    options: getValues()
+                                      .filter((o) => o !== item)
+                                      .map((value) => ({
+                                        value,
+                                        selected: true,
+                                        disabled: false,
+                                      })),
+                                  },
+                                });
+                              }}
+                            >
+                              X
+                            </button>
+                          </Show>
+                        </div>
+                      )}
+                    </For>
                   </Show>
-                  {props.inlineLabel}
-                  <div class="flex cursor-default flex-row gap-2">
-                    <Show
-                      when={
-                        getValues() &&
-                        getValues.length !== 1 &&
-                        getValues()[0] !== ""
-                      }
-                      fallback={props.placeholder}
-                    >
-                      <For each={getValues()} fallback={"Select"}>
-                        {(item) => (
-                          <div class="rounded-xl bg-slate-800 px-4 py-1 text-sm text-white">
-                            {item}
-                            <Show when={props.multiple}>
-                              <button
-                                class=""
-                                type="button"
-                                onClick={(_e) => {
-                                  // @ts-expect-error: fieldName is not known ahead of time
-                                  props.selectProps.onInput({
-                                    currentTarget: {
-                                      options: getValues()
-                                        .filter((o) => o !== item)
-                                        .map((value) => ({
-                                          value,
-                                          selected: true,
-                                          disabled: false,
-                                        })),
-                                    },
-                                  });
-                                }}
-                              >
-                                X
-                              </button>
-                            </Show>
-                          </div>
-                        )}
-                      </For>
-                    </Show>
-                  </div>
-                  <Show
-                    when={props.adornment && props.adornment.position === "end"}
-                  >
-                    {props.adornment?.content}
-                  </Show>
-                  <Icon icon="CaretDown" class="ml-auto mr-2"></Icon>
-                </button>
-              }
-            />
-          </>
+                </div>
+                <Show
+                  when={props.adornment && props.adornment.position === "end"}
+                >
+                  {props.adornment?.content}
+                </Show>
+                <Icon size={12} icon="CaretDown" class="ml-auto mr-2" />
+              </button>
+            }
+          />
         }
       />
 

pkgs/webview-ui/app/src/Form/fields/layout.tsx

@@ -18,7 +18,7 @@ export const FieldLayout = (props: LayoutProps) => {
       class={cx("grid grid-cols-10 items-center", intern.class)}
       {...divProps}
     >
-      <label class="col-span-5">{props.label}</label>
+      <div class="col-span-5 flex items-center">{props.label}</div>
       <div class="col-span-5">{props.field}</div>
       {props.error && <span class="col-span-full">{props.error}</span>}
     </div>

pkgs/webview-ui/app/src/Form/form/index.tsx

@@ -96,6 +96,7 @@ export const DynForm = (props: FormProps) => {
 
   return (
     <>
+      {/* @ts-expect-error: This happened after solidjs upgrade. TOOD: fixme */}
       <ModuleForm {...props.formProps} onSubmit={handleSubmit}>
         {props.components?.before}
         <SchemaFields

pkgs/webview-ui/app/src/api/inventory.ts

@@ -98,7 +98,6 @@ export async function set_single_service<T extends keyof Services>(
     inventory.services = inventory.services || {};
     inventory.services[service_name] = inventory.services[service_name] || {};
 
-    // @ts-expect-error: This doesn't check
     inventory.services[service_name][instance_key] = service_config;
     console.log("saving inventory", inventory);
     return callApi("set_inventory", {

pkgs/webview-ui/app/src/components/MachineListItem.tsx

@@ -1,224 +0,0 @@
-import { createSignal, For, Setter, Show } from "solid-js";
-import { callApi, SuccessQuery } from "../api";
-import { Menu } from "./Menu";
-import { activeURI } from "../App";
-import toast from "solid-toast";
-import { A, useNavigate } from "@solidjs/router";
-import { RndThumbnail } from "./noiseThumbnail";
-import Icon from "./icon";
-import { Filter } from "../routes/machines";
-import { Typography } from "./Typography";
-import { Button } from "./button";
-
-type MachineDetails = SuccessQuery<"list_machines">["data"][string];
-
-interface MachineListItemProps {
-  name: string;
-  info?: MachineDetails;
-  nixOnly?: boolean;
-  setFilter: Setter<Filter>;
-}
-
-export const MachineListItem = (props: MachineListItemProps) => {
-  const { name, info, nixOnly } = props;
-
-  // Bootstrapping
-  const [installing, setInstalling] = createSignal<boolean>(false);
-
-  // Later only updates
-  const [updating, setUpdating] = createSignal<boolean>(false);
-
-  const navigate = useNavigate();
-
-  const handleInstall = async () => {
-    if (!info?.deploy?.targetHost || installing()) {
-      return;
-    }
-
-    const active_clan = activeURI();
-    if (!active_clan) {
-      toast.error("No active clan selected");
-      return;
-    }
-    if (!info?.deploy?.targetHost) {
-      toast.error(
-        "Machine does not have a target host. Specify where the machine should be deployed.",
-      );
-      return;
-    }
-    setInstalling(true);
-    await toast.promise(
-      callApi("install_machine", {
-        opts: {
-          machine: {
-            name: name,
-            flake: {
-              identifier: active_clan,
-            },
-            override_target_host: info?.deploy.targetHost,
-          },
-          no_reboot: true,
-          debug: true,
-          nix_options: [],
-          password: null,
-        },
-      }),
-      {
-        loading: "Installing...",
-        success: "Installed",
-        error: "Failed to install",
-      },
-    );
-    setInstalling(false);
-  };
-
-  const handleUpdate = async () => {
-    if (!info?.deploy?.targetHost || installing()) {
-      return;
-    }
-
-    const active_clan = activeURI();
-    if (!active_clan) {
-      toast.error("No active clan selected");
-      return;
-    }
-    if (!info?.deploy.targetHost) {
-      toast.error(
-        "Machine does not have a target host. Specify where the machine should be deployed.",
-      );
-      return;
-    }
-    setUpdating(true);
-    await toast.promise(
-      callApi("update_machines", {
-        base_path: active_clan,
-        machines: [
-          {
-            name: name,
-            deploy: {
-              targetHost: info?.deploy.targetHost,
-            },
-          },
-        ],
-      }),
-      {
-        loading: "Updating...",
-        success: "Updated",
-        error: "Failed to update",
-      },
-    );
-    setUpdating(false);
-  };
-  return (
-    <div class="m-2 w-64 rounded-lg border p-3 border-def-2">
-      <figure class="h-fit rounded-xl border bg-def-2 border-def-5">
-        <RndThumbnail name={name} width={220} height={120} />
-      </figure>
-      <div class="flex-row justify-between gap-4 px-2 pt-2">
-        <div class="flex flex-col">
-          <A href={`/machines/${name}`}>
-            <Typography hierarchy="title" size="m" weight="bold">
-              {name}
-            </Typography>
-          </A>
-          <div class="flex justify-between text-slate-600">
-            <div class="flex flex-nowrap">
-              <span class="h-4">
-                <Icon icon="Flash" class="h-4" font-size="inherit" />
-              </span>
-              <Typography hierarchy="body" size="s" weight="medium">
-                <Show when={info}>
-                  {(d) => d()?.description || "no description"}
-                </Show>
-              </Typography>
-            </div>
-
-            <div class="self-end">
-              <Menu
-                popoverid={`menu-${props.name}`}
-                label={<Icon icon={"More"} />}
-              >
-                <ul class="z-[1] w-64 bg-white p-2 shadow ">
-                  <li>
-                    <Button
-                      variant="ghost"
-                      class="w-full"
-                      onClick={() => {
-                        navigate("/machines/" + name);
-                      }}
-                    >
-                      Details
-                    </Button>
-                  </li>
-                  <li
-                    classList={{
-                      disabled: !info?.deploy?.targetHost || installing(),
-                    }}
-                  >
-                    <Button
-                      variant="ghost"
-                      class="w-full"
-                      onClick={handleInstall}
-                    >
-                      Install
-                    </Button>
-                  </li>
-                  <li
-                    classList={{
-                      disabled: !info?.deploy?.targetHost || updating(),
-                    }}
-                  >
-                    <Button
-                      variant="ghost"
-                      class="w-full"
-                      onClick={handleUpdate}
-                    >
-                      Update
-                    </Button>
-                  </li>
-                </ul>
-              </Menu>
-            </div>
-          </div>
-          {/* <div class="text-slate-600">
-            <Show when={info}>
-              {(d) => (
-                <>
-                  <Show when={d().tags}>
-                    {(tags) => (
-                      <span class="flex gap-1">
-                        <For each={tags()}>
-                          {(tag) => (
-                            <button
-                              type="button"
-                              onClick={() =>
-                                props.setFilter((prev) => {
-                                  if (prev.tags.includes(tag)) {
-                                    return prev;
-                                  }
-                                  return {
-                                    ...prev,
-                                    tags: [...prev.tags, tag],
-                                  };
-                                })
-                              }
-                            >
-                              <span class="rounded-full px-3 py-1 bg-inv-4 fg-inv-1">
-                                {tag}
-                              </span>
-                            </button>
-                          )}
-                        </For>
-                      </span>
-                    )}
-                  </Show>
-                  {d()?.deploy?.targetHost}
-                </>
-              )}
-            </Show>
-          </div> */}
-        </div>
-      </div>
-    </div>
-  );
-};

pkgs/webview-ui/app/src/components/Sidebar/SidebarHeader.tsx

@@ -1,7 +1,8 @@
-import { createSignal } from "solid-js";
+import { createSignal, Show } from "solid-js";
 import { Typography } from "@/src/components/Typography";
 import { SidebarFlyout } from "./SidebarFlyout";
 import "./css/sidebar.css";
+import Icon from "../icon";
 
 interface SidebarProps {
   clanName: string;
@@ -53,8 +54,16 @@ export const SidebarHeader = (props: SidebarProps) => {
   return (
     <header class="sidebar__header">
       <div onClick={handleClick} class="sidebar__header__inner">
-        <ClanProfile clanName={props.clanName} showFlyout={showFlyout} />
-        <ClanTitle clanName={props.clanName} />
+        {/* <ClanProfile clanName={props.clanName} showFlyout={showFlyout} /> */}
+        <div class="w-full pl-1 text-white">
+          <ClanTitle clanName={props.clanName} />
+        </div>
+        <Show
+          when={showFlyout}
+          fallback={<Icon size={12} class="text-white" icon="CaretDown" />}
+        >
+          <Icon size={12} class="text-white" icon="CaretDown" />
+        </Show>
       </div>
       {showFlyout() && <SidebarFlyout />}
     </header>

pkgs/webview-ui/app/src/components/Sidebar/index.tsx

@@ -52,7 +52,9 @@ export const Sidebar = (props: RouteSectionProps) => {
     queryFn: async () => {
       const curr = activeURI();
       if (curr) {
-        const result = await callApi("show_clan_meta", { uri: curr });
+        const result = await callApi("show_clan_meta", {
+          flake: { identifier: curr },
+        });
         console.log("refetched meta for ", curr);
         if (result.status === "error") throw new Error("Failed to fetch data");
 

pkgs/webview-ui/app/src/components/accordion/index.tsx

@@ -21,7 +21,7 @@ export default function Accordion(props: AccordionProps) {
           fallback={
             <Button
               endIcon={<Icon size={12} icon={"CaretDown"} />}
-              variant="light"
+              variant="ghost"
               size="s"
             >
               {props.title}
@@ -30,7 +30,7 @@ export default function Accordion(props: AccordionProps) {
         >
           <Button
             endIcon={<Icon size={12} icon={"CaretUp"} />}
-            variant="dark"
+            variant="ghost"
             size="s"
           >
             {props.title}

pkgs/webview-ui/app/src/components/button/css/button-ghost.css

@@ -0,0 +1,11 @@
+.button--ghost-hover:hover {
+  @apply hover:bg-secondary-100 hover:text-secondary-900;
+}
+
+.button--ghost-focus:focus {
+  @apply focus:bg-secondary-200 focus:text-secondary-900;
+}
+
+.button--ghost-active:active {
+  @apply active:bg-secondary-200 active:text-secondary-900 active:shadow-inner-primary-active;
+}

pkgs/webview-ui/app/src/components/button/css/index.css

@@ -1,5 +1,6 @@
 @import "./button-light.css";
 @import "./button-dark.css";
+@import "./button-ghost.css";
 
 .button {
   @apply inline-flex items-center flex-shrink gap-1 justify-center p-4 font-semibold;

pkgs/webview-ui/app/src/components/button/index.tsx

@@ -26,10 +26,9 @@ const variantColors: (
     !disabled && "button--light-active", // Active state
   ),
   ghost: cx(
-    // "shadow-inner-secondary",
-    !disabled && "hover:bg-secondary-200 hover:text-secondary-900", // Hover state
-    !disabled && "focus:bg-secondary-200 focus:text-secondary-900", // Focus state
-    !disabled && "button--light-active", // Active state
+    !disabled && "button--ghost-hover", // Hover state
+    !disabled && "button--ghost-focus", // Focus state
+    !disabled && "button--ghost-active", // Active state
   ),
 });
 

pkgs/webview-ui/app/src/components/machine-list-item/css/index.css

@@ -0,0 +1,76 @@
+.machine-item {
+  @apply col-span-1 flex flex-col items-center;
+
+  position: relative;
+  padding: theme(padding.2);
+
+  cursor: pointer;
+}
+
+.machine-item__thumb-wrapper {
+  position: relative;
+  padding: theme(padding.4);
+
+  border-radius: theme(borderRadius.md);
+  overflow: hidden;
+}
+
+.machine-item__thumb {
+  @apply rounded-md bg-secondary-100 border border-secondary-200;
+
+  position: relative;
+  z-index: 20;
+  overflow: hidden;
+
+  transition: transform 0.24s ease-in-out;
+}
+
+.machine-item__header {
+  @apply flex flex-col justify-center items-center;
+
+  position: relative;
+  z-index: 20;
+
+  transition: transform 0.18s 0.04s ease-in-out;
+}
+
+.machine-item__pseudo {
+  @apply bg-secondary-50;
+
+  position: absolute;
+  z-index: 10;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  border: 1px solid theme(borderColor.secondary.100);
+  border-radius: theme(borderRadius.md);
+
+  transition:
+    transform 0.16s ease-in-out,
+    opacity 0.08s ease-in-out;
+}
+
+.machine-item:hover {
+  & .machine-item__pseudo {
+    transform: scale(1);
+    opacity: 1;
+  }
+
+  & .machine-item__thumb {
+    transform: scale(1.02);
+    box-shadow:
+      0 4px 6px rgba(0, 0, 0, 0.1),
+      0 8px 20px rgba(0, 0, 0, 0.15),
+      0 12px 40px rgba(0, 0, 0, 0.08);
+  }
+
+  & .machine-item__header {
+    transform: translateY(4px);
+  }
+}
+
+.machine-item:not(:hover) .machine-item__pseudo {
+  transform: scale(0.94);
+  opacity: 0;
+}

pkgs/webview-ui/app/src/components/machine-list-item/index.tsx

@@ -0,0 +1,135 @@
+import { createSignal, For, Setter, Show } from "solid-js";
+import { callApi, SuccessQuery } from "../../api";
+
+import { activeURI } from "../../App";
+import toast from "solid-toast";
+import { A, useNavigate } from "@solidjs/router";
+import { RndThumbnail } from "../noiseThumbnail";
+
+import { Filter } from "../../routes/machines";
+import { Typography } from "../Typography";
+import "./css/index.css";
+
+type MachineDetails = SuccessQuery<"list_machines">["data"][string];
+
+interface MachineListItemProps {
+  name: string;
+  info?: MachineDetails;
+  nixOnly?: boolean;
+  setFilter: Setter<Filter>;
+}
+
+export const MachineListItem = (props: MachineListItemProps) => {
+  const { name, info, nixOnly } = props;
+
+  // Bootstrapping
+  const [installing, setInstalling] = createSignal<boolean>(false);
+
+  // Later only updates
+  const [updating, setUpdating] = createSignal<boolean>(false);
+
+  const navigate = useNavigate();
+
+  const handleInstall = async () => {
+    if (!info?.deploy?.targetHost || installing()) {
+      return;
+    }
+
+    const active_clan = activeURI();
+    if (!active_clan) {
+      toast.error("No active clan selected");
+      return;
+    }
+    if (!info?.deploy?.targetHost) {
+      toast.error(
+        "Machine does not have a target host. Specify where the machine should be deployed.",
+      );
+      return;
+    }
+    setInstalling(true);
+    await toast.promise(
+      callApi("install_machine", {
+        opts: {
+          machine: {
+            name: name,
+            flake: {
+              identifier: active_clan,
+            },
+            override_target_host: info?.deploy.targetHost,
+          },
+          no_reboot: true,
+          debug: true,
+          nix_options: [],
+          password: null,
+        },
+      }),
+      {
+        loading: "Installing...",
+        success: "Installed",
+        error: "Failed to install",
+      },
+    );
+    setInstalling(false);
+  };
+
+  const handleUpdate = async () => {
+    if (!info?.deploy?.targetHost || installing()) {
+      return;
+    }
+
+    const active_clan = activeURI();
+    if (!active_clan) {
+      toast.error("No active clan selected");
+      return;
+    }
+    if (!info?.deploy.targetHost) {
+      toast.error(
+        "Machine does not have a target host. Specify where the machine should be deployed.",
+      );
+      return;
+    }
+    setUpdating(true);
+    await toast.promise(
+      callApi("update_machines", {
+        base_path: active_clan,
+        machines: [
+          {
+            name: name,
+            deploy: {
+              targetHost: info?.deploy.targetHost,
+            },
+          },
+        ],
+      }),
+      {
+        loading: "Updating...",
+        success: "Updated",
+        error: "Failed to update",
+      },
+    );
+    setUpdating(false);
+  };
+  return (
+    <div class="machine-item">
+      <A href={`/machines/${name}`}>
+        <div class="machine-item__thumb-wrapper">
+          <div class="machine-item__thumb">
+            <RndThumbnail name={name} width={100} height={100} />
+          </div>
+          <div class="machine-item__pseudo" />
+        </div>
+        <header class="machine-item__header">
+          <Typography
+            class="text-center"
+            hierarchy="body"
+            size="s"
+            weight="bold"
+            color="primary"
+          >
+            {name}
+          </Typography>
+        </header>
+      </A>
+    </div>
+  );
+};

pkgs/webview-ui/app/src/index.css

@@ -96,9 +96,102 @@ html {
   cursor: pointer;
 }
 
-.accordeon__header::-webkit-details-marker {
+summary {
+  list-style: none;
+}
+
+summary::-webkit-details-marker {
+  display: none;
+}
+
+summary::marker {
   display: none;
 }
 
 .accordeon__body {
 }
+
+.machine-item-loader {
+  @apply col-span-1 flex flex-col items-center;
+
+  display: flex;
+  justify-content: center;
+  position: relative;
+  padding: theme(padding.2);
+  border-radius: theme(borderRadius.md);
+
+  overflow: hidden;
+  cursor: pointer;
+}
+
+.machine-item-loader__thumb-wrapper {
+  position: relative;
+  z-index: 20;
+  padding: theme(padding.4);
+
+  border-radius: theme(borderRadius.md);
+  overflow: hidden;
+}
+
+.machine-item-loader__thumb {
+  position: relative;
+  width: 100px;
+  height: 100px;
+  background: theme(backgroundColor.secondary.100);
+  border-radius: theme(borderRadius.md);
+  overflow: hidden;
+}
+
+.machine-item-loader__headline {
+  position: relative;
+  z-index: 20;
+  width: 90%;
+  height: 20px;
+
+  background: theme(backgroundColor.secondary.100);
+  border-radius: theme(borderRadius.sm);
+  overflow: hidden;
+}
+
+.machine-item-loader__cover {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+}
+
+.machine-item-loader__loader {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(
+    to right,
+    transparent 20%,
+    theme(backgroundColor.secondary.200) 50%,
+    transparent 80%
+  );
+  background-size: 400px 100%;
+
+  animation: loader 4s linear infinite;
+  transition: all 0.56s ease;
+}
+
+.machine-item-loader__cover .machine-item-loader__loader {
+  background: linear-gradient(
+    to right,
+    transparent 20%,
+    theme(backgroundColor.secondary.50) 50%,
+    transparent 80%
+  );
+}
+
+@keyframes loader {
+  0% {
+    background-position: -1000px 0;
+  }
+  100% {
+    background-position: 1000px 0;
+  }
+}

pkgs/webview-ui/app/src/index.tsx

@@ -21,6 +21,8 @@ import { ModuleDetails as AddModule } from "./routes/modules/add";
 import { ApiTester } from "./api_test";
 import { IconVariant } from "./components/icon";
 import { Components } from "./routes/components";
+import { activeURI } from "./App";
+import { VarsForMachine, VarsStep } from "./routes/machines/install/vars-step";
 
 export const client = new QueryClient();
 
@@ -31,7 +33,6 @@ if (import.meta.env.DEV && !(root instanceof HTMLElement)) {
     "Root element not found. Did you forget to add it to your index.html? Or maybe the id attribute got misspelled?",
   );
 }
-
 if (import.meta.env.DEV) {
   console.log("Development mode");
   // Load the debugger in development mode
@@ -73,6 +74,12 @@ export const routes: AppRoute[] = [
         hidden: true,
         component: () => <MachineDetails />,
       },
+      {
+        path: "/:id/vars",
+        label: "Vars",
+        hidden: true,
+        component: () => <VarsForMachine />,
+      },
     ],
   },
   {

pkgs/webview-ui/app/src/queries/index.ts

@@ -11,7 +11,10 @@ export const createModulesQuery = (
 ) =>
   createQuery(() => ({
     queryKey: [uri, "list_modules"],
-    placeholderData: [],
+    placeholderData: {
+      localModules: {},
+      modulesPerSource: {},
+    },
     enabled: !!uri,
     queryFn: async () => {
       console.log({ uri });
@@ -23,15 +26,13 @@ export const createModulesQuery = (
         if (response.status === "error") {
           toast.error("Failed to fetch data");
         } else {
-          if (!filter) {
-            return Object.entries(response.data);
-          }
-          return Object.entries(response.data).filter(([key, value]) =>
-            filter.features.every((f) => (value.features || []).includes(f)),
-          );
+          return response.data;
         }
       }
-      return [];
+      return {
+        localModules: {},
+        modulesPerSource: {},
+      };
     },
   }));
 

pkgs/webview-ui/app/src/routes/clans/details.tsx

@@ -329,7 +329,9 @@ export const ClanDetails = () => {
   const clanQuery = createQuery(() => ({
     queryKey: [clan_dir, "inventory", "meta"],
     queryFn: async () => {
-      const result = await callApi("show_clan_meta", { uri: clan_dir });
+      const result = await callApi("show_clan_meta", {
+        flake: { identifier: clan_dir },
+      });
       if (result.status === "error") throw new Error("Failed to fetch data");
       return result.data;
     },

pkgs/webview-ui/app/src/routes/clans/list.tsx

@@ -18,7 +18,9 @@ const ClanItem = (props: ClanItemProps) => {
   const details = createQuery(() => ({
     queryKey: [clan_dir, "meta"],
     queryFn: async () => {
-      const result = await callApi("show_clan_meta", { uri: clan_dir });
+      const result = await callApi("show_clan_meta", {
+        flake: { identifier: clan_dir },
+      });
       if (result.status === "error") throw new Error("Failed to fetch data");
       return result.data;
     },

pkgs/webview-ui/app/src/routes/flash/view.tsx

@@ -22,6 +22,8 @@ import toast from "solid-toast";
 import { FieldLayout } from "@/src/Form/fields/layout";
 import { InputLabel } from "@/src/components/inputBase";
 import { Modal } from "@/src/components/modal";
+import Fieldset from "@/src/Form/fieldset";
+import Accordion from "@/src/components/accordion";
 
 interface Wifi extends FieldValues {
   ssid: string;
@@ -233,16 +235,23 @@ export const Flash = () => {
           </div>
         </div>
       </Modal>
-      <div class="p-4">
-        <Typography tag="p" hierarchy="body" size="default" color="primary">
+      <div class="w-full self-stretch p-8">
+        {/* <Typography tag="p" hierarchy="body" size="default" color="primary">
           USB Utility image.
         </Typography>
         <Typography tag="p" hierarchy="body" size="default" color="secondary">
           Will make bootstrapping new machines easier by providing secure remote
           connection to any machine when plugged in.
-        </Typography>
-        <Form onSubmit={handleSubmit}>
-          <div class="my-4">
+        </Typography> */}
+        <Form
+          onSubmit={handleSubmit}
+          class="mx-auto flex w-full max-w-2xl flex-col gap-y-6"
+        >
+          <Fieldset legend="Authorized SSH Keys">
+            <Typography hierarchy="body" size="s" weight="medium">
+              Provide your SSH public key. For secure and passwordless SSH
+              connections.
+            </Typography>
             <Field name="sshKeys" type="File[]">
               {(field, props) => (
                 <>
@@ -267,146 +276,72 @@ export const Flash = () => {
                     }}
                     value={field.value}
                     error={field.error}
-                    helperText="Provide your SSH public key. For secure and passwordless SSH connections."
-                    label="Authorized SSH Keys"
+                    //helperText="Provide your SSH public key. For secure and passwordless SSH connections."
+                    //label="Authorized SSH Keys"
                     multiple
-                    required
                   />
                 </>
               )}
             </Field>
-          </div>
-
-          <Field name="disk" validate={[required("This field is required")]}>
-            {(field, props) => (
-              <SelectInput
-                loading={deviceQuery.isFetching}
-                selectProps={props}
-                label="Flash Disk"
-                labelProps={{
-                  labelAction: (
-                    <Button
-                      disabled={isFlashing()}
-                      class="ml-auto"
-                      variant="ghost"
-                      size="s"
-                      type="button"
-                      startIcon={<Icon icon="Update" />}
-                      onClick={() => deviceQuery.refetch()}
-                    />
-                  ),
-                }}
-                value={field.value || ""}
-                error={field.error}
-                required
-                placeholder="Select a drive where the clan-installer will be flashed to"
-                options={
-                  deviceQuery.data?.blockdevices.map((d) => ({
-                    value: d.path,
-                    label: `${d.path} -- ${d.size} bytes`,
-                  })) || []
-                }
-              />
-            )}
-          </Field>
-
-          {/* WiFi Networks */}
-          <div class="my-4 py-2">
-            <FieldLayout
-              label={<InputLabel class="mb-4">Networks</InputLabel>}
-              field={
+          </Fieldset>
+          <Fieldset legend="General">
+            <Field name="disk" validate={[required("This field is required")]}>
+              {(field, props) => (
                 <>
+                  <SelectInput
+                    loading={deviceQuery.isFetching}
+                    selectProps={props}
+                    label="Flash Disk"
+                    labelProps={{
+                      labelAction: (
+                        <Button
+                          disabled={isFlashing()}
+                          class="ml-auto"
+                          variant="ghost"
+                          size="s"
+                          type="button"
+                          startIcon={<Icon icon="Update" />}
+                          onClick={() => deviceQuery.refetch()}
+                        />
+                      ),
+                    }}
+                    value={field.value || ""}
+                    error={field.error}
+                    required
+                    placeholder="Select a drive"
+                    options={
+                      deviceQuery.data?.blockdevices.map((d) => ({
+                        value: d.path,
+                        label: `${d.path} -- ${d.size} bytes`,
+                      })) || []
+                    }
+                  />
+                </>
+              )}
+            </Field>
+          </Fieldset>
+
+          <Fieldset legend="Network Settings">
+            <FieldLayout
+              label={<InputLabel>Networks</InputLabel>}
+              field={
+                <div class="flex w-full justify-end">
                   <Button
                     type="button"
                     size="s"
                     variant="light"
                     onClick={addWifiNetwork}
-                    startIcon={<Icon icon="Plus" />}
+                    startIcon={<Icon size={12} icon="Plus" />}
                   >
                     WiFi Network
                   </Button>
-                </>
+                </div>
               }
             />
-            <For each={wifiNetworks()}>
-              {(network, index) => (
-                <div class="flex w-full gap-2">
-                  <div class="mb-2 grid w-full grid-cols-6 gap-2 align-middle">
-                    <Field
-                      name={`wifi.${index()}.ssid`}
-                      validate={[required("SSID is required")]}
-                    >
-                      {(field, props) => (
-                        <TextInput
-                          inputProps={props}
-                          label="SSID"
-                          value={field.value ?? ""}
-                          error={field.error}
-                          class="col-span-full "
-                          required
-                        />
-                      )}
-                    </Field>
-                    <Field
-                      name={`wifi.${index()}.password`}
-                      validate={[required("Password is required")]}
-                    >
-                      {(field, props) => (
-                        <TextInput
-                          class="col-span-full"
-                          inputProps={{
-                            ...props,
-                            type: passwordVisibility()[index()]
-                              ? "text"
-                              : "password",
-                          }}
-                          label="Password"
-                          value={field.value ?? ""}
-                          error={field.error}
-                          // adornment={{
-                          //   position: "end",
-                          //   content: (
-                          //     <Button
-                          //       variant="light"
-                          //       type="button"
-                          //       class="flex justify-center opacity-70"
-                          //       onClick={() =>
-                          //         togglePasswordVisibility(index())
-                          //       }
-                          //       startIcon={
-                          //         passwordVisibility()[index()] ? (
-                          //           <Icon icon="EyeClose" />
-                          //         ) : (
-                          //           <Icon icon="EyeOpen" />
-                          //         )
-                          //       }
-                          //     ></Button>
-                          //   ),
-                          // }}
-                          required
-                        />
-                      )}
-                    </Field>
-                  </div>
-                  <Button
-                    type="button"
-                    variant="light"
-                    class="h-10"
-                    size="s"
-                    onClick={() => removeWifiNetwork(index())}
-                    startIcon={<Icon icon="Trash" />}
-                  ></Button>
-                </div>
-              )}
-            </For>
-          </div>
+          </Fieldset>
 
-          <div class=" " tabindex="0">
-            <input type="checkbox" />
-            <div class=" px-0">
-              <InputLabel class="mb-4">Advanced</InputLabel>
-            </div>
-            <div class="">
+          <Accordion title="Advanced">
+            <Fieldset>
               <Field
                 name="machine.flake"
                 validate={[required("This field is required")]}
@@ -508,10 +443,8 @@ export const Flash = () => {
                   </>
                 )}
               </Field>
-            </div>
-          </div>
-
-          <hr></hr>
+            </Fieldset>
+          </Accordion>
           <div class="mt-2 flex justify-end pt-2">
             <Button
               class="self-end"

pkgs/webview-ui/app/src/routes/machines/create.tsx

@@ -11,7 +11,6 @@ import { Match, Switch } from "solid-js";
 import toast from "solid-toast";
 import { MachineAvatar } from "./avatar";
 import { DynForm } from "@/src/Form/form";
-import { Typography } from "@/src/components/Typography";
 import Fieldset from "@/src/Form/fieldset";
 import Accordion from "@/src/components/accordion";
 

pkgs/webview-ui/app/src/routes/machines/details.tsx

@@ -1,9 +1,4 @@
 import { callApi, SuccessData } from "@/src/api";
-import { activeURI } from "@/src/App";
-import { Button } from "@/src/components/button";
-import Icon from "@/src/components/icon";
-import { TextInput } from "@/src/Form/fields/TextInput";
-
 import {
   createForm,
   FieldValues,
@@ -11,9 +6,15 @@ import {
   getValues,
   setValue,
 } from "@modular-forms/solid";
-import { useParams } from "@solidjs/router";
-import { createQuery } from "@tanstack/solid-query";
-import { createSignal, For, Match, Show, Switch } from "solid-js";
+import { useNavigate, useParams, useSearchParams } from "@solidjs/router";
+import { createQuery, useQueryClient } from "@tanstack/solid-query";
+import { createEffect, createSignal, For, Match, Show, Switch } from "solid-js";
+
+import { activeURI } from "@/src/App";
+import { Button } from "@/src/components/button";
+import Icon from "@/src/components/icon";
+import { TextInput } from "@/src/Form/fields/TextInput";
+import Accordion from "@/src/components/accordion";
 import toast from "solid-toast";
 import { MachineAvatar } from "./avatar";
 import { Header } from "@/src/layout/header";
@@ -26,6 +27,7 @@ import { DiskStep, DiskValues } from "./install/disk-step";
 import { SummaryStep } from "./install/summary-step";
 import cx from "classnames";
 import { VarsStep, VarsValues } from "./install/vars-step";
+import Fieldset from "@/src/Form/fieldset";
 
 type MachineFormInterface = MachineData & {
   sshKey?: File;
@@ -115,8 +117,10 @@ const InstallMachine = (props: InstallMachineProps) => {
     if (shouldRunDisk) {
       setProgressText("Setting up disk ... (1/5)");
       const disk_response = await callApi("set_machine_disk_schema", {
-        flake: { identifier: curr_uri },
-        machine_name: props.name,
+        machine: {
+          flake: { identifier: curr_uri },
+          name: props.name,
+        },
         placeholders: diskValues.placeholders,
         schema_name: diskValues.schema,
         force: true,
@@ -242,7 +246,7 @@ const InstallMachine = (props: InstallMachineProps) => {
                 <div class="flex flex-col items-center gap-3 fg-def-1">
                   <Typography
                     classList={{
-                      [cx("bg-inv-4 fg-inv-1")]: idx == step(),
+                      [cx("bg-inv-4 fg-inv-1")]: idx === step(),
                       [cx("bg-def-4 fg-def-1")]: idx < step(),
                     }}
                     color="inherit"
@@ -316,21 +320,7 @@ const InstallMachine = (props: InstallMachineProps) => {
               />
             </Match>
             <Match when={step() === "3"}>
-              <VarsStep
-                // @ts-expect-error: This cannot be undefined in this context.
-                machine_id={props.name}
-                // @ts-expect-error: This cannot be undefined in this context.
-                dir={activeURI()}
-                footer={<Footer />}
-                handleNext={(data) => {
-                  // const prev = getValue(formStore, "2");
-                  // setValue(formStore, "2", { ...prev, ...data });
-                  handleNext();
-                }}
-                initial={{
-                  ...getValue(formStore, "3"),
-                }}
-              />
+              <div>TODO: vars</div>
             </Match>
             <Match when={step() === "4"}>
               <SummaryStep
@@ -416,6 +406,10 @@ const MachineForm = (props: MachineDetailsProps) => {
 
   const [installModalOpen, setInstallModalOpen] = createSignal(false);
 
+  const navigate = useNavigate();
+  const [searchParams, setSearchParams] = useSearchParams();
+  const queryClient = useQueryClient();
+
   const handleSubmit = async (values: MachineFormInterface) => {
     console.log("submitting", values);
 
@@ -449,7 +443,40 @@ const MachineForm = (props: MachineDetailsProps) => {
     return null;
   };
 
+  const generatorsQuery = createQuery(() => ({
+    queryKey: [activeURI(), machineName(), "generators"],
+    queryFn: async () => {
+      const machine_name = machineName();
+      const base_dir = activeURI();
+      if (!machine_name || !base_dir) {
+        return [];
+      }
+      const result = await callApi("get_generators_closure", {
+        base_dir: base_dir,
+        machine_name: machine_name,
+      });
+      if (result.status === "error") throw new Error("Failed to fetch data");
+      return result.data;
+    },
+  }));
+
+  const handleUpdateButton = async () => {
+    const t = toast.loading("Checking for generators...");
+    await generatorsQuery.refetch();
+    toast.dismiss(t);
+    if (generatorsQuery.data?.length !== 0) {
+      navigate(`/machines/${machineName()}/vars`);
+    } else {
+      handleUpdate();
+    }
+  };
+
+  const [isUpdating, setIsUpdating] = createSignal(false);
+
   const handleUpdate = async () => {
+    if (isUpdating()) {
+      return;
+    }
     const curr_uri = activeURI();
     if (!curr_uri) {
       return;
@@ -463,6 +490,7 @@ const MachineForm = (props: MachineDetailsProps) => {
     const target = targetHost();
 
     const loading_toast = toast.loading("Updating machine...");
+    setIsUpdating(true);
     const r = await callApi("update_machines", {
       base_path: curr_uri,
       machines: [
@@ -474,6 +502,7 @@ const MachineForm = (props: MachineDetailsProps) => {
         },
       ],
     });
+    setIsUpdating(false);
     toast.dismiss(loading_toast);
 
     if (r.status === "error") {
@@ -483,85 +512,82 @@ const MachineForm = (props: MachineDetailsProps) => {
       toast.success("Machine updated successfully");
     }
   };
+
+  createEffect(() => {
+    const action = searchParams.action;
+    if (action === "update") {
+      setSearchParams({ action: undefined });
+      handleUpdate();
+    }
+  });
+
   return (
     <>
-      <div class="flex flex-col gap-6 p-4">
-        <span class="mb-2 flex w-full justify-center">
-          <MachineAvatar name={machineName()} />
-        </span>
-        <Form onSubmit={handleSubmit} class="flex flex-col gap-6">
-          <Field name="machine.name">
-            {(field, props) => (
-              <TextInput
-                inputProps={props}
-                label="Name"
-                value={field.value ?? ""}
-                error={field.error}
-                class="col-span-2"
-                required
-              />
-            )}
-          </Field>
-          <Field name="machine.tags" type="string[]">
-            {(field, props) => (
-              <>
-                <FieldLayout
-                  label={<InputLabel>Tags</InputLabel>}
-                  field={
-                    <span class="col-span-10">
-                      <For each={field.value}>
-                        {(tag) => (
-                          <span class="mx-2 w-fit rounded-full px-3 py-1 bg-inv-4 fg-inv-1">
-                            {tag}
-                          </span>
-                        )}
-                      </For>
-                    </span>
-                  }
-                />
-              </>
-            )}
-          </Field>
-          <Field name="machine.description">
-            {(field, props) => (
-              <TextInput
-                inputProps={props}
-                label="Description"
-                value={field.value ?? ""}
-                error={field.error}
-                class="col-span-2"
-                required
-              />
-            )}
-          </Field>
-          <Field name="hw_config">
-            {(field, props) => (
-              <FieldLayout
-                label={<InputLabel>Hardware Configuration</InputLabel>}
-                field={<span>{field.value || "None"}</span>}
-              />
-            )}
-          </Field>
-          <Field name="disk_schema.schema_name">
-            {(field, props) => (
-              <>
-                <FieldLayout
-                  label={<InputLabel>Disk schema</InputLabel>}
-                  field={<span>{field.value || "None"}</span>}
-                />
-              </>
-            )}
-          </Field>
-
-          <div class="  col-span-full" tabindex="0">
-            <input type="checkbox" />
-            <div class="  px-0 text-xl ">Connection Settings</div>
-            <div class="">
-              <Field name="machine.deploy.targetHost">
+      <div class="flex flex-col gap-6">
+        <div class="sticky top-0 flex items-center justify-end gap-2 border-b border-secondary-100 bg-secondary-50 px-4 py-2">
+          <div class="flex items-center gap-3">
+            <div class="w-fit" data-tip="Machine must be online">
+              {/* <Button
+                class="w-full"
+                size="s"
+                // disabled={!online()}
+                onClick={() => {
+                  setInstallModalOpen(true);
+                }}
+                endIcon={<Icon icon="Flash" />}
+              >
+                Install
+              </Button> */}
+            </div>
+            {/* <Typography hierarchy="label" size="default">
+              Installs the system for the first time. Used to bootstrap the
+              remote device.
+            </Typography> */}
+          </div>
+          <div class="flex items-center gap-3">
+            <div class="button-group flex">
+              <Button
+                variant="light"
+                class="w-full"
+                size="s"
+                onClick={() => {
+                  setInstallModalOpen(true);
+                }}
+                endIcon={<Icon size={14} icon="Flash" />}
+              >
+                Install
+              </Button>
+              <Button
+                variant="light"
+                class="w-full"
+                size="s"
+                onClick={() => handleUpdateButton()}
+                endIcon={<Icon size={12} icon="Update" />}
+              >
+                Update
+              </Button>
+            </div>
+            <div class=" w-fit" data-tip="Machine must be online"></div>
+            {/* <Typography hierarchy="label" size="default">
+              Update the system if changes should be synced after the
+              installation process.
+            </Typography> */}
+          </div>
+        </div>
+        <div class="p-4">
+          <span class="mb-2 flex w-full justify-center">
+            <MachineAvatar name={machineName()} />
+          </span>
+          <Form
+            onSubmit={handleSubmit}
+            class="mx-auto flex w-full max-w-2xl flex-col gap-y-6"
+          >
+            <Fieldset legend="General">
+              <Field name="machine.name">
                 {(field, props) => (
                   <TextInput
                     inputProps={props}
-                    label="Target Host"
+                    label="Name"
                     value={field.value ?? ""}
                     error={field.error}
                     class="col-span-2"
@@ -569,73 +595,106 @@ const MachineForm = (props: MachineDetailsProps) => {
                   />
                 )}
               </Field>
-            </div>
-          </div>
+              <Field name="machine.description">
+                {(field, props) => (
+                  <TextInput
+                    inputProps={props}
+                    label="Description"
+                    value={field.value ?? ""}
+                    error={field.error}
+                    class="col-span-2"
+                  />
+                )}
+              </Field>
+              <Field name="machine.tags" type="string[]">
+                {(field, props) => (
+                  <div class="flex items-center gap-4">
+                    <Typography hierarchy="label" size="default" weight="bold">
+                      Tags{" "}
+                    </Typography>
+                    <For each={field.value}>
+                      {(tag) => (
+                        <span class="mx-2 w-fit rounded-full px-3 py-0.5 bg-inv-4 fg-inv-1">
+                          <Typography
+                            hierarchy="label"
+                            size="s"
+                            inverted={true}
+                          >
+                            {tag}
+                          </Typography>
+                        </span>
+                      )}
+                    </For>
+                  </div>
+                )}
+              </Field>
+            </Fieldset>
 
-          {
-            <div class=" col-span-full justify-end">
-              <Button
-                type="submit"
-                disabled={formStore.submitting || !formStore.dirty}
-              >
-                Save
-              </Button>
-            </div>
-          }
-        </Form>
-      </div>
+            <Fieldset legend="Hardware">
+              <Field name="hw_config">
+                {(field, props) => (
+                  <FieldLayout
+                    label={<InputLabel>Hardware Configuration</InputLabel>}
+                    field={<span>{field.value || "None"}</span>}
+                  />
+                )}
+              </Field>
+              <hr />
+              <Field name="disk_schema.schema_name">
+                {(field, props) => (
+                  <>
+                    <FieldLayout
+                      label={<InputLabel>Disk schema</InputLabel>}
+                      field={<span>{field.value || "None"}</span>}
+                    />
+                  </>
+                )}
+              </Field>
+            </Fieldset>
 
-      <div class="">
-        <div class=""></div>
+            <Accordion title="Connection Settings">
+              <Fieldset>
+                <Field name="machine.deploy.targetHost">
+                  {(field, props) => (
+                    <TextInput
+                      inputProps={props}
+                      label="Target Host"
+                      value={field.value ?? ""}
+                      error={field.error}
+                      class="col-span-2"
+                      required
+                    />
+                  )}
+                </Field>
+              </Fieldset>
+            </Accordion>
 
-        <span class="text-xl text-primary-800">Actions</span>
-        <div class="my-4 flex flex-col gap-6">
-          <span class="max-w-md">
-            Installs the system for the first time. Used to bootstrap the remote
-            device.
-          </span>
-          <div class=" w-fit" data-tip="Machine must be online">
-            <Button
-              class="w-full"
-              // disabled={!online()}
-              onClick={() => {
-                setInstallModalOpen(true);
-              }}
-              endIcon={<Icon icon="Flash" />}
-            >
-              Install
-            </Button>
-          </div>
-
-          <Modal
-            title={`Install machine`}
-            open={installModalOpen()}
-            handleClose={() => setInstallModalOpen(false)}
-            class="min-w-[600px]"
-          >
-            <InstallMachine
-              name={machineName()}
-              targetHost={getValue(formStore, "machine.deploy.targetHost")}
-              machine={props.initialData}
-            />
-          </Modal>
-
-          <span class="max-w-md">
-            Update the system if changes should be synced after the installation
-            process.
-          </span>
-          <div class=" w-fit" data-tip="Machine must be online">
-            <Button
-              class="w-full"
-              // disabled={!online()}
-              onClick={() => handleUpdate()}
-              endIcon={<Icon icon="Update" />}
-            >
-              Update
-            </Button>
-          </div>
+            {
+              <footer class="flex justify-end gap-y-3 border-t border-secondary-200 pt-5">
+                <Button
+                  type="submit"
+                  disabled={formStore.submitting || !formStore.dirty}
+                >
+                  Update edits
+                </Button>
+              </footer>
+            }
+          </Form>
         </div>
       </div>
+
+      <Modal
+        title={`Install machine`}
+        open={installModalOpen()}
+        handleClose={() => setInstallModalOpen(false)}
+        class="min-w-[600px]"
+      >
+        <InstallMachine
+          name={machineName()}
+          targetHost={getValue(formStore, "machine.deploy.targetHost")}
+          machine={props.initialData}
+        />
+      </Modal>
     </>
   );
 };

pkgs/webview-ui/app/src/routes/machines/install/disk-step.tsx

@@ -37,10 +37,12 @@ export const DiskStep = (props: StepProps<DiskValues>) => {
     queryKey: [props.dir, props.machine_id, "disk_schemas"],
     queryFn: async () => {
       const result = await callApi("get_disk_schemas", {
-        flake: {
-          identifier: props.dir,
+        machine: {
+          flake: {
+            identifier: props.dir,
+          },
+          name: props.machine_id,
         },
-        machine_name: props.machine_id,
       });
       if (result.status === "error") throw new Error("Failed to fetch data");
       return result.data;

pkgs/webview-ui/app/src/routes/machines/install/hardware-step.tsx

@@ -52,10 +52,12 @@ export const HWStep = (props: StepProps<HardwareValues>) => {
     queryKey: [props.dir, props.machine_id, "hw_report"],
     queryFn: async () => {
       const result = await callApi("show_machine_hardware_config", {
-        flake: {
-          identifier: props.dir,
+        machine: {
+          flake: {
+            identifier: props.dir,
+          },
+          name: props.machine_id,
         },
-        machine_name: props.machine_id,
       });
       if (result.status === "error") throw new Error("Failed to fetch data");
       return result.data;
@@ -85,9 +87,13 @@ export const HWStep = (props: StepProps<HardwareValues>) => {
     setIsGenerating(true);
     const r = await callApi("generate_machine_hardware_info", {
       opts: {
-        flake: { identifier: curr_uri },
-        machine: props.machine_id,
-        target_host: target,
+        machine: {
+          name: props.machine_id,
+          override_target_host: target,
+          flake: {
+            identifier: curr_uri,
+          },
+        },
         backend: "nixos-facter",
       },
     });

pkgs/webview-ui/app/src/routes/machines/install/vars-step.tsx

@@ -5,31 +5,73 @@ import {
   validate,
   FieldValues,
 } from "@modular-forms/solid";
-import { createQuery } from "@tanstack/solid-query";
-import { StepProps } from "./hardware-step";
+import { createQuery, useQueryClient } from "@tanstack/solid-query";
 import { Typography } from "@/src/components/Typography";
 import { Group } from "@/src/components/group";
 import { For, Match, Show, Switch } from "solid-js";
+import { TextInput } from "@/src/Form/fields";
+import toast from "solid-toast";
+import { useNavigate, useParams } from "@solidjs/router";
+import { activeURI } from "@/src/App";
 
-export type VarsValues = FieldValues & Record<string, string>;
+export type VarsValues = FieldValues & Record<string, Record<string, string>>;
 
-export const VarsStep = (props: StepProps<VarsValues>) => {
-  const [formStore, { Form, Field }] = createForm<VarsValues>({
-    initialValues: { ...props.initial, schema: "single-disk" },
-  });
+export interface VarsStepProps {
+  machine_id: string;
+  dir: string;
+}
+
+export const VarsStep = (props: VarsStepProps) => {
+  const [formStore, { Form, Field }] = createForm<VarsValues>({});
+
+  const navigate = useNavigate();
+  const queryClient = useQueryClient();
 
   const handleSubmit: SubmitHandler<VarsValues> = async (values, event) => {
     console.log("Submit Disk", { values });
+    // sanitize the values back (replace __dot__)
+    // This hack is needed because we are using "." in the keys of the form
+    const sanitizedValues = Object.fromEntries(
+      Object.entries(values).map(([key, value]) => [
+        key.replaceAll("__dot__", "."),
+        Object.fromEntries(
+          Object.entries(value).map(([k, v]) => [
+            k.replaceAll("__dot__", "."),
+            v,
+          ]),
+        ),
+      ]),
+    ) as VarsValues;
     const valid = await validate(formStore);
-    console.log("Valid", valid);
-    if (!valid) return;
-    props.handleNext(values);
+    if (generatorsQuery.data === undefined) {
+      toast.error("Error fetching data");
+      return;
+    }
+    const loading_toast = toast.loading("Generating vars...");
+    const result = await callApi("generate_vars_for_machine", {
+      machine_name: props.machine_id,
+      base_dir: props.dir,
+      generators: generatorsQuery.data.map((generator) => generator.name),
+      all_prompt_values: sanitizedValues,
+    });
+    queryClient.invalidateQueries({
+      queryKey: [props.dir, props.machine_id, "generators"],
+    });
+    toast.dismiss(loading_toast);
+    if (result.status === "error") {
+      toast.error(result.errors[0].message);
+      return;
+    }
+    if (result.status === "success") {
+      toast.success("Vars saved successfully");
+      navigate(`/machines/${props.machine_id}?action=update`);
+    }
   };
 
   const generatorsQuery = createQuery(() => ({
     queryKey: [props.dir, props.machine_id, "generators"],
     queryFn: async () => {
-      const result = await callApi("get_generators", {
+      const result = await callApi("get_generators_closure", {
         base_dir: props.dir,
         machine_name: props.machine_id,
       });
@@ -61,14 +103,33 @@ export const VarsStep = (props: StepProps<VarsValues>) => {
                         {generator.share ? "True" : "False"}
                       </div>
                       <For each={generator.prompts}>
-                        {(f) => (
+                        {(prompt) => (
                           <Group>
                             <Typography hierarchy="label" size="s">
-                              {!f.previous_value ? "Required" : "Optional"}
+                              {!prompt.previous_value ? "Required" : "Optional"}
                             </Typography>
                             <Typography hierarchy="label" size="s">
-                              {f.name}
+                              {prompt.name}
                             </Typography>
+                            {/* Avoid nesting issue in case of a "." */}
+                            <Field
+                              name={`${generator.name.replaceAll(".", "__dot__")}.${prompt.name.replaceAll(".", "__dot__")}`}
+                            >
+                              {(field, props) => (
+                                <TextInput
+                                  inputProps={{
+                                    ...props,
+                                    type:
+                                      prompt.prompt_type === "hidden"
+                                        ? "password"
+                                        : "text",
+                                  }}
+                                  label={prompt.description}
+                                  value={prompt.previous_value ?? ""}
+                                  error={field.error}
+                                />
+                              )}
+                            </Field>
                           </Group>
                         )}
                       </For>
@@ -80,7 +141,17 @@ export const VarsStep = (props: StepProps<VarsValues>) => {
           </Switch>
         </div>
       </div>
-      <Show when={generatorsQuery.isFetched}>{props.footer}</Show>
+      <button type="submit">Submit</button>
     </Form>
   );
 };
+
+export const VarsForMachine = () => {
+  const params = useParams();
+
+  return (
+    <Show when={activeURI()}>
+      {(uri) => <VarsStep machine_id={params.id} dir={uri()} />}
+    </Show>
+  );
+};

pkgs/webview-ui/app/src/routes/machines/list.tsx

@@ -9,7 +9,7 @@ import {
 import { activeURI } from "@/src/App";
 import { callApi, OperationResponse } from "@/src/api";
 import toast from "solid-toast";
-import { MachineListItem } from "@/src/components/MachineListItem";
+import { MachineListItem } from "@/src/components/machine-list-item";
 import { createQuery, useQueryClient } from "@tanstack/solid-query";
 import { useNavigate } from "@solidjs/router";
 import { Button } from "@/src/components/button";
@@ -68,7 +68,7 @@ export const MachineListView: Component = () => {
     });
   const navigate = useNavigate();
 
-  const [view, setView] = makePersisted(createSignal<"list" | "grid">("list"), {
+  const [view, setView] = makePersisted(createSignal<"list" | "grid">("grid"), {
     name: "machines_view",
     storage: localStorage,
   });
@@ -114,16 +114,6 @@ export const MachineListView: Component = () => {
       />
       <div>
         <div class="my-1 flex w-full gap-2 p-2">
-          <div class="flex w-full justify-end px-4 py-1">
-            <div class="flex">
-              <Button
-                // onClick={() => navigate("create")}
-                size="s"
-                variant="light"
-                startIcon={<Icon icon="Filter" />}
-              ></Button>
-            </div>
-          </div>
           <For each={filter().tags.sort()}>
             {(tag) => (
               <button
@@ -144,22 +134,39 @@ export const MachineListView: Component = () => {
             )}
           </For>
         </div>
-        {/* </Show> */}
         <Switch>
           <Match when={inventoryQuery.isLoading}>
             {/* Loading skeleton */}
-            <div>
-              <div class="  m-2 shadow-lg">
-                <figure class="pl-2">
-                  <div class=" size-12"></div>
-                </figure>
-                <div class="">
-                  <h2 class="">
-                    <div class=" h-12 w-80"></div>
-                  </h2>
-                  <div class=" h-8 w-72"></div>
+            <div class="grid grid-cols-4"></div>
+            <div class="machine-item-loader">
+              <div class="machine-item-loader__thumb-wrapper">
+                <div class="machine-item-loader__thumb">
+                  <div class="machine-item-loader__loader" />
                 </div>
               </div>
+              <div class="machine-item-loader__headline">
+                <div class="machine-item-loader__loader" />
+              </div>
+            </div>
+            <div class="machine-item-loader">
+              <div class="machine-item-loader__thumb-wrapper">
+                <div class="machine-item-loader__thumb">
+                  <div class="machine-item-loader__loader" />
+                </div>
+              </div>
+              <div class="machine-item-loader__headline">
+                <div class="machine-item-loader__loader" />
+              </div>
+            </div>
+            <div class="machine-item-loader">
+              <div class="machine-item-loader__thumb-wrapper">
+                <div class="machine-item-loader__thumb">
+                  <div class="machine-item-loader__loader" />
+                </div>
+              </div>
+              <div class="machine-item-loader__headline">
+                <div class="machine-item-loader__loader" />
+              </div>
             </div>
           </Match>
           <Match
@@ -180,10 +187,10 @@ export const MachineListView: Component = () => {
           </Match>
           <Match when={!inventoryQuery.isLoading}>
             <div
-              class="my-4 flex flex-wrap gap-6 px-3 py-2"
+              class="my-4 grid gap-6 p-6"
               classList={{
-                "flex-col": view() === "list",
-                "": view() === "grid",
+                "grid-cols-1": view() === "list",
+                "grid-cols-4": view() === "grid",
               }}
             >
               <For each={inventoryMachines()}>

pkgs/webview-ui/app/src/routes/modules/add.tsx

@@ -16,11 +16,11 @@ export const ModuleDetails = () => {
       <BackButton />
       <div class="p-2">
         <h3 class="text-2xl">{params.id}</h3>
-        <Switch>
+        {/* <Switch>
           <Match when={modulesQuery.data?.find((i) => i[0] === params.id)}>
             {(d) => <AddModule data={d()[1]} id={d()[0]} />}
           </Match>
-        </Switch>
+        </Switch> */}
       </div>
     </div>
   );
@@ -40,7 +40,7 @@ export const AddModule = (props: AddModuleProps) => {
       <Switch fallback="loading">
         <Match when={tags.data}>
           {(tags) => (
-            <For each={props.data.roles}>
+            <For each={Object.keys(props.data.roles)}>
               {(role) => (
                 <>
                   <div class="text-neutral-600">{role}s</div>

pkgs/webview-ui/app/src/routes/modules/details.tsx

@@ -21,11 +21,11 @@ export const ModuleDetails = () => {
       <BackButton />
       <div class="p-2">
         <h3 class="text-2xl">{params.id}</h3>
-        <Switch>
+        {/* <Switch>
           <Match when={modulesQuery.data?.find((i) => i[0] === params.id)}>
             {(d) => <Details data={d()[1]} id={d()[0]} />}
           </Match>
-        </Switch>
+        </Switch> */}
       </div>
     </div>
   );
@@ -85,19 +85,24 @@ const Details = (props: DetailsProps) => {
   };
   return (
     <div class="flex w-full flex-col gap-2">
-      <article class="prose">{props.data.description}</article>
-      <span class="">Categories</span>
+      {/* TODO: bring this feature back */}
+      {/* <article class="prose">{props.data.description}</article> */}
+      {/* <span class="">Categories</span> */}
       <div>
-        <For each={props.data.categories}>
+        {/* TODO: bring this feature back */}
+        {/* <For each={props.data.categories}>
           {(c) => <div class=" m-1">{c}</div>}
-        </For>
+        </For> */}
       </div>
       <span class="">Roles</span>
       <div>
-        <For each={props.data.roles}>{(r) => <div class=" m-1">{r}</div>}</For>
+        <For each={Object.keys(props.data.roles)}>
+          {(r) => <div class=" m-1">{r}</div>}
+        </For>
       </div>
       <div class="p-2">
-        <SolidMarkdown>{props.data.readme}</SolidMarkdown>
+        {/* TODO: bring this feature back */}
+        {/* <SolidMarkdown>{props.data.readme}</SolidMarkdown> */}
       </div>
       <div class="my-2 flex w-full gap-2">
         <Button variant="light" onClick={add} startIcon={<Icon icon="Plus" />}>

pkgs/webview-ui/app/src/routes/modules/list.tsx

@@ -12,7 +12,7 @@ import { useQueryClient } from "@tanstack/solid-query";
 import cx from "classnames";
 import Icon from "@/src/components/icon";
 
-export type ModuleInfo = SuccessData<"list_modules">[string];
+export type ModuleInfo = SuccessData<"list_modules">["localModules"][string];
 
 interface CategoryProps {
   categories: string[];
@@ -28,7 +28,7 @@ const Categories = (props: CategoryProps) => {
 };
 
 interface RolesProps {
-  roles: string[];
+  roles: Record<string, null>;
 }
 const Roles = (props: RolesProps) => {
   return (
@@ -38,7 +38,7 @@ const Roles = (props: RolesProps) => {
           Service
         </Typography>
       </span>
-      {props.roles.map((role) => (
+      {Object.keys(props.roles).map((role) => (
         <span class="">{role}</span>
       ))}
     </div>
@@ -82,7 +82,7 @@ const ModuleItem = (props: {
         <A href={`/modules/details/${name}`}>
           <div class="">
             <div class="flex flex-col">
-              <Categories categories={info.categories} />
+              {/* <Categories categories={info.categories} /> */}
               <Typography hierarchy="title" size="m" weight="medium">
                 {name}
               </Typography>
@@ -92,11 +92,12 @@ const ModuleItem = (props: {
 
         <div class="w-full">
           <Typography hierarchy="body" size="xs">
-            {info.description}
+            description
+            {/* TODO: {info.description} */}
           </Typography>
         </div>
       </header>
-      <Roles roles={info.roles || []} />
+      <Roles roles={info.roles || {}} />
     </div>
   );
 };
@@ -121,7 +122,7 @@ export const ModuleList = () => {
   return (
     <>
       <Header
-        title="Modules"
+        title="App Store"
         toolbar={
           <>
             <Button
@@ -161,23 +162,46 @@ export const ModuleList = () => {
       <Switch fallback="Error">
         <Match when={modulesQuery.isFetching}>Loading....</Match>
         <Match when={modulesQuery.data}>
-          <div
-            class="grid gap-6 p-6"
-            classList={{
-              "grid-cols-1": view() === "list",
-              "grid-cols-2": view() === "grid",
-            }}
-          >
-            <For each={modulesQuery.data}>
-              {([k, v]) => (
-                <ModuleItem
-                  info={v}
-                  name={k}
-                  class={view() == "grid" ? cx("max-w-md") : ""}
-                />
-              )}
-            </For>
-          </div>
+          {(modules) => (
+            <div
+              class="grid gap-6 p-6"
+              classList={{
+                "grid-cols-1": view() === "list",
+                "grid-cols-2": view() === "grid",
+              }}
+            >
+              <For each={Object.entries(modules().modulesPerSource)}>
+                {([sourceName, v]) => (
+                  <>
+                    <div>
+                      <Typography size="default" hierarchy="label">
+                        {sourceName}
+                      </Typography>
+                    </div>
+                    <For each={Object.entries(v)}>
+                      {([moduleName, moduleInfo]) => (
+                        <ModuleItem
+                          info={moduleInfo}
+                          name={moduleName}
+                          class={view() == "grid" ? cx("max-w-md") : ""}
+                        />
+                      )}
+                    </For>
+                  </>
+                )}
+              </For>
+              <div>{"localModules"}</div>
+              <For each={Object.entries(modules().localModules)}>
+                {([moduleName, moduleInfo]) => (
+                  <ModuleItem
+                    info={moduleInfo}
+                    name={moduleName}
+                    class={view() == "grid" ? cx("max-w-md") : ""}
+                  />
+                )}
+              </For>
+            </div>
+          )}
         </Match>
       </Switch>
     </>

pkgs/webview-ui/app/tailwind/core-plugin.ts

@@ -240,17 +240,17 @@ export default plugin.withOptions(
             950: toRGB("#162324"),
           },
           secondary: {
-            50: toRGB("#f7f9f9"),
-            100: toRGB("#e7f2f4"),
-            200: toRGB("#d7e8ea"),
-            300: toRGB("#afc6ca"),
-            400: toRGB("#8fb2b6"),
-            500: toRGB("#7b9a9e"),
-            600: toRGB("#4f747a"),
-            700: toRGB("#415e63"),
-            800: toRGB("#445f64"),
-            900: toRGB("#2b4347"),
-            950: toRGB("#0d1415"),
+            50: toRGB("#F7F9FA"),
+            100: toRGB("#E7F2F4"),
+            200: toRGB("#D8E8EB"),
+            300: toRGB("#AFC6CA"),
+            400: toRGB("#90B2B7"),
+            500: toRGB("#7B9B9F"),
+            600: toRGB("#4F747A"),
+            700: toRGB("#415E63"),
+            800: toRGB("#446065"),
+            900: toRGB("#2C4347"),
+            950: toRGB("#0D1416"),
           },
           info: {
             50: toRGB("#eff9ff"),

pkgs/webview-ui/app/vite.config.ts

@@ -30,6 +30,9 @@ export default defineConfig({
       "@": path.resolve(__dirname, "./"), // Adjust the path as needed
     },
   },
+  optimizeDeps: {
+    include: ["debug", "extend"],
+  },
   plugins: [
     /*
     Uncomment the following line to enable solid-devtools.