pkgs: add clan-autorefresh

This adds a clan-cli shim that always uses nix run to run the pinned
clan-cli version. For this we need to expose the clan-cli via
clanInternals.

flake.lock

@@ -31,11 +31,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752718651,
+        "lastModified": 1752541678,
-        "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=",
+        "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88",
+        "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7",
         "type": "github"
       },
       "original": {

flake.nix

@@ -30,6 +30,7 @@
       inputs = {
         flake-parts.follows = "flake-parts";
         nixpkgs.follows = "nixpkgs";
+        systems.follows = "systems";
         treefmt-nix.follows = "treefmt-nix";
       };
     };

lib/modules/clan/interface.nix

@@ -275,6 +275,8 @@ in
           templates = lib.mkOption { type = lib.types.raw; };
 
           machines = lib.mkOption { type = lib.types.raw; };
+
+          clan-cli = lib.mkOption { type = lib.types.raw; };
         };
       };
     };

lib/modules/clan/module.nix

@@ -273,6 +273,9 @@ in
 
       # machine specifics
       machines = configsPerSystem;
+
+      # export clan-cli in clanInternals to tie the CLI to the flake
+      clan-cli = builtins.mapAttrs (_sys: pkgs: pkgs.clan-cli) clan-core.packages;
     };
   };
 }

lib/modules/default.nix

@@ -7,29 +7,8 @@
 }:
 rec {
   buildClan =
-    module:
+    # TODO: Once all templates and docs are migrated add: lib.warn "'buildClan' is deprecated. Use 'clan-core.lib.clan' instead"
-    lib.warn ''
+    module: (clan module).config;
-      ==================== DEPRECATION NOTICE ====================
-      Please migrate 
-      from: 'clan = inputs.<clan-core>.lib.buildClan' 
-      to  : 'clan = inputs.<clan-core>.lib.clan'
-      in your flake.nix.
-
-      Please also migrate
-      from: 'inherit (clan) nixosConfigurations clanInternals; '
-      to  : "
-              inherit (clan.config) nixosConfigurations clanInternals;
-              clan = clan.config;
-            "
-      in your flake.nix.
-
-      Reason: 
-      - Improves consistency between flake-parts and non-flake-parts users.
-              
-      - It also allows us to use the top level attribute 'clan' to expose
-        attributes that can be used for cross-clan functionality.
-      ============================================================
-    '' (clan module).config;
 
   clan =
     {

lib/modules/inventory/distributed-service/all-services-wrapper.nix

@@ -48,7 +48,6 @@ in
           {
             options = {
               instances = lib.mkOption {
-                default = { };
                 # instances.<instanceName>...
                 type = types.attrsOf (submoduleWith {
                   modules = [
@@ -58,7 +57,6 @@ in
               };
               # instances.<machineName>...
               machines = lib.mkOption {
-                default = { };
                 type = types.attrsOf (submoduleWith {
                   modules = [
                     config.exportsModule

pkgs/clan-app/ui.nix

@@ -21,12 +21,6 @@ buildNpmPackage (_finalAttrs: {
     mkdir -p api
     cp -r ${clan-ts-api}/* api
     cp -r ${fonts} ".fonts"
-
-    # only needed for the next couple weeks to make sure this file doesn't make it back into the git history
-    if [[ -f "${./ui}/src/routes/Onboarding/background.jpg" ]]; then
-        echo "background.jpg found, exiting"
-        exit 1
-    fi
   '';
 
   # todo figure out why this fails only inside of Nix

pkgs/clan-app/ui/.storybook/main.ts

@@ -3,7 +3,7 @@ import type { StorybookConfig } from "@kachurun/storybook-solid-vite";
 
 const config: StorybookConfig = {
   framework: "@kachurun/storybook-solid-vite",
-  stories: ["../src/**/*.mdx", "../src/**/*.stories.tsx"],
+  stories: ["../src/components/**/*.mdx", "../src/components/**/*.stories.tsx"],
   addons: [
     "@storybook/addon-links",
     "@storybook/addon-docs",

pkgs/clan-app/ui/src/components/Button/Button.css

@@ -138,10 +138,6 @@
       transition: all 0.5s ease;
     }
   }
-
-  & > span.typography {
-    @apply max-w-full overflow-hidden whitespace-nowrap text-ellipsis;
-  }
 }
 
 /* button group */

pkgs/clan-app/ui/src/components/Form/HostFileInput.stories.tsx

@@ -58,7 +58,7 @@ export type Story = StoryObj<typeof meta>;
 export const Bare: Story = {
   args: {
     onSelectFile: async () => {
-      return "/home/github/clans/my-clan/foo/bar/baz/fizz/buzz";
+      return "/home/bob/clans/my-clan";
     },
     input: {
       placeholder: "e.g. 11/06/89",

pkgs/clan-app/ui/src/components/Form/HostFileInput.tsx

@@ -12,8 +12,6 @@ import { PolymorphicProps } from "@kobalte/core/polymorphic";
 import { FieldProps } from "./Field";
 import { Orienter } from "./Orienter";
 import { createSignal } from "solid-js";
-import { Tooltip } from "@kobalte/core/tooltip";
-import { Typography } from "@/src/components/Typography/Typography";
 
 export type HostFileInputProps = FieldProps &
   TextFieldRootProps & {
@@ -22,21 +20,10 @@ export type HostFileInputProps = FieldProps &
   };
 
 export const HostFileInput = (props: HostFileInputProps) => {
-  const [value, setValue] = createSignal<string>(props.value || "");
+  const [value, setValue] = createSignal<string | undefined>(undefined);
-
-  let actualInputElement: HTMLInputElement | undefined;
 
   const selectFile = async () => {
-    try {
+    setValue(await props.onSelectFile());
-      console.log("selecting file", props.onSelectFile);
-      setValue(await props.onSelectFile());
-      actualInputElement?.dispatchEvent(
-        new Event("input", { bubbles: true, cancelable: true }),
-      );
-    } catch (error) {
-      console.log("Error selecting file", error);
-      // todo work out how to display the error
-    }
   };
 
   return (
@@ -46,6 +33,8 @@ export const HostFileInput = (props: HostFileInputProps) => {
         ghost: props.ghost,
       })}
       {...props}
+      value={value()}
+      onChange={setValue}
     >
       <Orienter orientation={props.orientation} align={"start"}>
         <Label
@@ -54,54 +43,16 @@ export const HostFileInput = (props: HostFileInputProps) => {
           {...props}
         />
 
-        <TextField.Input
+        <TextField.Input {...props.input} hidden={true} />
-          {...props.input}
-          hidden={true}
-          value={value()}
-          ref={(el: HTMLInputElement) => {
-            actualInputElement = el; // Capture for local use
-          }}
-        />
 
-        {!value() && (
+        <Button
-          <Button
+          hierarchy="secondary"
-            hierarchy="secondary"
+          size={props.size}
-            size={props.size}
+          startIcon="Folder"
-            startIcon="Folder"
+          onClick={selectFile}
-            onClick={selectFile}
+        >
-            disabled={props.disabled || props.readOnly}
+          {value() ? value() : "No Selection"}
-          >
+        </Button>
-            No Selection
-          </Button>
-        )}
-
-        {value() && (
-          <Tooltip placement="top">
-            <Tooltip.Portal>
-              <Tooltip.Content class="tooltip-content">
-                <Typography
-                  hierarchy="body"
-                  size="xs"
-                  weight="medium"
-                  inverted={!props.inverted}
-                >
-                  {value()}
-                </Typography>
-                <Tooltip.Arrow />
-              </Tooltip.Content>
-            </Tooltip.Portal>
-            <Tooltip.Trigger
-              as={Button}
-              hierarchy="secondary"
-              size={props.size}
-              startIcon="Folder"
-              onClick={selectFile}
-              disabled={props.disabled || props.readOnly}
-            >
-              {value()}
-            </Tooltip.Trigger>
-          </Tooltip>
-        )}
       </Orienter>
     </TextField>
   );

pkgs/clan-app/ui/src/components/Form/Label.css

@@ -22,3 +22,40 @@ div.form-label {
     }
   }
 }
+
+div.tooltip-content {
+  @apply z-50 px-2 py-0.5 bg-inv-4 rounded-[0.125rem] leading-none;
+
+  max-width: min(calc(100vw - 16px), 380px);
+  transform-origin: var(--kb-tooltip-content-transform-origin);
+  animation: tooltipHide 250ms ease-in forwards;
+
+  &[data-expanded] {
+    animation: tooltipShow 250ms ease-out;
+  }
+
+  &.inverted {
+    @apply bg-def-2;
+  }
+}
+
+@keyframes tooltipShow {
+  from {
+    opacity: 0;
+    transform: scale(0.96);
+  }
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+@keyframes tooltipHide {
+  from {
+    opacity: 1;
+    transform: scale(1);
+  }
+  to {
+    opacity: 0;
+    transform: scale(0.96);
+  }
+}

pkgs/clan-app/ui/src/components/Form/Label.tsx

@@ -1,11 +1,12 @@
 import { Show } from "solid-js";
 import { Typography } from "@/src/components/Typography/Typography";
-import { Tooltip } from "@/src/components/Tooltip/Tooltip";
+import { Tooltip as KTooltip } from "@kobalte/core/tooltip";
 import Icon from "@/src/components/Icon/Icon";
 import { TextField } from "@kobalte/core/text-field";
 import { Checkbox } from "@kobalte/core/checkbox";
 import { Combobox } from "@kobalte/core/combobox";
 import "./Label.css";
+import cx from "classnames";
 
 export type Size = "default" | "s";
 
@@ -48,27 +49,31 @@ export const Label = (props: LabelProps) => {
             {props.label}
           </Typography>
           {props.tooltip && (
-            <Tooltip
+            <KTooltip placement="top">
-              placement="top"
+              <KTooltip.Trigger>
-              inverted={props.inverted}
-              trigger={
                 <Icon
                   icon="Info"
                   color="tertiary"
                   inverted={props.inverted}
                   size={props.size == "default" ? "0.85em" : "0.75rem"}
                 />
-              }
+                <KTooltip.Portal>
-            >
+                  <KTooltip.Content
-              <Typography
+                    class={cx("tooltip-content", { inverted: props.inverted })}
-                hierarchy="body"
+                  >
-                size="xs"
+                    <Typography
-                weight="medium"
+                      hierarchy="body"
-                inverted={!props.inverted}
+                      size="xs"
-              >
+                      weight="medium"
-                {props.tooltip}
+                      inverted={!props.inverted}
-              </Typography>
+                    >
-            </Tooltip>
+                      {props.tooltip}
+                    </Typography>
+                    <KTooltip.Arrow />
+                  </KTooltip.Content>
+                </KTooltip.Portal>
+              </KTooltip.Trigger>
+            </KTooltip>
           )}
         </props.labelComponent>
         {props.description && (

pkgs/clan-app/ui/src/components/Tooltip/Tooltip.css

@@ -1,9 +0,0 @@
-div.tooltip-content {
-  @apply z-50 px-2 py-0.5 bg-inv-4 rounded-[0.125rem] leading-none;
-
-  max-width: min(calc(100vw - 16px), 380px);
-
-  &.inverted {
-    @apply bg-def-2;
-  }
-}

pkgs/clan-app/ui/src/components/Tooltip/Tooltip.stories.tsx

@@ -1,40 +0,0 @@
-import { Meta, StoryObj } from "@kachurun/storybook-solid";
-import { Tooltip, TooltipProps } from "@/src/components/Tooltip/Tooltip";
-import { Typography } from "@/src/components/Typography/Typography";
-import { Button } from "@/src/components/Button/Button";
-
-const meta: Meta<TooltipProps> = {
-  title: "Components/Tooltip",
-  component: Tooltip,
-  decorators: [
-    (Story: StoryObj<TooltipProps>) => (
-      <div class="p-16">
-        <Story />
-      </div>
-    ),
-  ],
-};
-
-export default meta;
-
-type Story = StoryObj<TooltipProps>;
-
-export const Default: Story = {
-  args: {
-    placement: "top",
-    inverted: false,
-    trigger: <Button hierarchy="primary">Trigger</Button>,
-    children: (
-      <Typography hierarchy="body" size="xs" inverted={true} weight="medium">
-        Your Clan is being created
-      </Typography>
-    ),
-  },
-};
-
-export const AnimateBounce: Story = {
-  args: {
-    ...Default.args,
-    animation: "bounce",
-  },
-};

pkgs/clan-app/ui/src/components/Tooltip/Tooltip.tsx

@@ -1,34 +0,0 @@
-import "./Tooltip.css";
-import {
-  Tooltip as KTooltip,
-  TooltipRootProps as KTooltipRootProps,
-} from "@kobalte/core/tooltip";
-import cx from "classnames";
-import { JSX } from "solid-js";
-
-export interface TooltipProps extends KTooltipRootProps {
-  inverted?: boolean;
-  trigger: JSX.Element;
-  children: JSX.Element;
-  animation?: "bounce";
-}
-
-export const Tooltip = (props: TooltipProps) => {
-  return (
-    <KTooltip {...props}>
-      <KTooltip.Trigger>{props.trigger}</KTooltip.Trigger>
-      <KTooltip.Portal>
-        <KTooltip.Content
-          class={cx("tooltip-content", {
-            inverted: props.inverted,
-            "animate-bounce": props.animation == "bounce",
-          })}
-        >
-          {props.placement == "bottom" && <KTooltip.Arrow />}
-          {props.children}
-          {props.placement == "top" && <KTooltip.Arrow />}
-        </KTooltip.Content>
-      </KTooltip.Portal>
-    </KTooltip>
-  );
-};

pkgs/clan-app/ui/src/hooks/api.ts

@@ -42,7 +42,7 @@ interface BackendReturnType<K extends OperationNames> {
  * @property {Promise<BackendReturnType<K>>} result - A promise that resolves to the return type of the backend operation.
  * @property {() => Promise<void>} cancel - A function to cancel the API call, returning a promise that resolves when cancellation is completed.
  */
-export interface ApiCall<K extends OperationNames> {
+interface ApiCall<K extends OperationNames> {
   uuid: string;
   result: Promise<OperationResponse<K>>;
   cancel: () => Promise<void>;

pkgs/clan-app/ui/src/routes/Layout.tsx

@@ -1,18 +1,6 @@
 import { Component } from "solid-js";
-import { RouteSectionProps, useNavigate } from "@solidjs/router";
+import { RouteSectionProps } from "@solidjs/router";
-import { activeClanURI } from "@/src/stores/clan";
-import { navigateToClan } from "@/src/hooks/clan";
 
-export const Layout: Component<RouteSectionProps> = (props) => {
+export const Layout: Component<RouteSectionProps> = (props) => (
-  const navigate = useNavigate();
+  <div class="size-full h-screen">{props.children}</div>
-
+);
-  // check for an active clan uri and redirect to it on first load
-  const activeURI = activeClanURI();
-  if (!props.location.pathname.startsWith("/clan/") && activeURI) {
-    navigateToClan(navigate, activeURI);
-  } else {
-    navigate("/");
-  }
-
-  return <div class="size-full h-screen">{props.children}</div>;
-};

pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.css

@@ -81,10 +81,5 @@ main#welcome {
         }
       }
     }
-
-    div.creating {
-      @apply w-[17.0625rem] h-[20.4375rem];
-      background: url(./cube.svg) center / cover no-repeat;
-    }
   }
 }

pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.tsx

@@ -1,30 +1,18 @@
-import {
+import { Component, createSignal, Match, Setter, Show, Switch } from "solid-js";
-  Accessor,
-  Component,
-  createSignal,
-  Match,
-  Setter,
-  Show,
-  Switch,
-} from "solid-js";
 import { RouteSectionProps, useNavigate } from "@solidjs/router";
 import "./Onboarding.css";
 import { Typography } from "@/src/components/Typography/Typography";
 import { Button } from "@/src/components/Button/Button";
-import { Tooltip } from "@/src/components/Tooltip/Tooltip";
-import { Alert } from "@/src/components/Alert/Alert";
-
 import { Divider } from "@/src/components/Divider/Divider";
 import { Logo } from "@/src/components/Logo/Logo";
 import { navigateToClan, selectClanFolder } from "@/src/hooks/clan";
-import { activeClanURI, addClanURI, setActiveClanURI } from "@/src/stores/clan";
+import { activeClanURI } from "@/src/stores/clan";
 import {
   createForm,
   FormStore,
   getError,
   getErrors,
   getValue,
-  SubmitHandler,
   valiForm,
 } from "@modular-forms/solid";
 import { TextInput } from "@/src/components/Form/TextInput";
@@ -32,31 +20,23 @@ import { TextArea } from "@/src/components/Form/TextArea";
 import { Fieldset } from "@/src/components/Form/Fieldset";
 import * as v from "valibot";
 import { HostFileInput } from "@/src/components/Form/HostFileInput";
-import { callApi } from "@/src/hooks/api";
 
-type State = "welcome" | "setup" | "creating";
+type State = "welcome" | "setup";
 
 const SetupSchema = v.object({
-  name: v.pipe(
+  name: v.pipe(v.string(), v.nonEmpty("Please enter a name.")),
-    v.string(),
-    v.nonEmpty("Please enter a name."),
-    v.regex(
-      new RegExp("^[a-zA-Z0-9_\\-]+$"),
-      "Name must be alphanumeric and can contain underscores and dashes, without spaces.",
-    ),
-  ),
   description: v.pipe(v.string(), v.nonEmpty("Please describe your clan.")),
-  directory: v.pipe(
+  directory: v.pipe(v.string(), v.nonEmpty("Please select a directory.")),
-    // initial value is undefined, and I can't see how to handle this better in valibot, so for now when the type
-    // is incorrect we treat it as empty
-    v.string("Please select a directory."),
-    v.nonEmpty("Please select a directory."),
-  ),
 });
 
 type SetupForm = v.InferInput<typeof SetupSchema>;
 
-const background = (props: { state: State; form: FormStore<SetupForm> }) => (
+interface backgroundProps {
+  state: State;
+  form: FormStore<SetupForm>;
+}
+
+const background = (props: backgroundProps) => (
   <div class="background">
     <div class="layer-1" />
     <div class="layer-2" />
@@ -91,11 +71,7 @@ const background = (props: { state: State; form: FormStore<SetupForm> }) => (
   </div>
 );
 
-const welcome = (props: {
+const welcome = (setState: Setter<State>) => {
-  setState: Setter<State>;
-  welcomeError: Accessor<string | undefined>;
-  setWelcomeError: Setter<string | undefined>;
-}) => {
   const navigate = useNavigate();
 
   const selectFolder = async () => {
@@ -115,23 +91,7 @@ const welcome = (props: {
         Build your <br />
         own darknet
       </Typography>
-      {props.welcomeError() && (
+      <Button hierarchy="secondary" onClick={() => setState("setup")}>
-        <Alert
-          type="error"
-          icon="Info"
-          title="Your Clan creation failed"
-          description={props.welcomeError() || ""}
-        />
-      )}
-      <Button
-        hierarchy="secondary"
-        onClick={() => {
-          // reset welcome error
-          props.setWelcomeError(undefined);
-          // move to next step
-          props.setState("setup");
-        }}
-      >
         Start building
       </Button>
       <div class="separator">
@@ -154,21 +114,6 @@ const welcome = (props: {
   );
 };
 
-const creating = () => (
-  <div class="animate-pulse">
-    <Tooltip
-      open={true}
-      placement="top"
-      animation="bounce"
-      trigger={<div class="creating" />}
-    >
-      <Typography hierarchy="body" size="xs" weight="medium" inverted={true}>
-        Your Clan is being created
-      </Typography>
-    </Tooltip>
-  </div>
-);
-
 export const Onboarding: Component<RouteSectionProps> = (props) => {
   const navigate = useNavigate();
 
@@ -181,89 +126,13 @@ export const Onboarding: Component<RouteSectionProps> = (props) => {
 
   const [state, setState] = createSignal<State>("welcome");
 
-  // used to display an error in the welcome screen in the event of a failed
-  // clan creation
-  const [welcomeError, setWelcomeError] = createSignal<string | undefined>();
-
-  //
   const [setupForm, { Form, Field }] = createForm<SetupForm>({
     validate: valiForm(SetupSchema),
   });
 
-  const formError = () => {
+  const metaError = () => {
-    const formErrors = getErrors(setupForm);
+    const errors = getErrors(setupForm, ["name", "description"]);
-    return (
+    return errors ? errors.name || errors.description : undefined;
-      formErrors.name ||
-      formErrors.description ||
-      formErrors.directory ||
-      undefined
-    );
-  };
-
-  const onSelectFile = async () => {
-    const req = callApi("get_system_file", {
-      file_request: {
-        mode: "select_folder",
-        title: "Select a folder for you new Clan",
-      },
-    });
-
-    const resp = await req.result;
-
-    if (resp.status === "error") {
-      // just throw the first error, I can't imagine why there would be multiple
-      // errors for this call
-      throw new Error(resp.errors[0].message);
-    }
-
-    if (resp.status === "success" && resp.data) {
-      return resp.data[0];
-    }
-
-    throw new Error("No data returned from api call");
-  };
-
-  const onSubmit: SubmitHandler<SetupForm> = async (
-    { name, description, directory },
-    event,
-  ) => {
-    const path = `${directory}/${name}`;
-
-    const req = callApi("create_clan", {
-      opts: {
-        dest: path,
-        // todo allow users to select a template
-        template: "minimal",
-        initial: {
-          meta: {
-            name: name,
-            description: description,
-            // todo it tries to 'delete' icon if it's not provided
-            // this logic is unexpected, and needs reviewed.
-            icon: null,
-          },
-          machines: {},
-          instances: {},
-          services: {},
-        },
-      },
-    });
-
-    setState("creating");
-
-    const resp = await req.result;
-
-    if (resp.status === "error") {
-      setWelcomeError(resp.errors[0].message);
-      setState("welcome");
-      return;
-    }
-
-    if (resp.status === "success") {
-      addClanURI(path);
-      setActiveClanURI(path);
-      navigateToClan(navigate, path);
-    }
   };
 
   return (
@@ -271,13 +140,7 @@ export const Onboarding: Component<RouteSectionProps> = (props) => {
       {background({ form: setupForm, state: state() })}
       <div class="container">
         <Switch>
-          <Match when={state() === "welcome"}>
+          <Match when={state() === "welcome"}>{welcome(setState)}</Match>
-            {welcome({
-              setState,
-              welcomeError,
-              setWelcomeError,
-            })}
-          </Match>
 
           <Match when={state() === "setup"}>
             <div class="setup">
@@ -292,16 +155,8 @@ export const Onboarding: Component<RouteSectionProps> = (props) => {
                   Setup
                 </Typography>
               </div>
-              <Form onSubmit={onSubmit}>
+              <Form>
-                {formError() && (
+                <Fieldset name="meta" error={metaError()}>
-                  <Alert
-                    type="error"
-                    icon="Info"
-                    title="Form error"
-                    description={formError() || ""}
-                  />
-                )}
-                <Fieldset name="meta">
                   <Field name="name">
                     {(field, input) => (
                       <TextInput
@@ -340,13 +195,15 @@ export const Onboarding: Component<RouteSectionProps> = (props) => {
                   </Field>
                 </Fieldset>
 
-                <Fieldset name="location">
+                <Fieldset
+                  name="location"
+                  error={getError(setupForm, "directory")}
+                >
                   <Field name="directory">
                     {(field, input) => (
                       <HostFileInput
-                        onSelectFile={onSelectFile}
+                        onSelectFile={async () => "test"}
                         {...field}
-                        value={field.value}
                         label="Select directory"
                         orientation="horizontal"
                         required={true}
@@ -371,8 +228,6 @@ export const Onboarding: Component<RouteSectionProps> = (props) => {
               </Form>
             </div>
           </Match>
-
-          <Match when={state() === "creating"}>{creating()}</Match>
         </Switch>
       </div>
     </main>

pkgs/clan-app/ui/src/routes/Onboarding/cube.svg

@@ -1,316 +0,0 @@
-<svg width="273" height="327" viewBox="0 0 273 327" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="70.9982" height="70.9982" rx="1" transform="matrix(0.86619 0.499716 -0.86619 0.499716 137.399 89.7148)" fill="url(#paint0_linear_4542_12187)" stroke="url(#paint1_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 75.8281 125.194)" fill="url(#paint2_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 75.8281 125.194)" fill="url(#paint3_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 75.8281 125.194)" stroke="url(#paint4_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 137.326 160.673)" fill="url(#paint5_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 137.326 160.673)" fill="url(#paint6_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 137.326 160.673)" stroke="url(#paint7_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9982" rx="1" transform="matrix(0.86619 0.499716 -0.86619 0.499716 62.5708 142.85)" fill="url(#paint8_linear_4542_12187)" stroke="url(#paint9_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 1 178.329)" fill="url(#paint10_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 1 178.329)" fill="url(#paint11_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 1 178.329)" stroke="url(#paint12_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 62.4976 213.808)" fill="url(#paint13_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 62.4976 213.808)" fill="url(#paint14_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 62.4976 213.808)" stroke="url(#paint15_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9982" rx="1" transform="matrix(0.86619 0.499715 -0.86619 0.499715 210.502 137.882)" fill="url(#paint16_linear_4542_12187)" stroke="url(#paint17_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 148.931 173.361)" fill="url(#paint18_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 148.931 173.361)" fill="url(#paint19_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 148.931 173.361)" stroke="url(#paint20_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499715 0 1 210.429 208.84)" fill="url(#paint21_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499715 0 1 210.429 208.84)" fill="url(#paint22_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499715 0 1 210.429 208.84)" stroke="url(#paint23_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9982" rx="1" transform="matrix(0.86619 0.499716 -0.86619 0.499716 137.158 185.084)" fill="url(#paint24_linear_4542_12187)" stroke="url(#paint25_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 75.5869 220.563)" fill="url(#paint26_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 75.5869 220.563)" fill="url(#paint27_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 75.5869 220.563)" stroke="url(#paint28_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 137.084 256.042)" fill="url(#paint29_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 137.084 256.042)" fill="url(#paint30_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 137.084 256.042)" stroke="url(#paint31_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9982" rx="1" transform="matrix(0.86619 0.499716 -0.86619 0.499716 135.915 0)" fill="url(#paint32_linear_4542_12187)" stroke="url(#paint33_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 74.3442 35.479)" fill="url(#paint34_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 74.3442 35.479)" fill="url(#paint35_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 74.3442 35.479)" stroke="url(#paint36_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 135.842 70.9579)" fill="url(#paint37_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 135.842 70.9579)" fill="url(#paint38_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 135.842 70.9579)" stroke="url(#paint39_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9982" rx="1" transform="matrix(0.86619 0.499716 -0.86619 0.499716 62.5708 47.2027)" fill="url(#paint40_linear_4542_12187)" stroke="url(#paint41_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 1 82.6817)" fill="url(#paint42_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 1 82.6817)" fill="url(#paint43_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 1 82.6817)" stroke="url(#paint44_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 62.4976 118.161)" fill="url(#paint45_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 62.4976 118.161)" fill="url(#paint46_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 62.4976 118.161)" stroke="url(#paint47_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9982" rx="1" transform="matrix(0.86619 0.499715 -0.86619 0.499715 210.502 42.234)" fill="url(#paint48_linear_4542_12187)" stroke="url(#paint49_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 148.931 77.713)" fill="url(#paint50_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 148.931 77.713)" fill="url(#paint51_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 148.931 77.713)" stroke="url(#paint52_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499715 0 1 210.429 113.192)" fill="url(#paint53_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499715 0 1 210.429 113.192)" fill="url(#paint54_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499715 0 1 210.429 113.192)" stroke="url(#paint55_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9982" rx="1" transform="matrix(0.86619 0.499716 -0.86619 0.499716 137.158 89.4367)" fill="url(#paint56_linear_4542_12187)" stroke="url(#paint57_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 75.5869 124.916)" fill="url(#paint58_linear_4542_12187)" fill-opacity="0.1"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 75.5869 124.916)" fill="url(#paint59_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 0.499716 0 1 75.5869 124.916)" stroke="url(#paint60_linear_4542_12187)" stroke-width="0.64"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 137.084 160.395)" fill="url(#paint61_linear_4542_12187)"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 137.084 160.395)" fill="url(#paint62_linear_4542_12187)" fill-opacity="0.24"/>
-<rect width="70.9982" height="70.9578" rx="1" transform="matrix(0.86619 -0.499716 0 1 137.084 160.395)" stroke="url(#paint63_linear_4542_12187)" stroke-width="0.64"/>
-<defs>
-<linearGradient id="paint0_linear_4542_12187" x1="3.21525" y1="1.26987" x2="26.2123" y2="73.9372" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.94"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint1_linear_4542_12187" x1="73.1289" y1="21.7256" x2="19.1537" y2="-1.08702" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint2_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint3_linear_4542_12187" x1="71.0824" y1="68.7651" x2="43.5492" y2="9.42738" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint4_linear_4542_12187" x1="73.1289" y1="21.7132" x2="19.163" y2="-1.10842" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint5_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.81"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint6_linear_4542_12187" x1="22.5463" y1="67.3059" x2="51.7875" y2="28.1744" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint7_linear_4542_12187" x1="73.1289" y1="21.7132" x2="19.163" y2="-1.10842" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint8_linear_4542_12187" x1="3.21525" y1="1.26987" x2="26.2123" y2="73.9372" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.94"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint9_linear_4542_12187" x1="73.1289" y1="21.7256" x2="19.1537" y2="-1.08702" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint10_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint11_linear_4542_12187" x1="71.0824" y1="68.7651" x2="43.5492" y2="9.42738" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint12_linear_4542_12187" x1="73.1289" y1="21.7132" x2="19.163" y2="-1.10842" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint13_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.81"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint14_linear_4542_12187" x1="22.5463" y1="67.3059" x2="51.7875" y2="28.1744" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint15_linear_4542_12187" x1="73.129" y1="21.7132" x2="19.163" y2="-1.10843" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint16_linear_4542_12187" x1="3.21525" y1="1.26987" x2="26.2123" y2="73.9372" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.94"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint17_linear_4542_12187" x1="73.129" y1="21.7256" x2="19.1537" y2="-1.08702" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint18_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint19_linear_4542_12187" x1="71.0824" y1="68.7651" x2="43.5492" y2="9.42737" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint20_linear_4542_12187" x1="73.1289" y1="21.7132" x2="19.163" y2="-1.10843" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint21_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.81"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint22_linear_4542_12187" x1="22.5463" y1="67.3059" x2="51.7875" y2="28.1744" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint23_linear_4542_12187" x1="73.129" y1="21.7132" x2="19.163" y2="-1.10843" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint24_linear_4542_12187" x1="3.21525" y1="1.26987" x2="26.2123" y2="73.9372" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.94"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint25_linear_4542_12187" x1="73.1289" y1="21.7256" x2="19.1537" y2="-1.08702" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint26_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint27_linear_4542_12187" x1="71.0824" y1="68.7651" x2="43.5492" y2="9.42738" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint28_linear_4542_12187" x1="73.129" y1="21.7132" x2="19.163" y2="-1.10843" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint29_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.81"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint30_linear_4542_12187" x1="22.5463" y1="67.3059" x2="51.7875" y2="28.1743" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint31_linear_4542_12187" x1="73.1289" y1="21.7132" x2="19.163" y2="-1.10843" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint32_linear_4542_12187" x1="3.21525" y1="1.26987" x2="26.2123" y2="73.9372" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.94"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint33_linear_4542_12187" x1="73.129" y1="21.7256" x2="19.1537" y2="-1.08702" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint34_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint35_linear_4542_12187" x1="71.0824" y1="68.7651" x2="43.5492" y2="9.42738" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint36_linear_4542_12187" x1="73.1289" y1="21.7132" x2="19.163" y2="-1.10843" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint37_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.81"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint38_linear_4542_12187" x1="22.5463" y1="67.3059" x2="51.7875" y2="28.1744" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint39_linear_4542_12187" x1="73.1289" y1="21.7132" x2="19.163" y2="-1.10842" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint40_linear_4542_12187" x1="3.21525" y1="1.26987" x2="26.2123" y2="73.9372" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.94"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint41_linear_4542_12187" x1="73.1289" y1="21.7256" x2="19.1537" y2="-1.08702" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint42_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint43_linear_4542_12187" x1="71.0824" y1="68.7651" x2="43.5492" y2="9.42738" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint44_linear_4542_12187" x1="73.1289" y1="21.7132" x2="19.163" y2="-1.10842" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint45_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.81"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint46_linear_4542_12187" x1="22.5463" y1="67.3059" x2="51.7875" y2="28.1744" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint47_linear_4542_12187" x1="73.129" y1="21.7132" x2="19.163" y2="-1.10843" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint48_linear_4542_12187" x1="3.21525" y1="1.26987" x2="26.2123" y2="73.9372" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.94"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint49_linear_4542_12187" x1="73.129" y1="21.7256" x2="19.1537" y2="-1.08702" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint50_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint51_linear_4542_12187" x1="71.0824" y1="68.7651" x2="43.5492" y2="9.42738" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint52_linear_4542_12187" x1="73.1289" y1="21.7132" x2="19.163" y2="-1.10842" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint53_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.81"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint54_linear_4542_12187" x1="22.5463" y1="67.3059" x2="51.7875" y2="28.1744" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint55_linear_4542_12187" x1="73.129" y1="21.7132" x2="19.163" y2="-1.10843" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint56_linear_4542_12187" x1="3.21525" y1="1.26987" x2="26.2123" y2="73.9372" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.94"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint57_linear_4542_12187" x1="73.1289" y1="21.7256" x2="19.1537" y2="-1.08702" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint58_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint59_linear_4542_12187" x1="71.0824" y1="68.7651" x2="43.5492" y2="9.42738" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint60_linear_4542_12187" x1="73.129" y1="21.7132" x2="19.163" y2="-1.10843" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-<linearGradient id="paint61_linear_4542_12187" x1="3.21525" y1="1.26914" x2="26.1885" y2="73.9026" gradientUnits="userSpaceOnUse">
-<stop stop-color="white" stop-opacity="0.81"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint62_linear_4542_12187" x1="22.5463" y1="67.3059" x2="51.7875" y2="28.1744" gradientUnits="userSpaceOnUse">
-<stop stop-color="#40A2A6"/>
-<stop offset="1" stop-color="#91ACAF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint63_linear_4542_12187" x1="73.1289" y1="21.7132" x2="19.163" y2="-1.10842" gradientUnits="userSpaceOnUse">
-<stop stop-color="#10191A"/>
-<stop offset="1" stop-color="#2C4547"/>
-</linearGradient>
-</defs>
-</svg>

pkgs/clan-app/ui/src/scene/cubes.css

@@ -1,15 +0,0 @@
-.cubes-scene-container {
-  width: 100%;
-  height: 100vh;
-  cursor: pointer;
-}
-
-.toolbar-container {
-  position: absolute;
-  bottom: 10%;
-  width: 100%;
-  z-index: 10;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}

pkgs/clan-app/ui/src/scene/cubes.stories.tsx

@@ -1,15 +0,0 @@
-import { Meta, StoryObj } from "@kachurun/storybook-solid";
-import { CubeScene } from "./cubes";
-
-const meta: Meta = {
-  title: "scene/cubes",
-  component: CubeScene,
-};
-
-export default meta;
-
-type Story = StoryObj;
-
-export const Default: Story = {
-  args: {},
-};

pkgs/flake-module.nix

@@ -13,7 +13,12 @@
   ];
 
   perSystem =
-    { config, pkgs, ... }:
+    {
+      config,
+      pkgs,
+      self',
+      ...
+    }:
     {
       packages = {
         agit = pkgs.callPackage ./agit { };
@@ -28,6 +33,25 @@
         classgen = pkgs.callPackage ./classgen { };
         zerotierone = pkgs.callPackage ./zerotierone { };
         update-clan-core-for-checks = pkgs.callPackage ./update-clan-core-for-checks { };
+        clan-autorefresh = pkgs.symlinkJoin {
+          name = "clan";
+          paths = [
+            (pkgs.writeScriptBin "clan" ''
+              #!/bin/sh
+              set -efu
+
+              system=$(nix config show system)
+
+              nix \
+                --extra-experimental-features 'flakes nix-command' \
+                run ".#clanInternals.clan-cli.$system" -- "$@"
+            '')
+            self'.packages.clan-cli
+          ];
+          postBuild = ''
+            rm -r $out/lib
+          '';
+        };
       };
     };
 }

templates/clan/default/flake.nix

@@ -25,7 +25,9 @@
           ]
           (system: {
             default = clan-core.inputs.nixpkgs.legacyPackages.${system}.mkShell {
-              packages = [ clan-core.packages.${system}.clan-cli ];
+              packages = [
+                clan-core.packages.${system}.clan-autorefresh
+              ];
             };
           });
     };

templates/clan/flake-parts/flake.nix

@@ -28,7 +28,7 @@
       perSystem =
         { pkgs, inputs', ... }:
         {
-          devShells.default = pkgs.mkShell { packages = [ inputs'.clan-core.packages.clan-cli ]; };
+          devShells.default = pkgs.mkShell { packages = [ inputs'.clan-core.packages.clan-autorefresh ]; };
         };
     };
 }