My Nix Configuration

[hosts.marvin] fix eval errors

Changed files
+29 -25
hosts
marvin
services
zaphod
+27 -23
hosts/marvin/services/tangled.nix
···
...
}:
let
-
cfg = config.services.tangled-knot;
dk = self.lib.data.services.tangled-knot;
ds = self.lib.data.services.tangled-spindle;
in
{
services = {
-
tangled-knot = {
-
enable = true;
-
gitUser = "git";
-
stateDir = "/var/lib/tangled-knot";
-
repo.scanPath = "${cfg.stateDir}/repos";
-
server = {
-
listenAddr = "0.0.0.0:${toString dk.port}";
-
hostname = dk.extUrl;
-
internalListenAddr = "127.0.0.1:${toString dk.intListenPort}";
-
owner = "did:plc:5cqzysioqzttihsnbsaxrggu";
};
-
};
-
tangled-spindle = {
-
enable = true;
-
server = {
-
listenAddr = "0.0.0.0:${toString ds.port}";
-
hostname = ds.extUrl;
-
owner = "did:plc:5cqzysioqzttihsnbsaxrggu";
};
-
pipelines.workflowTimeout = "10m";
};
-
openssh.enable = lib.mkForce cfg.enable;
-
openssh.ports = [ 2222 ];
-
openssh.settings.AllowUsers = [ "git" ];
-
openssh.settings.AllowGroups = [ "git" ];
};
}
···
...
}:
let
+
cfg = config.services.tangled.knot;
dk = self.lib.data.services.tangled-knot;
ds = self.lib.data.services.tangled-spindle;
in
{
services = {
+
tangled = {
+
knot = {
+
enable = true;
+
gitUser = "git";
+
stateDir = "/var/lib/tangled-knot";
+
repo.scanPath = "${cfg.stateDir}/repos";
+
server = {
+
listenAddr = "0.0.0.0:${toString dk.port}";
+
hostname = dk.extUrl;
+
internalListenAddr = "127.0.0.1:${toString dk.intListenPort}";
+
owner = "did:plc:5cqzysioqzttihsnbsaxrggu";
+
};
};
+
spindle = {
+
enable = true;
+
server = {
+
listenAddr = "0.0.0.0:${toString ds.port}";
+
hostname = ds.extUrl;
+
owner = "did:plc:5cqzysioqzttihsnbsaxrggu";
+
};
+
pipelines.workflowTimeout = "10m";
};
};
+
openssh = {
+
enable = lib.mkForce cfg.enable;
+
ports = [ 2222 ];
+
settings.AllowUsers = [ "git" ];
+
settings.AllowGroups = [ "git" ];
+
};
};
}
+2 -2
hosts/zaphod/packages.nix
···
{
pkgs,
-
inputs,
...
}:
{
environment.systemPackages = [
-
inputs.agenix.packages.${pkgs.system}.default
pkgs.deadnix
pkgs.file
pkgs.gamescope
···
{
pkgs,
+
inputs',
...
}:
{
environment.systemPackages = [
+
inputs'.agenix.packages.default
pkgs.deadnix
pkgs.file
pkgs.gamescope