Everything works except api-lyte-dev
This commit is contained in:
parent
4c030b37f0
commit
34a538489a
3 changed files with 27 additions and 114 deletions
100
flake.lock
100
flake.lock
|
@ -2,18 +2,16 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"api-lyte-dev": {
|
"api-lyte-dev": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"lexical": "lexical",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699311919,
|
"lastModified": 1708463499,
|
||||||
"narHash": "sha256-TvctRO/lO+lvjN6LbxJaj+jizFK+PoZqC1ZAYY2+GTo=",
|
"narHash": "sha256-GvqU+Z3cZkgMXf41vfMELLKPk+EVUl1UMW56Gz5ccrU=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "5096ec7e3a7f9ba4ea661d089e6b0fc4f7ab2992",
|
"rev": "e3f0cae4f75101706bc8b9a822f7d90b03a91702",
|
||||||
"revCount": 78,
|
"revCount": 80,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git"
|
"url": "ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git"
|
||||||
},
|
},
|
||||||
|
@ -68,42 +66,6 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
|
||||||
"lastModified": 1689068808,
|
|
||||||
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_2": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_2"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1692799911,
|
|
||||||
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_3": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_3"
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694529238,
|
"lastModified": 1694529238,
|
||||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
||||||
|
@ -136,7 +98,7 @@
|
||||||
"helix": {
|
"helix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"crane": "crane",
|
"crane": "crane",
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
|
@ -176,28 +138,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lexical": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils_2",
|
|
||||||
"nixpkgs": [
|
|
||||||
"api-lyte-dev",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1699016103,
|
|
||||||
"narHash": "sha256-8uMDgg/YnyaSn8IvlG14PVSCHQl6ZHdgB8CWNDnYd5s=",
|
|
||||||
"owner": "lexical-lsp",
|
|
||||||
"repo": "lexical",
|
|
||||||
"rev": "059bbbe516a4dff66bc3febc953ac2eddabc78a4",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "lexical-lsp",
|
|
||||||
"repo": "lexical",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700794826,
|
"lastModified": 1700794826,
|
||||||
|
@ -341,36 +281,6 @@
|
||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"systems_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
home-manager,
|
home-manager,
|
||||||
|
api-lyte-dev,
|
||||||
...
|
...
|
||||||
} @ inputs: let
|
} @ inputs: let
|
||||||
inherit (self) outputs;
|
inherit (self) outputs;
|
||||||
|
@ -87,7 +88,7 @@
|
||||||
nixpkgs.lib.nixosSystem {
|
nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit inputs outputs system;
|
inherit inputs outputs system api-lyte-dev;
|
||||||
};
|
};
|
||||||
modules =
|
modules =
|
||||||
[
|
[
|
||||||
|
|
|
@ -8,8 +8,9 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x01 0x00
|
||||||
sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
|
sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
|
||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
inputs,
|
# inputs,
|
||||||
# outputs,
|
# outputs,
|
||||||
|
# api-lyte-dev,
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
|
@ -22,7 +23,8 @@ in {
|
||||||
../modules/nixos/fonts.nix
|
../modules/nixos/fonts.nix
|
||||||
]
|
]
|
||||||
++ [
|
++ [
|
||||||
inputs.api-lyte-dev.nixosModules.${system}.api-lyte-dev
|
# api-lyte-dev.nixosModules.api-lyte-dev
|
||||||
|
|
||||||
# inputs.nix-minecraft.nixosModules.minecraft-servers
|
# inputs.nix-minecraft.nixosModules.minecraft-servers
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -60,16 +62,16 @@ in {
|
||||||
secretKeyFile = "/var/cache-priv-key.pem";
|
secretKeyFile = "/var/cache-priv-key.pem";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.api-lyte-dev = rec {
|
# services.api-lyte-dev = rec {
|
||||||
enable = true;
|
# enable = true;
|
||||||
port = 5757;
|
# port = 5757;
|
||||||
stateDir = "/var/lib/api-lyte-dev";
|
# stateDir = "/var/lib/api-lyte-dev";
|
||||||
configFile = config.sops.secrets."api.lyte.dev".path;
|
# configFile = config.sops.secrets."api.lyte.dev".path;
|
||||||
user = "api-lyte-dev";
|
# user = "api-lyte-dev";
|
||||||
group = user;
|
# group = user;
|
||||||
};
|
# };
|
||||||
|
|
||||||
systemd.services.api-lyte-dev.environment.LOG_LEVEL = "debug";
|
# systemd.services.api-lyte-dev.environment.LOG_LEVEL = "debug";
|
||||||
|
|
||||||
sops = {
|
sops = {
|
||||||
defaultSopsFile = ../secrets/beefcake/secrets.yml;
|
defaultSopsFile = ../secrets/beefcake/secrets.yml;
|
||||||
|
@ -105,8 +107,8 @@ in {
|
||||||
# path = "${config.services.api-lyte-dev.stateDir}/secrets.json";
|
# path = "${config.services.api-lyte-dev.stateDir}/secrets.json";
|
||||||
# TODO: would be cool to assert that it's correctly-formatted JSON? probably should be done in a pre-commit hook?
|
# TODO: would be cool to assert that it's correctly-formatted JSON? probably should be done in a pre-commit hook?
|
||||||
mode = "0440";
|
mode = "0440";
|
||||||
owner = config.services.api-lyte-dev.user;
|
# owner = config.services.api-lyte-dev.user;
|
||||||
group = config.services.api-lyte-dev.group;
|
# group = config.services.api-lyte-dev.group;
|
||||||
};
|
};
|
||||||
|
|
||||||
"jland.env" = {
|
"jland.env" = {
|
||||||
|
@ -133,8 +135,8 @@ in {
|
||||||
nextcloud-admin-password = {
|
nextcloud-admin-password = {
|
||||||
path = "/var/lib/nextcloud/admin-password";
|
path = "/var/lib/nextcloud/admin-password";
|
||||||
mode = "0440";
|
mode = "0440";
|
||||||
owner = config.services.nextcloud.serviceConfig.User;
|
# owner = config.services.nextcloud.serviceConfig.User;
|
||||||
group = config.services.nextcloud.serviceConfig.Group;
|
# group = config.services.nextcloud.serviceConfig.Group;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -313,9 +315,9 @@ in {
|
||||||
reverse_proxy :${toString config.services.vaultwarden.config.ROCKET_PORT}
|
reverse_proxy :${toString config.services.vaultwarden.config.ROCKET_PORT}
|
||||||
}
|
}
|
||||||
|
|
||||||
api.lyte.dev {
|
# api.lyte.dev {
|
||||||
reverse_proxy :${toString config.services.api-lyte-dev.port}
|
# reverse_proxy :$${toString config.services.api-lyte-dev.port}
|
||||||
}
|
# }
|
||||||
|
|
||||||
a.lyte.dev {
|
a.lyte.dev {
|
||||||
reverse_proxy :${toString config.services.plausible.server.port}
|
reverse_proxy :${toString config.services.plausible.server.port}
|
||||||
|
|
Loading…
Reference in a new issue