@highstate/nixos 0.9.33 → 0.9.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "sourceHashes": {
3
- "./dist/inline-flake/index.js": 1425795598,
4
- "./dist/inline-module/index.js": 3395324646,
5
- "./dist/system/index.js": 2297581574
3
+ "./dist/inline-flake/index.js": 2598216670,
4
+ "./dist/inline-module/index.js": 3111842668,
5
+ "./dist/system/index.js": 1976012375
6
6
  }
7
7
  }
@@ -1,13 +1,14 @@
1
- import { writeFile, access } from 'node:fs/promises';
1
+ import { writeFile, readFile, access } from 'node:fs/promises';
2
2
  import { join } from 'node:path';
3
- import { MaterializedFolder, Command } from '@highstate/common';
3
+ import { MaterializedFolder, MaterializedFile, Command } from '@highstate/common';
4
+ import { text } from '@highstate/contract';
4
5
  import { MaterializedRepository } from '@highstate/git';
5
6
  import { nixos } from '@highstate/library';
6
7
  import { forUnit, toPromise } from '@highstate/pulumi';
7
8
 
8
9
  // src/inline-flake/index.ts
9
10
  var { name, args, inputs, outputs } = forUnit(nixos.inlineFlake);
10
- var { folders } = await toPromise(inputs);
11
+ var { folders, files } = await toPromise(inputs);
11
12
  var flakeRepo = await MaterializedRepository.create(args.flakeName ?? name);
12
13
  var firstOpenBrace = args.code.indexOf("{\n");
13
14
  if (firstOpenBrace === -1) {
@@ -31,15 +32,58 @@ for (const inputFolder of folders ?? []) {
31
32
  codeParts.push(`inputs.${inputFolder.meta.name}.url = "path:./${folder.entity.meta.name}";`);
32
33
  }
33
34
  }
35
+ for (const inputFile of files ?? []) {
36
+ await MaterializedFile.open(inputFile, flakeRepo.folder);
37
+ }
34
38
  codeParts.push("", args.code.slice(firstOpenBrace + 1).trim(), "");
35
- await writeFile(join(flakeRepo.path, "flake.nix"), codeParts.join("\n"));
39
+ var generatedCode = codeParts.join("\n");
40
+ await writeFile(join(flakeRepo.path, "flake.nix"), generatedCode);
41
+ await flakeRepo.git.add(".");
42
+ await new Command("format-flake", {
43
+ host: "local",
44
+ create: `nix-shell -p nixfmt-rfc-style --run "nixfmt flake.nix"`,
45
+ cwd: flakeRepo.path
46
+ }).wait();
47
+ var formattedCode = await readFile(join(flakeRepo.path, "flake.nix"), "utf-8");
36
48
  await new Command("update-flake", {
37
49
  host: "local",
38
50
  create: "nix flake update",
39
51
  cwd: flakeRepo.path
40
52
  }).wait();
53
+ var lockContent = await readFile(join(flakeRepo.path, "flake.lock"), "utf-8");
41
54
  var inline_flake_default = outputs({
42
- folder: flakeRepo.pack()
55
+ folder: flakeRepo.pack(),
56
+ $pages: {
57
+ index: {
58
+ meta: {
59
+ title: "Generated flake.nix",
60
+ description: "The generated flake.nix file from the provided template code.",
61
+ icon: "mdi:file-code"
62
+ },
63
+ content: [
64
+ {
65
+ type: "markdown",
66
+ content: text`
67
+ The following \`flake.nix\` file was generated:
68
+
69
+ \`\`\`nix
70
+ ${formattedCode}
71
+ \`\`\`
72
+ `
73
+ },
74
+ {
75
+ type: "markdown",
76
+ content: text`
77
+ The following inputs were locked:
78
+
79
+ \`\`\`nix
80
+ ${lockContent}
81
+ \`\`\`
82
+ `
83
+ }
84
+ ]
85
+ }
86
+ }
43
87
  });
44
88
 
45
89
  export { inline_flake_default as default };
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/inline-flake/index.ts"],"names":[],"mappings":";;;;;;;;AAOA,IAAM,EAAE,MAAM,IAAA,EAAM,MAAA,EAAQ,SAAQ,GAAI,OAAA,CAAQ,MAAM,WAAW,CAAA;AAEjE,IAAM,EAAE,OAAA,EAAQ,GAAI,MAAM,UAAU,MAAM,CAAA;AAE1C,IAAM,YAAY,MAAM,sBAAA,CAAuB,MAAA,CAAO,IAAA,CAAK,aAAa,IAAI,CAAA;AAE5E,IAAI,cAAA,GAAiB,IAAA,CAAK,IAAA,CAAK,OAAA,CAAQ,KAAK,CAAA;AAC5C,IAAI,mBAAmB,EAAA,EAAI;AACzB,EAAA,cAAA,GAAiB,IAAA,CAAK,IAAA,CAAK,OAAA,CAAQ,GAAG,CAAA;AACxC;AAEA,IAAI,mBAAmB,EAAA,EAAI;AACzB,EAAA,MAAM,IAAI,MAAM,iEAAiE,CAAA;AACnF;AAEA,IAAM,SAAA,GAAY,CAAC,IAAA,CAAK,IAAA,CAAK,KAAA,CAAM,CAAA,EAAG,cAAA,GAAiB,CAAC,CAAA,CAAE,IAAA,EAAK,EAAG,EAAE,CAAA;AAEpE,IAAM,QAAA,GAAW,OAAO,MAAA,KAA+B;AACrD,EAAA,IAAI;AACF,IAAA,MAAM,MAAA,CAAO,IAAA,CAAK,MAAA,CAAO,IAAA,EAAM,WAAW,CAAC,CAAA;AAC3C,IAAA,OAAO,IAAA;AAAA,EACT,CAAA,CAAA,MAAQ;AACN,IAAA,OAAO,KAAA;AAAA,EACT;AACF,CAAA;AAEA,KAAA,MAAW,WAAA,IAAe,OAAA,IAAW,EAAC,EAAG;AACvC,EAAA,MAAM,SAAS,MAAM,kBAAA,CAAmB,IAAA,CAAK,WAAA,EAAa,UAAU,MAAM,CAAA;AAE1E,EAAA,IAAI,MAAM,QAAA,CAAS,MAAM,CAAA,EAAG;AAC1B,IAAA,SAAA,CAAU,IAAA,CAAK,CAAA,OAAA,EAAU,WAAA,CAAY,IAAA,CAAK,IAAI,kBAAkB,MAAA,CAAO,MAAA,CAAO,IAAA,CAAK,IAAI,CAAA,EAAA,CAAI,CAAA;AAAA,EAC7F;AACF;AAEA,SAAA,CAAU,IAAA,CAAK,EAAA,EAAI,IAAA,CAAK,IAAA,CAAK,KAAA,CAAM,iBAAiB,CAAC,CAAA,CAAE,IAAA,EAAK,EAAG,EAAE,CAAA;AAEjE,MAAM,SAAA,CAAU,KAAK,SAAA,CAAU,IAAA,EAAM,WAAW,CAAA,EAAG,SAAA,CAAU,IAAA,CAAK,IAAI,CAAC,CAAA;AAEvE,MAAM,IAAI,QAAQ,cAAA,EAAgB;AAAA,EAChC,IAAA,EAAM,OAAA;AAAA,EACN,MAAA,EAAQ,kBAAA;AAAA,EACR,KAAK,SAAA,CAAU;AACjB,CAAC,EAAE,IAAA,EAAK;AAER,IAAO,uBAAQ,OAAA,CAAQ;AAAA,EACrB,MAAA,EAAQ,UAAU,IAAA;AACpB,CAAC","file":"index.js","sourcesContent":["import { access, writeFile } from \"node:fs/promises\"\nimport { join } from \"node:path\"\nimport { Command, MaterializedFolder } from \"@highstate/common\"\nimport { MaterializedRepository } from \"@highstate/git\"\nimport { nixos } from \"@highstate/library\"\nimport { forUnit, toPromise } from \"@highstate/pulumi\"\n\nconst { name, args, inputs, outputs } = forUnit(nixos.inlineFlake)\n\nconst { folders } = await toPromise(inputs)\n\nconst flakeRepo = await MaterializedRepository.create(args.flakeName ?? name)\n\nlet firstOpenBrace = args.code.indexOf(\"{\\n\")\nif (firstOpenBrace === -1) {\n firstOpenBrace = args.code.indexOf(\"{\")\n}\n\nif (firstOpenBrace === -1) {\n throw new Error(\"The provided code does not contain a valid flake.nix structure.\")\n}\n\nconst codeParts = [args.code.slice(0, firstOpenBrace + 1).trim(), \"\"]\n\nconst hasFlake = async (folder: MaterializedFolder) => {\n try {\n await access(join(folder.path, \"flake.nix\"))\n return true\n } catch {\n return false\n }\n}\n\nfor (const inputFolder of folders ?? []) {\n const folder = await MaterializedFolder.open(inputFolder, flakeRepo.folder)\n\n if (await hasFlake(folder)) {\n codeParts.push(`inputs.${inputFolder.meta.name}.url = \"path:./${folder.entity.meta.name}\";`)\n }\n}\n\ncodeParts.push(\"\", args.code.slice(firstOpenBrace + 1).trim(), \"\")\n\nawait writeFile(join(flakeRepo.path, \"flake.nix\"), codeParts.join(\"\\n\"))\n\nawait new Command(\"update-flake\", {\n host: \"local\",\n create: \"nix flake update\",\n cwd: flakeRepo.path,\n}).wait()\n\nexport default outputs({\n folder: flakeRepo.pack(),\n})\n"]}
1
+ {"version":3,"sources":["../../src/inline-flake/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import { access, readFile, writeFile } from \"node:fs/promises\"\nimport { join } from \"node:path\"\nimport { Command, MaterializedFile, MaterializedFolder } from \"@highstate/common\"\nimport { text } from \"@highstate/contract\"\nimport { MaterializedRepository } from \"@highstate/git\"\nimport { nixos } from \"@highstate/library\"\nimport { forUnit, toPromise } from \"@highstate/pulumi\"\n\nconst { name, args, inputs, outputs } = forUnit(nixos.inlineFlake)\n\nconst { folders, files } = await toPromise(inputs)\n\nconst flakeRepo = await MaterializedRepository.create(args.flakeName ?? name)\n\nlet firstOpenBrace = args.code.indexOf(\"{\\n\")\nif (firstOpenBrace === -1) {\n firstOpenBrace = args.code.indexOf(\"{\")\n}\n\nif (firstOpenBrace === -1) {\n throw new Error(\"The provided code does not contain a valid flake.nix structure.\")\n}\n\nconst codeParts = [args.code.slice(0, firstOpenBrace + 1).trim(), \"\"]\n\nconst hasFlake = async (folder: MaterializedFolder) => {\n try {\n await access(join(folder.path, \"flake.nix\"))\n return true\n } catch {\n return false\n }\n}\n\nfor (const inputFolder of folders ?? []) {\n const folder = await MaterializedFolder.open(inputFolder, flakeRepo.folder)\n\n if (await hasFlake(folder)) {\n codeParts.push(`inputs.${inputFolder.meta.name}.url = \"path:./${folder.entity.meta.name}\";`)\n }\n}\n\nfor (const inputFile of files ?? []) {\n await MaterializedFile.open(inputFile, flakeRepo.folder)\n}\n\ncodeParts.push(\"\", args.code.slice(firstOpenBrace + 1).trim(), \"\")\nconst generatedCode = codeParts.join(\"\\n\")\n\nawait writeFile(join(flakeRepo.path, \"flake.nix\"), generatedCode)\nawait flakeRepo.git.add(\".\")\n\n// format the code with nixfmt\nawait new Command(\"format-flake\", {\n host: \"local\",\n create: `nix-shell -p nixfmt-rfc-style --run \"nixfmt flake.nix\"`,\n cwd: flakeRepo.path,\n}).wait()\n\nconst formattedCode = await readFile(join(flakeRepo.path, \"flake.nix\"), \"utf-8\")\n\n// run nix flake update to generate the lock file and check for errors\nawait new Command(\"update-flake\", {\n host: \"local\",\n create: \"nix flake update\",\n cwd: flakeRepo.path,\n}).wait()\n\nconst lockContent = await readFile(join(flakeRepo.path, \"flake.lock\"), \"utf-8\")\n\nexport default outputs({\n folder: flakeRepo.pack(),\n\n $pages: {\n index: {\n meta: {\n title: \"Generated flake.nix\",\n description: \"The generated flake.nix file from the provided template code.\",\n icon: \"mdi:file-code\",\n },\n content: [\n {\n type: \"markdown\",\n content: text`\n The following \\`flake.nix\\` file was generated:\n\n \\`\\`\\`nix\n ${formattedCode}\n \\`\\`\\`\n `,\n },\n {\n type: \"markdown\",\n content: text`\n The following inputs were locked:\n\n \\`\\`\\`nix\n ${lockContent}\n \\`\\`\\`\n `,\n },\n ],\n },\n },\n})\n"]}
@@ -1,4 +1,4 @@
1
- import { MaterializedFile, Command, l3EndpointToString, createSshTerminal } from '@highstate/common';
1
+ import { MaterializedFile, createSshHostKeyFile, Command, l3EndpointToString, createSshTerminal } from '@highstate/common';
2
2
  import { MaterializedRepository } from '@highstate/git';
3
3
  import { nixos } from '@highstate/library';
4
4
  import { forUnit, toPromise } from '@highstate/pulumi';
@@ -10,14 +10,17 @@ if (!server.ssh) {
10
10
  throw new Error("Server must have an SSH endpoint defined");
11
11
  }
12
12
  var repo = await MaterializedRepository.open(flake);
13
+ await repo.git.add(".");
13
14
  var privateKey = await MaterializedFile.create(
14
15
  "private-key",
15
16
  server.ssh.keyPair?.privateKey,
16
17
  384
17
18
  );
19
+ var hostKey = await MaterializedFile.open(createSshHostKeyFile(server));
18
20
  var system = args.system ?? server.hostname;
19
21
  await new Command(name, {
20
22
  host: "local",
23
+ // install the system using nixos-anywhere if not already installed
21
24
  create: [
22
25
  "nixos-anywhere",
23
26
  `--flake ${repo.path}#${system}`,
@@ -25,6 +28,20 @@ await new Command(name, {
25
28
  `--target-host ${server.ssh.user}@${l3EndpointToString(server.ssh.endpoints[0])}`,
26
29
  `--ssh-port ${server.ssh.endpoints[0].port}`,
27
30
  "--copy-host-keys"
31
+ ],
32
+ // switch to the latest configuration on every update
33
+ update: [
34
+ `NIX_SSHOPTS="${[
35
+ `-o IdentityFile=${privateKey.path}`,
36
+ `-o StrictHostKeyChecking=yes`,
37
+ `-o UserKnownHostsFile=${hostKey.path}`,
38
+ `-p ${server.ssh.endpoints[0].port}`
39
+ ].join(" ")}"`,
40
+ "nixos-rebuild",
41
+ "switch",
42
+ `--flake ${repo.path}#${system}`,
43
+ `--use-remote-sudo`,
44
+ `--target-host ${server.ssh.user}@${l3EndpointToString(server.ssh.endpoints[0])}`
28
45
  ]
29
46
  }).wait();
30
47
  var system_default = outputs({
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/system/index.ts"],"names":[],"mappings":";;;;;;AAKA,IAAM,EAAE,MAAM,IAAA,EAAM,MAAA,EAAQ,SAAQ,GAAI,OAAA,CAAQ,MAAM,MAAM,CAAA;AAE5D,IAAM,EAAE,KAAA,EAAO,MAAA,EAAO,GAAI,MAAM,UAAU,MAAM,CAAA;AAEhD,IAAI,CAAC,OAAO,GAAA,EAAK;AACf,EAAA,MAAM,IAAI,MAAM,0CAA0C,CAAA;AAC5D;AAEA,IAAM,IAAA,GAAO,MAAM,sBAAA,CAAuB,IAAA,CAAK,KAAK,CAAA;AAEpD,IAAM,UAAA,GAAa,MAAM,gBAAA,CAAiB,MAAA;AAAA,EACxC,aAAA;AAAA,EACA,MAAA,CAAO,IAAI,OAAA,EAAS,UAAA;AAAA,EACpB;AACF,CAAA;AAEA,IAAM,MAAA,GAAS,IAAA,CAAK,MAAA,IAAU,MAAA,CAAO,QAAA;AAErC,MAAM,IAAI,QAAQ,IAAA,EAAM;AAAA,EACtB,IAAA,EAAM,OAAA;AAAA,EACN,MAAA,EAAQ;AAAA,IACN,gBAAA;AAAA,IACA,CAAA,QAAA,EAAW,IAAA,CAAK,IAAI,CAAA,CAAA,EAAI,MAAM,CAAA,CAAA;AAAA,IAC9B,CAAA,GAAA,EAAM,WAAW,IAAI,CAAA,CAAA;AAAA,IACrB,CAAA,cAAA,EAAiB,MAAA,CAAO,GAAA,CAAI,IAAI,CAAA,CAAA,EAAI,kBAAA,CAAmB,MAAA,CAAO,GAAA,CAAI,SAAA,CAAU,CAAC,CAAC,CAAC,CAAA,CAAA;AAAA,IAC/E,cAAc,MAAA,CAAO,GAAA,CAAI,SAAA,CAAU,CAAC,EAAE,IAAI,CAAA,CAAA;AAAA,IAC1C;AAAA;AAEJ,CAAC,EAAE,IAAA,EAAK;AAER,IAAO,iBAAQ,OAAA,CAAQ;AAAA,EACrB,QAAQ,MAAA,CAAO,MAAA;AAAA,EAEf,UAAA,EAAY,CAAC,iBAAA,CAAkB,MAAA,CAAO,GAAG,CAAC;AAC5C,CAAC","file":"index.js","sourcesContent":["import { Command, createSshTerminal, l3EndpointToString, MaterializedFile } from \"@highstate/common\"\nimport { MaterializedRepository } from \"@highstate/git\"\nimport { nixos } from \"@highstate/library\"\nimport { forUnit, toPromise } from \"@highstate/pulumi\"\n\nconst { name, args, inputs, outputs } = forUnit(nixos.system)\n\nconst { flake, server } = await toPromise(inputs)\n\nif (!server.ssh) {\n throw new Error(\"Server must have an SSH endpoint defined\")\n}\n\nconst repo = await MaterializedRepository.open(flake)\n\nconst privateKey = await MaterializedFile.create(\n \"private-key\",\n server.ssh.keyPair?.privateKey,\n 0o600,\n)\n\nconst system = args.system ?? server.hostname\n\nawait new Command(name, {\n host: \"local\",\n create: [\n \"nixos-anywhere\",\n `--flake ${repo.path}#${system}`,\n `-i ${privateKey.path}`,\n `--target-host ${server.ssh.user}@${l3EndpointToString(server.ssh.endpoints[0])}`,\n `--ssh-port ${server.ssh.endpoints[0].port}`,\n \"--copy-host-keys\",\n ],\n}).wait()\n\nexport default outputs({\n server: inputs.server,\n\n $terminals: [createSshTerminal(server.ssh)],\n})\n"]}
1
+ {"version":3,"sources":["../../src/system/index.ts"],"names":[],"mappings":";;;;;;AAWA,IAAM,EAAE,MAAM,IAAA,EAAM,MAAA,EAAQ,SAAQ,GAAI,OAAA,CAAQ,MAAM,MAAM,CAAA;AAE5D,IAAM,EAAE,KAAA,EAAO,MAAA,EAAO,GAAI,MAAM,UAAU,MAAM,CAAA;AAEhD,IAAI,CAAC,OAAO,GAAA,EAAK;AACf,EAAA,MAAM,IAAI,MAAM,0CAA0C,CAAA;AAC5D;AAEA,IAAM,IAAA,GAAO,MAAM,sBAAA,CAAuB,IAAA,CAAK,KAAK,CAAA;AACpD,MAAM,IAAA,CAAK,GAAA,CAAI,GAAA,CAAI,GAAG,CAAA;AAEtB,IAAM,UAAA,GAAa,MAAM,gBAAA,CAAiB,MAAA;AAAA,EACxC,aAAA;AAAA,EACA,MAAA,CAAO,IAAI,OAAA,EAAS,UAAA;AAAA,EACpB;AACF,CAAA;AAEA,IAAM,UAAU,MAAM,gBAAA,CAAiB,IAAA,CAAK,oBAAA,CAAqB,MAAM,CAAC,CAAA;AAExE,IAAM,MAAA,GAAS,IAAA,CAAK,MAAA,IAAU,MAAA,CAAO,QAAA;AAErC,MAAM,IAAI,QAAQ,IAAA,EAAM;AAAA,EACtB,IAAA,EAAM,OAAA;AAAA;AAAA,EAGN,MAAA,EAAQ;AAAA,IACN,gBAAA;AAAA,IACA,CAAA,QAAA,EAAW,IAAA,CAAK,IAAI,CAAA,CAAA,EAAI,MAAM,CAAA,CAAA;AAAA,IAC9B,CAAA,GAAA,EAAM,WAAW,IAAI,CAAA,CAAA;AAAA,IACrB,CAAA,cAAA,EAAiB,MAAA,CAAO,GAAA,CAAI,IAAI,CAAA,CAAA,EAAI,kBAAA,CAAmB,MAAA,CAAO,GAAA,CAAI,SAAA,CAAU,CAAC,CAAC,CAAC,CAAA,CAAA;AAAA,IAC/E,cAAc,MAAA,CAAO,GAAA,CAAI,SAAA,CAAU,CAAC,EAAE,IAAI,CAAA,CAAA;AAAA,IAC1C;AAAA,GACF;AAAA;AAAA,EAGA,MAAA,EAAQ;AAAA,IACN,CAAA,aAAA,EAAgB;AAAA,MACd,CAAA,gBAAA,EAAmB,WAAW,IAAI,CAAA,CAAA;AAAA,MAClC,CAAA,4BAAA,CAAA;AAAA,MACA,CAAA,sBAAA,EAAyB,QAAQ,IAAI,CAAA,CAAA;AAAA,MACrC,MAAM,MAAA,CAAO,GAAA,CAAI,SAAA,CAAU,CAAC,EAAE,IAAI,CAAA;AAAA,KACpC,CAAE,IAAA,CAAK,GAAG,CAAC,CAAA,CAAA,CAAA;AAAA,IAEX,eAAA;AAAA,IACA,QAAA;AAAA,IACA,CAAA,QAAA,EAAW,IAAA,CAAK,IAAI,CAAA,CAAA,EAAI,MAAM,CAAA,CAAA;AAAA,IAC9B,CAAA,iBAAA,CAAA;AAAA,IACA,CAAA,cAAA,EAAiB,MAAA,CAAO,GAAA,CAAI,IAAI,CAAA,CAAA,EAAI,kBAAA,CAAmB,MAAA,CAAO,GAAA,CAAI,SAAA,CAAU,CAAC,CAAC,CAAC,CAAA;AAAA;AAEnF,CAAC,EAAE,IAAA,EAAK;AAER,IAAO,iBAAQ,OAAA,CAAQ;AAAA,EACrB,QAAQ,MAAA,CAAO,MAAA;AAAA,EAEf,UAAA,EAAY,CAAC,iBAAA,CAAkB,MAAA,CAAO,GAAG,CAAC;AAC5C,CAAC","file":"index.js","sourcesContent":["import {\n Command,\n createSshHostKeyFile,\n createSshTerminal,\n l3EndpointToString,\n MaterializedFile,\n} from \"@highstate/common\"\nimport { MaterializedRepository } from \"@highstate/git\"\nimport { nixos } from \"@highstate/library\"\nimport { forUnit, toPromise } from \"@highstate/pulumi\"\n\nconst { name, args, inputs, outputs } = forUnit(nixos.system)\n\nconst { flake, server } = await toPromise(inputs)\n\nif (!server.ssh) {\n throw new Error(\"Server must have an SSH endpoint defined\")\n}\n\nconst repo = await MaterializedRepository.open(flake)\nawait repo.git.add(\".\")\n\nconst privateKey = await MaterializedFile.create(\n \"private-key\",\n server.ssh.keyPair?.privateKey,\n 0o600,\n)\n\nconst hostKey = await MaterializedFile.open(createSshHostKeyFile(server))\n\nconst system = args.system ?? server.hostname\n\nawait new Command(name, {\n host: \"local\",\n\n // install the system using nixos-anywhere if not already installed\n create: [\n \"nixos-anywhere\",\n `--flake ${repo.path}#${system}`,\n `-i ${privateKey.path}`,\n `--target-host ${server.ssh.user}@${l3EndpointToString(server.ssh.endpoints[0])}`,\n `--ssh-port ${server.ssh.endpoints[0].port}`,\n \"--copy-host-keys\",\n ],\n\n // switch to the latest configuration on every update\n update: [\n `NIX_SSHOPTS=\"${[\n `-o IdentityFile=${privateKey.path}`,\n `-o StrictHostKeyChecking=yes`,\n `-o UserKnownHostsFile=${hostKey.path}`,\n `-p ${server.ssh.endpoints[0].port}`,\n ].join(\" \")}\"`,\n\n \"nixos-rebuild\",\n \"switch\",\n `--flake ${repo.path}#${system}`,\n `--use-remote-sudo`,\n `--target-host ${server.ssh.user}@${l3EndpointToString(server.ssh.endpoints[0])}`,\n ],\n}).wait()\n\nexport default outputs({\n server: inputs.server,\n\n $terminals: [createSshTerminal(server.ssh)],\n})\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@highstate/nixos",
3
- "version": "0.9.33",
3
+ "version": "0.9.35",
4
4
  "type": "module",
5
5
  "files": [
6
6
  "dist"
@@ -20,19 +20,19 @@
20
20
  "biome:check": "biome check --error-on-warnings"
21
21
  },
22
22
  "dependencies": {
23
- "@highstate/common": "^0.9.33",
24
- "@highstate/contract": "^0.9.33",
25
- "@highstate/git": "^0.9.33",
26
- "@highstate/library": "^0.9.33",
27
- "@highstate/pulumi": "^0.9.33",
23
+ "@highstate/common": "^0.9.35",
24
+ "@highstate/contract": "^0.9.35",
25
+ "@highstate/git": "^0.9.35",
26
+ "@highstate/library": "^0.9.35",
27
+ "@highstate/pulumi": "^0.9.35",
28
28
  "@pulumi/kubernetes": "^4.18.0",
29
29
  "@pulumi/pulumi": "^3.198.0",
30
30
  "remeda": "^2.21.3"
31
31
  },
32
32
  "devDependencies": {
33
33
  "@biomejs/biome": "2.2.0",
34
- "@highstate/cli": "^0.9.33",
34
+ "@highstate/cli": "^0.9.35",
35
35
  "@typescript/native-preview": "^7.0.0-dev.20250920.1"
36
36
  },
37
- "gitHead": "0f78892741428415dcee1399a0133c2f006ff719"
37
+ "gitHead": "52d9ed8e0d51156b2476b31adc49cc796bd4b508"
38
38
  }