jonmro
/
pvv-nixos-config
forked from Drift/pvv-nixos-config
1
0
Fork 0
Code Pull Requests Activity

modules/grzegorz: use greg-ng

This commit is contained in:
Oystein Kristoffer Tveit 2024-10-19 23:29:54 +02:00
parent 47ed79986c
commit cbc3490882
Signed by untrusted user: oysteikt
GPG Key ID: 9F2F7D8250F35146
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.nix
View File

@ -23,8 +23,8 @@
nix-gitea-themes.url = "git+https://git.pvv.ntnu.no/oysteikt/nix-gitea-themes.git"; nix-gitea-themes.url = "git+https://git.pvv.ntnu.no/oysteikt/nix-gitea-themes.git";
nix-gitea-themes.inputs.nixpkgs.follows = "nixpkgs"; nix-gitea-themes.inputs.nixpkgs.follows = "nixpkgs";
grzegorz.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz.git"; greg-ng.url = "git+https://git.pvv.ntnu.no/Projects/greg-ng.git";
grzegorz.inputs.nixpkgs.follows = "nixpkgs"; greg-ng.inputs.nixpkgs.follows = "nixpkgs";
grzegorz-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients.git"; grzegorz-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients.git";
grzegorz-clients.inputs.nixpkgs.follows = "nixpkgs"; grzegorz-clients.inputs.nixpkgs.follows = "nixpkgs";
@ -116,14 +116,20 @@
brzeczyszczykiewicz = stableNixosConfig "brzeczyszczykiewicz" { brzeczyszczykiewicz = stableNixosConfig "brzeczyszczykiewicz" {
modules = [ modules = [
inputs.grzegorz.nixosModules.grzegorz-kiosk
inputs.grzegorz-clients.nixosModules.grzegorz-webui inputs.grzegorz-clients.nixosModules.grzegorz-webui
inputs.greg-ng.nixosModules.default
];
overlays = [
inputs.greg-ng.overlays.default
]; ];
}; };
georg = stableNixosConfig "georg" { georg = stableNixosConfig "georg" {
modules = [ modules = [
inputs.grzegorz.nixosModules.grzegorz-kiosk
inputs.grzegorz-clients.nixosModules.grzegorz-webui inputs.grzegorz-clients.nixosModules.grzegorz-webui
inputs.greg-ng.nixosModules.default
];
overlays = [
inputs.greg-ng.overlays.default
]; ];
}; };
}; };

44
modules/grzegorz.nix
View File

@ -1,31 +1,26 @@
{config, lib, pkgs, ...}: {config, lib, pkgs, ...}:
let let
grg = config.services.grzegorz; grg = config.services.greg-ng;
grgw = config.services.grzegorz-webui; grgw = config.services.grzegorz-webui;
in { in {
services.pipewire.enable = true; services.greg-ng = {
services.pipewire.alsa.enable = true; enable = true;
services.pipewire.alsa.support32Bit = true; settings.host = "localhost";
services.pipewire.pulse.enable = true; settings.port = 31337;
enableSway = true;
users.users.pvv = { enablePipewire = true;
isNormalUser = true;
description = "pvv";
}; };
services.grzegorz.enable = true; services.grzegorz-webui = {
services.grzegorz.listenAddr = "localhost"; enable = true;
services.grzegorz.listenPort = 31337; listenAddr = "localhost";
listenPort = 42069;
services.grzegorz-webui.enable = true; listenWebsocketPort = 42042;
services.grzegorz-webui.listenAddr = "localhost"; hostName = "${config.networking.fqdn}";
services.grzegorz-webui.listenPort = 42069; apiBase = "http://${grg.settings.host}:${toString grg.settings.port}/api";
services.grzegorz-webui.listenWebsocketPort = 42042; };
services.grzegorz-webui.hostName = "${config.networking.fqdn}";
services.grzegorz-webui.apiBase = "http://${toString grg.listenAddr}:${toString grg.listenPort}/api";
services.nginx.enable = true; services.nginx.enable = true;
services.nginx.virtualHosts."${config.networking.fqdn}" = { services.nginx.virtualHosts."${config.networking.fqdn}" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
@ -40,20 +35,19 @@ in {
''; '';
locations."/" = { locations."/" = {
proxyPass = "http://localhost:${builtins.toString config.services.grzegorz-webui.listenPort}"; proxyPass = "http://${grgw.listenAddr}:${toString grgw.listenPort}";
}; };
# https://github.com/rawpython/remi/issues/216 # https://github.com/rawpython/remi/issues/216
locations."/websocket" = { locations."/websocket" = {
proxyPass = "http://localhost:${builtins.toString config.services.grzegorz-webui.listenWebsocketPort}"; proxyPass = "http://${grgw.listenAddr}:${toString grgw.listenWebsocketPort}";
proxyWebsockets = true; proxyWebsockets = true;
}; };
locations."/api" = { locations."/api" = {
proxyPass = "http://localhost:${builtins.toString config.services.grzegorz.listenPort}"; proxyPass = "http://${grg.settings.host}:${toString grg.settings.port}";
}; };
locations."/docs" = { locations."/docs" = {
proxyPass = "http://localhost:${builtins.toString config.services.grzegorz.listenPort}"; proxyPass = "http://${grg.settings.host}:${toString grg.settings.port}";
}; };
}; };
} }