Skip to content

Commit d13782e

Browse files
committed
chore: switch nixpkgs to nixos-unstable, treefmt
also adds some common excludes to treefmt
1 parent 03ad54b commit d13782e

File tree

14 files changed

+320
-216
lines changed

14 files changed

+320
-216
lines changed

.devcontainer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"image": "std-vscode",
3-
"settings": {
4-
"terminal.integrated.shell.linux": "/bin/bash"
5-
}
6-
}
2+
"image": "std-vscode",
3+
"settings": {
4+
"terminal.integrated.shell.linux": "/bin/bash"
5+
}
6+
}

.github/workflows/update-subflake.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ nix store add-path --name source .
33

44
# update the subflake lockfile to the (now existing) store path
55
(cd ./src/local && nix flake lock --update-input std && git add -f flake.lock)
6+
(cd ./src/mdbook && nix flake lock --update-input std && git add -f flake.lock)
67
(cd ./src/tests && nix flake lock --update-input std && git add -f flake.lock)
78
# continue normally ...

docs/theme/highlight.js

+44-44
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ var hljs = (function () {
8181
? e
8282
: n
8383
: "start" === n[0].event
84-
? e
85-
: n
84+
? e
85+
: n
8686
: e.length
87-
? e
88-
: n;
87+
? e
88+
: n;
8989
}
9090
function c(e) {
9191
s +=
@@ -281,7 +281,7 @@ var hljs = (function () {
281281
0 !== e.index && n.ignoreMatch();
282282
},
283283
},
284-
e
284+
e,
285285
)
286286
);
287287
},
@@ -348,10 +348,10 @@ var hljs = (function () {
348348
return n
349349
? +n
350350
: (function (e) {
351-
return N.includes(e.toLowerCase());
352-
})(e)
353-
? 0
354-
: 1;
351+
return N.includes(e.toLowerCase());
352+
})(e)
353+
? 0
354+
: 1;
355355
}
356356
const R = t,
357357
y = r,
@@ -464,7 +464,7 @@ var hljs = (function () {
464464
r.endSameAsBegin &&
465465
(r.endRe = RegExp(
466466
t.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&"),
467-
"m"
467+
"m",
468468
)),
469469
r.skip
470470
? (A += t)
@@ -481,7 +481,7 @@ var hljs = (function () {
481481
i +
482482
'" for mode "' +
483483
(y.className || "<unnamed>") +
484-
'"'
484+
'"',
485485
);
486486
throw ((e.mode = y), e);
487487
}
@@ -529,7 +529,7 @@ var hljs = (function () {
529529
if ("illegal" === r.type && "" === i) return 1;
530530
if (B > 1e5 && B > 3 * r.index)
531531
throw Error(
532-
"potential infinite loop, way more iterations than matches"
532+
"potential infinite loop, way more iterations than matches",
533533
);
534534
return (A += i), i.length;
535535
}
@@ -543,7 +543,7 @@ var hljs = (function () {
543543
function n(n, t) {
544544
return RegExp(
545545
d(n),
546-
"m" + (e.case_insensitive ? "i" : "") + (t ? "g" : "")
546+
"m" + (e.case_insensitive ? "i" : "") + (t ? "g" : ""),
547547
);
548548
}
549549
class t {
@@ -593,7 +593,7 @@ var hljs = (function () {
593593
}
594594
return a;
595595
})(e),
596-
!0
596+
!0,
597597
)),
598598
(this.lastIndex = 0);
599599
}
@@ -649,7 +649,7 @@ var hljs = (function () {
649649
}
650650
if (e.contains && e.contains.includes("self"))
651651
throw Error(
652-
"ERR: contains `self` is not supported at the top-level of a language. See documentation."
652+
"ERR: contains `self` is not supported at the top-level of a language. See documentation.",
653653
);
654654
return (function t(s, o) {
655655
const l = s;
@@ -683,7 +683,7 @@ var hljs = (function () {
683683
s.lexemes && c)
684684
)
685685
throw Error(
686-
"ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) "
686+
"ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ",
687687
);
688688
return (
689689
(l.keywordPatternRe = n(s.lexemes || c || /\w+/, !0)),
@@ -718,15 +718,15 @@ var hljs = (function () {
718718
e.cached_variants
719719
? e.cached_variants
720720
: (function e(n) {
721-
return !!n && (n.endsWithParent || e(n.starts));
722-
})(e)
723-
? r(e, { starts: e.starts ? r(e.starts) : null })
724-
: Object.isFrozen(e)
725-
? r(e)
726-
: e
721+
return !!n && (n.endsWithParent || e(n.starts));
722+
})(e)
723+
? r(e, { starts: e.starts ? r(e.starts) : null })
724+
: Object.isFrozen(e)
725+
? r(e)
726+
: e
727727
);
728728
})("self" === e ? s : e);
729-
})
729+
}),
730730
)),
731731
s.contains.forEach(function (e) {
732732
t(e, l);
@@ -736,7 +736,7 @@ var hljs = (function () {
736736
const n = new a();
737737
return (
738738
e.contains.forEach((e) =>
739-
n.addRule(e.begin, { rule: e, type: "begin" })
739+
n.addRule(e.begin, { rule: e, type: "begin" }),
740740
),
741741
e.terminator_end &&
742742
n.addRule(e.terminator_end, { type: "end" }),
@@ -847,8 +847,8 @@ var hljs = (function () {
847847
? "<br>"
848848
: e
849849
: f.tabReplace
850-
? e.replace(/\t/g, f.tabReplace)
851-
: e
850+
? e.replace(/\t/g, f.tabReplace)
851+
: e,
852852
)
853853
: e;
854854
}
@@ -865,7 +865,7 @@ var hljs = (function () {
865865
(console.warn(g.replace("{}", t[1])),
866866
console.warn(
867867
"Falling back to no-highlight mode for this block.",
868-
e
868+
e,
869869
)),
870870
r ? t[1] : "no-highlight"
871871
);
@@ -957,8 +957,8 @@ var hljs = (function () {
957957
(console.error(
958958
"Language definition for '{}' could not be registered.".replace(
959959
"{}",
960-
e
961-
)
960+
e,
961+
),
962962
),
963963
!l)
964964
)
@@ -979,7 +979,7 @@ var hljs = (function () {
979979
var n = T(e);
980980
if (n) return n;
981981
throw Error(
982-
"The '{}' language is required, but not loaded.".replace("{}", e)
982+
"The '{}' language is required, but not loaded.".replace("{}", e),
983983
);
984984
},
985985
autoDetection: I,
@@ -1127,7 +1127,7 @@ hljs.registerLanguage(
11271127
],
11281128
};
11291129
};
1130-
})()
1130+
})(),
11311131
);
11321132
hljs.registerLanguage(
11331133
"markdown",
@@ -1252,7 +1252,7 @@ hljs.registerLanguage(
12521252
}
12531253
);
12541254
};
1255-
})()
1255+
})(),
12561256
);
12571257
hljs.registerLanguage(
12581258
"perl",
@@ -1347,7 +1347,7 @@ hljs.registerLanguage(
13471347
{ name: "Perl", aliases: ["pl", "pm"], keywords: n, contains: a }
13481348
);
13491349
};
1350-
})()
1350+
})(),
13511351
);
13521352
hljs.registerLanguage(
13531353
"plaintext",
@@ -1360,7 +1360,7 @@ hljs.registerLanguage(
13601360
disableAutodetect: !0,
13611361
};
13621362
};
1363-
})()
1363+
})(),
13641364
);
13651365
hljs.registerLanguage(
13661366
"ini",
@@ -1427,15 +1427,15 @@ hljs.registerLanguage(
14271427
"(\\s*\\.\\s*",
14281428
g,
14291429
")*",
1430-
n("(?=", /\s*=\s*[^#\s]/, ")")
1430+
n("(?=", /\s*=\s*[^#\s]/, ")"),
14311431
),
14321432
className: "attr",
14331433
starts: { end: /$/, contains: [i, c, r, t, l, s] },
14341434
},
14351435
],
14361436
};
14371437
};
1438-
})()
1438+
})(),
14391439
);
14401440
hljs.registerLanguage(
14411441
"json",
@@ -1481,7 +1481,7 @@ hljs.registerLanguage(
14811481
{ name: "JSON", contains: t, keywords: e, illegal: "\\S" }
14821482
);
14831483
};
1484-
})()
1484+
})(),
14851485
);
14861486
hljs.registerLanguage(
14871487
"ruby",
@@ -1626,7 +1626,7 @@ hljs.registerLanguage(
16261626
contains: r.concat(g).concat(d),
16271627
};
16281628
};
1629-
})()
1629+
})(),
16301630
);
16311631
hljs.registerLanguage(
16321632
"yaml",
@@ -1737,7 +1737,7 @@ hljs.registerLanguage(
17371737
}
17381738
);
17391739
};
1740-
})()
1740+
})(),
17411741
);
17421742
hljs.registerLanguage(
17431743
"haskell",
@@ -1837,7 +1837,7 @@ hljs.registerLanguage(
18371837
],
18381838
};
18391839
};
1840-
})()
1840+
})(),
18411841
);
18421842
hljs.registerLanguage(
18431843
"nix",
@@ -1876,7 +1876,7 @@ hljs.registerLanguage(
18761876
{ name: "Nix", aliases: ["nixos"], keywords: n, contains: s }
18771877
);
18781878
};
1879-
})()
1879+
})(),
18801880
);
18811881
hljs.registerLanguage(
18821882
"bash",
@@ -1953,7 +1953,7 @@ hljs.registerLanguage(
19531953
],
19541954
};
19551955
};
1956-
})()
1956+
})(),
19571957
);
19581958
hljs.registerLanguage(
19591959
"shell",
@@ -1972,7 +1972,7 @@ hljs.registerLanguage(
19721972
],
19731973
};
19741974
};
1975-
})()
1975+
})(),
19761976
);
19771977
hljs.registerLanguage(
19781978
"python",
@@ -2092,5 +2092,5 @@ hljs.registerLanguage(
20922092
}
20932093
);
20942094
};
2095-
})()
2095+
})(),
20962096
);

0 commit comments

Comments
 (0)