···
inherit (gitignore.lib) gitignoreSource;
overlays.default = final: prev: let
52
-
goModHash = "sha256-H/sKps9um8vvv/WAZ1hEN+ZVhmXlddRNSVWVRBK1zEo=";
53
-
buildCmdPackage = name:
54
-
final.buildGoModule {
57
-
src = gitignoreSource ./.;
58
-
subPackages = ["cmd/${name}"];
59
-
vendorHash = goModHash;
60
-
env.CGO_ENABLED = 0;
52
+
goModHash = "sha256-H2gBkkuJaZtHlvW33aWZu0pS9vsS/A2ojeEUbp6o7Go=";
indigo-lexgen = final.buildGoModule {
···
stdenv = pkgsStatic.stdenv;
95
-
knotserver = with final;
final.pkgsStatic.buildGoModule {
97
-
pname = "knotserver";
src = gitignoreSource ./.;
nativeBuildInputs = [final.makeWrapper];
101
-
subPackages = ["cmd/knotserver"];
92
+
subPackages = ["cmd/knot"];
107
-
cp $GOPATH/bin/knotserver $out/bin/knotserver
98
+
cp $GOPATH/bin/knot $out/bin/knot
109
-
wrapProgram $out/bin/knotserver \
100
+
wrapProgram $out/bin/knot \
--prefix PATH : ${pkgs.git}/bin
116
-
knotserver-unwrapped = final.pkgsStatic.buildGoModule {
117
-
pname = "knotserver";
107
+
knot-unwrapped = final.pkgsStatic.buildGoModule {
src = gitignoreSource ./.;
120
-
subPackages = ["cmd/knotserver"];
111
+
subPackages = ["cmd/knot"];
124
-
repoguard = buildCmdPackage "repoguard";
125
-
keyfetch = buildCmdPackage "keyfetch";
126
-
genjwks = buildCmdPackage "genjwks";
115
+
genjwks = final.pkgsStatic.buildGoModule {
118
+
src = gitignoreSource ./.;
119
+
subPackages = ["cmd/genjwks"];
120
+
vendorHash = goModHash;
121
+
env.CGO_ENABLED = 0;
packages = forAllSystems (system: {
134
-
knotserver-unwrapped
···
apps = forAllSystems (system: let
pkgs = nixpkgsFor."${system}";
175
-
air-watcher = name:
169
+
air-watcher = name: arg:
pkgs.writeShellScriptBin "run"
${pkgs.air}/bin/air -c /dev/null \
-build.cmd "${pkgs.go}/bin/go build -o ./out/${name}.out ./cmd/${name}/main.go" \
180
-
-build.bin "./out/${name}.out" \
174
+
-build.bin "./out/${name}.out ${arg}" \
-build.stop_on_error "true" \
···
192
-
program = ''${air-watcher "appview"}/bin/run'';
186
+
program = ''${air-watcher "appview" ""}/bin/run'';
194
-
watch-knotserver = {
196
-
program = ''${air-watcher "knotserver"}/bin/run'';
190
+
program = ''${air-watcher "knot" "server"}/bin/run'';
···
250
-
nixosModules.knotserver = {
244
+
nixosModules.knot = {
256
-
cfg = config.services.tangled-knotserver;
250
+
cfg = config.services.tangled-knot;
260
-
services.tangled-knotserver = {
254
+
services.tangled-knot = {
264
-
description = "Enable a tangled knotserver";
258
+
description = "Enable a tangled knot";
appviewEndpoint = mkOption {
···
386
-
${self.packages.${pkgs.system}.keyfetch}/bin/keyfetch \
387
-
-repoguard-path ${self.packages.${pkgs.system}.repoguard}/bin/repoguard \
380
+
${self.packages.${pkgs.system}.knot}/bin/knot keys \
381
+
-output authorized-keys \
-internal-api "http://${cfg.server.internalListenAddr}" \
-git-dir "${cfg.repo.scanPath}" \
390
-
-log-path /tmp/repoguard.log
384
+
-log-path /tmp/knotguard.log
394
-
systemd.services.knotserver = {
395
-
description = "knotserver service";
388
+
systemd.services.knot = {
389
+
description = "knot service";
after = ["network.target" "sshd.service"];
wantedBy = ["multi-user.target"];
···
"KNOT_SERVER_HOSTNAME=${cfg.server.hostname}"
EnvironmentFile = cfg.server.secretFile;
411
-
ExecStart = "${self.packages.${pkgs.system}.knotserver}/bin/knotserver";
405
+
ExecStart = "${self.packages.${pkgs.system}.knot}/bin/knot server";
···
nixosConfigurations.knotVM = nixpkgs.lib.nixosSystem {
423
-
self.nixosModules.knotserver
417
+
self.nixosModules.knot
···
services.getty.autologinUser = "root";
environment.systemPackages = with pkgs; [curl vim git];
systemd.tmpfiles.rules = let
435
-
u = config.services.tangled-knotserver.gitUser;
436
-
g = config.services.tangled-knotserver.gitUser;
429
+
u = config.services.tangled-knot.gitUser;
430
+
g = config.services.tangled-knot.gitUser;
438
-
"d /var/lib/knotserver 0770 ${u} ${g} - -" # Create the directory first
439
-
"f+ /var/lib/knotserver/secret 0660 ${u} ${g} - KNOT_SERVER_SECRET=38a7c3237c2a585807e06a5bcfac92eb39442063f3da306b7acb15cfdc51d19d"
432
+
"d /var/lib/knot 0770 ${u} ${g} - -" # Create the directory first
433
+
"f+ /var/lib/knot/secret 0660 ${u} ${g} - KNOT_SERVER_SECRET=38a7c3237c2a585807e06a5bcfac92eb39442063f3da306b7acb15cfdc51d19d"
441
-
services.tangled-knotserver = {
435
+
services.tangled-knot = {
444
-
secretFile = "/var/lib/knotserver/secret";
438
+
secretFile = "/var/lib/knot/secret";
hostname = "localhost:6000";
listenAddr = "0.0.0.0:6000";
veryroundbird.house
oppi.li