treewide: Perform another nitpicking sweep

This commit is contained in:
Tristan Daniël Maat 2022-10-12 01:24:54 +01:00
parent dea9032530
commit ab3aa19481
Signed by: tlater
GPG key ID: 49670FD774E43268
3 changed files with 11 additions and 16 deletions

View file

@ -13,7 +13,6 @@
];
nix = {
# Enable flakes
package = pkgs.nixFlakes;
extraOptions = ''
experimental-features = nix-command flakes
@ -31,6 +30,8 @@
secrets.steam = {};
};
# Optimization for minecraft servers, see:
# https://bugs.mojang.com/browse/MC-183518
boot.kernelParams = ["highres=off" "nohz=off"];
networking = {
@ -71,7 +72,7 @@
domain = "tlater.net";
virtualHosts = let
host = port: extra:
proxyPassToPort = port: extra:
lib.recursiveUpdate {
forceSSL = true;
enableACME = true;
@ -83,9 +84,9 @@
extra;
domain = config.services.nginx.domain;
in {
"${domain}" = host 3002 {serverAliases = ["www.${domain}"];};
"gitea.${domain}" = host 3000 {};
"nextcloud.${domain}" = host 3001 {};
"${domain}" = proxyPassToPort 3002 {serverAliases = ["www.${domain}"];};
"gitea.${domain}" = proxyPassToPort 3000 {};
"nextcloud.${domain}" = proxyPassToPort 3001 {};
};
};

View file

@ -1,9 +1,4 @@
{
config,
lib,
pkgs,
...
}: {
# Required for the lish console
boot.kernelParams = ["console=ttyS0,19200n8"];

View file

@ -1,9 +1,8 @@
{lib, ...}:
with lib; {
imports = [./virtualisation/pods.nix];
options.services.nginx.domain = mkOption {
type = types.str;
{lib, ...}: let
inherit (lib) mkOption types;
in {
options.services.nginx.domain = lib.mkOption {
type = lib.types.str;
description = "The base domain name to append to virtual domain names";
};
}