@highstate/nixos 0.19.1 → 0.20.0
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.
- package/dist/highstate.manifest.json +3 -3
- package/dist/inline-flake/index.js +3 -4
- package/dist/inline-flake/index.js.map +1 -1
- package/dist/inline-module/index.js +27 -20
- package/dist/inline-module/index.js.map +1 -1
- package/dist/system/index.js +9 -5
- package/dist/system/index.js.map +1 -1
- package/package.json +8 -8
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"sourceHashes": {
|
|
3
|
-
"./dist/inline-flake/index.js":
|
|
4
|
-
"./dist/inline-module/index.js":
|
|
5
|
-
"./dist/system/index.js":
|
|
3
|
+
"./dist/inline-flake/index.js": 2619925202,
|
|
4
|
+
"./dist/inline-module/index.js": 3246713999,
|
|
5
|
+
"./dist/system/index.js": 2224580570
|
|
6
6
|
}
|
|
7
7
|
}
|
|
@@ -4,11 +4,10 @@ import { MaterializedFolder, MaterializedFile, Command } from '@highstate/common
|
|
|
4
4
|
import { text } from '@highstate/contract';
|
|
5
5
|
import { MaterializedRepository } from '@highstate/git';
|
|
6
6
|
import { nixos } from '@highstate/library';
|
|
7
|
-
import { forUnit
|
|
7
|
+
import { forUnit } from '@highstate/pulumi';
|
|
8
8
|
|
|
9
9
|
// src/inline-flake/index.ts
|
|
10
10
|
var { name, args, inputs, outputs } = forUnit(nixos.inlineFlake);
|
|
11
|
-
var { folders, files } = await toPromise(inputs);
|
|
12
11
|
var flakeRepo = await MaterializedRepository.create(args.flakeName ?? name);
|
|
13
12
|
var firstOpenBrace = args.code.indexOf("{\n");
|
|
14
13
|
if (firstOpenBrace === -1) {
|
|
@@ -26,13 +25,13 @@ var hasFlake = async (folder) => {
|
|
|
26
25
|
return false;
|
|
27
26
|
}
|
|
28
27
|
};
|
|
29
|
-
for (const inputFolder of folders
|
|
28
|
+
for (const inputFolder of inputs.folders) {
|
|
30
29
|
const folder = await MaterializedFolder.open(inputFolder, flakeRepo.folder);
|
|
31
30
|
if (await hasFlake(folder)) {
|
|
32
31
|
codeParts.push(`inputs.${inputFolder.meta.name}.url = "path:./${folder.entity.meta.name}";`);
|
|
33
32
|
}
|
|
34
33
|
}
|
|
35
|
-
for (const inputFile of files ?? []) {
|
|
34
|
+
for (const inputFile of inputs.files ?? []) {
|
|
36
35
|
await MaterializedFile.open(inputFile, flakeRepo.folder);
|
|
37
36
|
}
|
|
38
37
|
codeParts.push("", args.code.slice(firstOpenBrace + 1).trim(), "");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/inline-flake/index.ts"],"names":[],"mappings":";;;;;;;;;AAQA,IAAM,EAAE,MAAM,IAAA,EAAM,MAAA,EAAQ,SAAQ,GAAI,OAAA,CAAQ,MAAM,WAAW,CAAA;AAEjE,IAAM,
|
|
1
|
+
{"version":3,"sources":["../../src/inline-flake/index.ts"],"names":[],"mappings":";;;;;;;;;AAQA,IAAM,EAAE,MAAM,IAAA,EAAM,MAAA,EAAQ,SAAQ,GAAI,OAAA,CAAQ,MAAM,WAAW,CAAA;AAEjE,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,OAAO,OAAA,EAAS;AACxC,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,KAAA,MAAW,SAAA,IAAa,MAAA,CAAO,KAAA,IAAS,EAAC,EAAG;AAC1C,EAAA,MAAM,gBAAA,CAAiB,IAAA,CAAK,SAAA,EAAW,SAAA,CAAU,MAAM,CAAA;AACzD;AAEA,SAAA,CAAU,IAAA,CAAK,EAAA,EAAI,IAAA,CAAK,IAAA,CAAK,KAAA,CAAM,iBAAiB,CAAC,CAAA,CAAE,IAAA,EAAK,EAAG,EAAE,CAAA;AACjE,IAAM,aAAA,GAAgB,SAAA,CAAU,IAAA,CAAK,IAAI,CAAA;AAEzC,MAAM,UAAU,IAAA,CAAK,SAAA,CAAU,IAAA,EAAM,WAAW,GAAG,aAAa,CAAA;AAChE,MAAM,SAAA,CAAU,GAAA,CAAI,GAAA,CAAI,GAAG,CAAA;AAG3B,MAAM,IAAI,QAAQ,cAAA,EAAgB;AAAA,EAChC,IAAA,EAAM,OAAA;AAAA,EACN,MAAA,EAAQ,CAAA,sDAAA,CAAA;AAAA,EACR,KAAK,SAAA,CAAU;AACjB,CAAC,EAAE,IAAA,EAAK;AAER,IAAM,aAAA,GAAgB,MAAM,QAAA,CAAS,IAAA,CAAK,UAAU,IAAA,EAAM,WAAW,GAAG,OAAO,CAAA;AAG/E,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,IAAM,WAAA,GAAc,MAAM,QAAA,CAAS,IAAA,CAAK,UAAU,IAAA,EAAM,YAAY,GAAG,OAAO,CAAA;AAE9E,IAAO,uBAAQ,OAAA,CAAQ;AAAA,EACrB,MAAA,EAAQ,UAAU,IAAA,EAAK;AAAA,EAEvB,MAAA,EAAQ;AAAA,IACN,KAAA,EAAO;AAAA,MACL,IAAA,EAAM;AAAA,QACJ,KAAA,EAAO,qBAAA;AAAA,QACP,WAAA,EAAa,+DAAA;AAAA,QACb,IAAA,EAAM;AAAA,OACR;AAAA,MACA,OAAA,EAAS;AAAA,QACP;AAAA,UACE,IAAA,EAAM,UAAA;AAAA,UACN,OAAA,EAAS,IAAA;AAAA;;AAAA;AAAA,YAAA,EAIL,aAAa;AAAA;AAAA,UAAA;AAAA,SAGnB;AAAA,QACA;AAAA,UACE,IAAA,EAAM,UAAA;AAAA,UACN,OAAA,EAAS,IAAA;AAAA;;AAAA;AAAA,YAAA,EAIL,WAAW;AAAA;AAAA,UAAA;AAAA;AAGjB;AACF;AACF;AAEJ,CAAC","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 } from \"@highstate/pulumi\"\n\nconst { name, args, inputs, outputs } = forUnit(nixos.inlineFlake)\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 inputs.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 inputs.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,32 +1,39 @@
|
|
|
1
|
-
import { nixos } from '@highstate/library';
|
|
2
|
-
import { forUnit,
|
|
1
|
+
import { nixos, common } from '@highstate/library';
|
|
2
|
+
import { forUnit, makeEntityOutput, makeFile } from '@highstate/pulumi';
|
|
3
3
|
|
|
4
4
|
// src/inline-module/index.ts
|
|
5
|
-
var {
|
|
5
|
+
var {
|
|
6
|
+
name,
|
|
7
|
+
stateId,
|
|
8
|
+
args,
|
|
9
|
+
inputs: { files, folders },
|
|
10
|
+
outputs
|
|
11
|
+
} = forUnit(nixos.inlineModule);
|
|
6
12
|
var moduleName = args.moduleName ?? name;
|
|
7
|
-
var { files, folders } = await toPromise(inputs);
|
|
8
13
|
var inline_module_default = outputs({
|
|
9
|
-
folder: {
|
|
14
|
+
folder: makeEntityOutput({
|
|
15
|
+
entity: common.folderEntity,
|
|
16
|
+
identity: stateId,
|
|
10
17
|
meta: {
|
|
11
|
-
|
|
18
|
+
title: moduleName
|
|
12
19
|
},
|
|
13
|
-
|
|
14
|
-
|
|
20
|
+
value: {
|
|
21
|
+
meta: {
|
|
22
|
+
name: moduleName
|
|
23
|
+
},
|
|
24
|
+
content: {
|
|
25
|
+
type: "embedded"
|
|
26
|
+
},
|
|
15
27
|
files: [
|
|
16
|
-
...files
|
|
17
|
-
{
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
content: {
|
|
22
|
-
type: "embedded",
|
|
23
|
-
value: args.code
|
|
24
|
-
}
|
|
25
|
-
}
|
|
28
|
+
...files,
|
|
29
|
+
makeFile({
|
|
30
|
+
name: "default.nix",
|
|
31
|
+
content: args.code
|
|
32
|
+
})
|
|
26
33
|
],
|
|
27
|
-
folders
|
|
34
|
+
folders
|
|
28
35
|
}
|
|
29
|
-
}
|
|
36
|
+
})
|
|
30
37
|
});
|
|
31
38
|
|
|
32
39
|
export { inline_module_default as default };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/inline-module/index.ts"],"names":[],"mappings":";;;;AAGA,IAAM,
|
|
1
|
+
{"version":3,"sources":["../../src/inline-module/index.ts"],"names":[],"mappings":";;;;AAGA,IAAM;AAAA,EACJ,IAAA;AAAA,EACA,OAAA;AAAA,EACA,IAAA;AAAA,EACA,MAAA,EAAQ,EAAE,KAAA,EAAO,OAAA,EAAQ;AAAA,EACzB;AACF,CAAA,GAAI,OAAA,CAAQ,MAAM,YAAY,CAAA;AAE9B,IAAM,UAAA,GAAa,KAAK,UAAA,IAAc,IAAA;AAEtC,IAAO,wBAAQ,OAAA,CAAQ;AAAA,EACrB,QAAQ,gBAAA,CAAiB;AAAA,IACvB,QAAQ,MAAA,CAAO,YAAA;AAAA,IACf,QAAA,EAAU,OAAA;AAAA,IACV,IAAA,EAAM;AAAA,MACJ,KAAA,EAAO;AAAA,KACT;AAAA,IACA,KAAA,EAAO;AAAA,MACL,IAAA,EAAM;AAAA,QACJ,IAAA,EAAM;AAAA,OACR;AAAA,MACA,OAAA,EAAS;AAAA,QACP,IAAA,EAAM;AAAA,OACR;AAAA,MACA,KAAA,EAAO;AAAA,QACL,GAAG,KAAA;AAAA,QACH,QAAA,CAAS;AAAA,UACP,IAAA,EAAM,aAAA;AAAA,UACN,SAAS,IAAA,CAAK;AAAA,SACf;AAAA,OACH;AAAA,MACA;AAAA;AACF,GACD;AACH,CAAC","file":"index.js","sourcesContent":["import { common, nixos } from \"@highstate/library\"\nimport { forUnit, makeEntityOutput, makeFile } from \"@highstate/pulumi\"\n\nconst {\n name,\n stateId,\n args,\n inputs: { files, folders },\n outputs,\n} = forUnit(nixos.inlineModule)\n\nconst moduleName = args.moduleName ?? name\n\nexport default outputs({\n folder: makeEntityOutput({\n entity: common.folderEntity,\n identity: stateId,\n meta: {\n title: moduleName,\n },\n value: {\n meta: {\n name: moduleName,\n },\n content: {\n type: \"embedded\",\n },\n files: [\n ...files,\n makeFile({\n name: \"default.nix\",\n content: args.code,\n }),\n ],\n folders,\n },\n }),\n})\n"]}
|
package/dist/system/index.js
CHANGED
|
@@ -11,11 +11,15 @@ if (!server.ssh) {
|
|
|
11
11
|
}
|
|
12
12
|
var repo = await MaterializedRepository.open(flake);
|
|
13
13
|
await repo.git.add(".");
|
|
14
|
-
|
|
15
|
-
"private
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
14
|
+
if (!server.ssh.keyPair?.privateKey) {
|
|
15
|
+
throw new Error("Server must have an SSH private key");
|
|
16
|
+
}
|
|
17
|
+
var privateKey = await MaterializedFile.create({
|
|
18
|
+
name: "private-key",
|
|
19
|
+
content: server.ssh.keyPair.privateKey.value,
|
|
20
|
+
isSecret: true,
|
|
21
|
+
mode: 384
|
|
22
|
+
});
|
|
19
23
|
var hostKey = await MaterializedFile.open(createSshHostKeyFile(server));
|
|
20
24
|
var system = args.system ?? server.hostname;
|
|
21
25
|
await new Command("system", {
|
package/dist/system/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/system/index.ts"],"names":[],"mappings":";;;;;;AAWA,IAAM,EAAE,IAAA,EAAM,MAAA,EAAQ,SAAQ,GAAI,OAAA,CAAQ,MAAM,MAAM,CAAA;AAEtD,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,
|
|
1
|
+
{"version":3,"sources":["../../src/system/index.ts"],"names":[],"mappings":";;;;;;AAWA,IAAM,EAAE,IAAA,EAAM,MAAA,EAAQ,SAAQ,GAAI,OAAA,CAAQ,MAAM,MAAM,CAAA;AAEtD,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,IAAI,CAAC,MAAA,CAAO,GAAA,CAAI,OAAA,EAAS,UAAA,EAAY;AACnC,EAAA,MAAM,IAAI,MAAM,qCAAqC,CAAA;AACvD;AAEA,IAAM,UAAA,GAAa,MAAM,gBAAA,CAAiB,MAAA,CAAO;AAAA,EAC/C,IAAA,EAAM,aAAA;AAAA,EACN,OAAA,EAAS,MAAA,CAAO,GAAA,CAAI,OAAA,CAAQ,UAAA,CAAW,KAAA;AAAA,EACvC,QAAA,EAAU,IAAA;AAAA,EACV,IAAA,EAAM;AACR,CAAC,CAAA;AAED,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,QAAA,EAAU;AAAA,EAC1B,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 { 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\nif (!server.ssh.keyPair?.privateKey) {\n throw new Error(\"Server must have an SSH private key\")\n}\n\nconst privateKey = await MaterializedFile.create({\n name: \"private-key\",\n content: server.ssh.keyPair.privateKey.value,\n isSecret: true,\n mode: 0o600,\n})\n\nconst hostKey = await MaterializedFile.open(createSshHostKeyFile(server))\n\nconst system = args.system ?? server.hostname\n\nawait new Command(\"system\", {\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.
|
|
3
|
+
"version": "0.20.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist"
|
|
@@ -20,18 +20,18 @@
|
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@pulumi/kubernetes": "^4.18.0",
|
|
23
|
-
"@pulumi/pulumi": "3.
|
|
23
|
+
"@pulumi/pulumi": "3.220.0",
|
|
24
24
|
"remeda": "^2.21.3",
|
|
25
|
-
"@highstate/common": "0.
|
|
26
|
-
"@highstate/contract": "0.
|
|
27
|
-
"@highstate/git": "0.
|
|
28
|
-
"@highstate/
|
|
29
|
-
"@highstate/
|
|
25
|
+
"@highstate/common": "0.20.0",
|
|
26
|
+
"@highstate/contract": "0.20.0",
|
|
27
|
+
"@highstate/git": "0.20.0",
|
|
28
|
+
"@highstate/pulumi": "0.20.0",
|
|
29
|
+
"@highstate/library": "0.20.0"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@biomejs/biome": "2.2.0",
|
|
33
33
|
"@typescript/native-preview": "^7.0.0-dev.20250920.1",
|
|
34
|
-
"@highstate/cli": "0.
|
|
34
|
+
"@highstate/cli": "0.20.0"
|
|
35
35
|
},
|
|
36
36
|
"repository": {
|
|
37
37
|
"url": "https://github.com/highstate-io/highstate"
|