nixpkgs: Refresh channels and inputs
Rebase the fork branches and refresh nixpkgs, home-manager, and the approved ancillary inputs. Update kernel and release metadata, adapt removed package and Home Assistant options, and keep Determinate Nix on its tested nixpkgs revision to avoid duplicate Boost patches. Retire Sharry and its public endpoint because copyparty replaces it. Document the GitHub mirror gate and require real devshell and system builds in the upgrade validation workflow.
This commit is contained in:
@@ -336,15 +336,6 @@ in
|
||||
useACMEHost = pubDomain;
|
||||
};
|
||||
|
||||
"share.${pubDomain}" = {
|
||||
locations."/" = {
|
||||
proxyPass = "http://object-ctr.${domain}:9090";
|
||||
proxyWebsockets = true;
|
||||
extraConfig = proxyHeaders;
|
||||
};
|
||||
useACMEHost = pubDomain;
|
||||
};
|
||||
|
||||
"stuff.${pubDomain}" = {
|
||||
locations."/" = {
|
||||
proxyPass = "http://jackflix-ctr.${domain}:3923";
|
||||
|
||||
@@ -47,10 +47,6 @@ in
|
||||
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFdHbZErWLmTPO/aEWB1Fup/aGMf31Un5Wk66FJwTz/8";
|
||||
files = {
|
||||
"object/minio.env" = {};
|
||||
"object/sharry.conf" = {
|
||||
owner = "sharry";
|
||||
group = "sharry";
|
||||
};
|
||||
"object/minio-client-config.json" = {
|
||||
owner = config.my.user.config.name;
|
||||
group = config.my.user.config.group;
|
||||
@@ -65,7 +61,6 @@ in
|
||||
firewall = {
|
||||
tcp.allowed = [
|
||||
9000 9001
|
||||
config.services.sharry.config.bind.port
|
||||
8069
|
||||
5000
|
||||
config.services.hedgedoc.settings.port
|
||||
@@ -122,8 +117,6 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
sharry = awaitPostgres;
|
||||
|
||||
atticd = mkMerge [
|
||||
awaitPostgres
|
||||
{
|
||||
@@ -175,66 +168,6 @@ in
|
||||
dataDir = [ "/mnt/minio" ];
|
||||
};
|
||||
|
||||
sharry = {
|
||||
enable = true;
|
||||
configOverridesFile = config.age.secrets."object/sharry.conf".path;
|
||||
|
||||
config = {
|
||||
base-url = "https://share.${lib.my.c.pubDomain}";
|
||||
bind.address = "::";
|
||||
alias-member-enabled = true;
|
||||
webapp = {
|
||||
chunk-size = "64M";
|
||||
};
|
||||
backend = {
|
||||
auth = {
|
||||
fixed = {
|
||||
enabled = true;
|
||||
user = "dev";
|
||||
};
|
||||
internal = {
|
||||
enabled = true;
|
||||
order = 50;
|
||||
};
|
||||
};
|
||||
jdbc = {
|
||||
url = "jdbc:postgresql://colony-psql:5432/sharry";
|
||||
user = "sharry";
|
||||
};
|
||||
files = {
|
||||
default-store = "minio";
|
||||
stores = {
|
||||
database.enabled = false;
|
||||
minio = {
|
||||
enabled = true;
|
||||
type = "s3";
|
||||
endpoint = "https://s3.nul.ie";
|
||||
access-key = "share";
|
||||
bucket = "share";
|
||||
};
|
||||
};
|
||||
};
|
||||
compute-checksum.parallel = 4;
|
||||
signup.mode = "invite";
|
||||
share = {
|
||||
max-size = "128G";
|
||||
max-validity = "3650 days";
|
||||
};
|
||||
mail = {
|
||||
enabled = true;
|
||||
smtp = {
|
||||
host = "mail.nul.ie";
|
||||
port = 587;
|
||||
user = "sharry@nul.ie";
|
||||
ssl-type = "starttls";
|
||||
default-from = "Sharry <sharry@nul.ie>";
|
||||
timeout = "30 seconds";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
atticd = {
|
||||
enable = false;
|
||||
environmentFile = config.age.secrets."object/atticd.env".path;
|
||||
@@ -308,7 +241,6 @@ in
|
||||
forwardPorts = [
|
||||
{ from = "host"; host.port = 9000; guest.port = 9000; }
|
||||
{ from = "host"; host.port = 9001; guest.port = 9001; }
|
||||
{ from = "host"; guest.port = config.services.sharry.config.bind.port; }
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -47,8 +47,9 @@ in
|
||||
inherit (lib) mkMerge mkIf mkForce;
|
||||
inherit (lib.my) networkdAssignment;
|
||||
|
||||
hassPort = 8123;
|
||||
hassCli = pkgs.writeShellScriptBin "hass-cli" ''
|
||||
export HASS_SERVER="http://localhost:${toString config.services.home-assistant.config.http.server_port}"
|
||||
export HASS_SERVER="http://localhost:${toString hassPort}"
|
||||
export HASS_TOKEN="$(< ${config.age.secrets."hass/cli-token.txt".path})"
|
||||
exec ${pkgs.home-assistant-cli}/bin/hass-cli "$@"
|
||||
'';
|
||||
@@ -69,7 +70,7 @@ in
|
||||
};
|
||||
|
||||
firewall = {
|
||||
tcp.allowed = [ "http" 1883 ];
|
||||
tcp.allowed = [ "http" hassPort 1883 ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -166,8 +167,6 @@ in
|
||||
|
||||
home-assistant =
|
||||
let
|
||||
cfg = config.services.home-assistant;
|
||||
|
||||
pyirishrail = ps: ps.buildPythonPackage rec {
|
||||
pname = "pyirishrail";
|
||||
version = "0.0.2";
|
||||
@@ -217,7 +216,6 @@ in
|
||||
];
|
||||
|
||||
configWritable = false;
|
||||
openFirewall = true;
|
||||
config = {
|
||||
default_config = {};
|
||||
homeassistant = {
|
||||
@@ -227,9 +225,10 @@ in
|
||||
country = "IE";
|
||||
time_zone = "Europe/Dublin";
|
||||
external_url = "https://hass.${pubDomain}";
|
||||
internal_url = "http://hass-ctr.${domain}:${toString cfg.config.http.server_port}";
|
||||
internal_url = "http://hass-ctr.${domain}:${toString hassPort}";
|
||||
};
|
||||
http = {
|
||||
server_port = hassPort;
|
||||
use_x_forwarded_for = true;
|
||||
trusted_proxies = with allAssignments.middleman.internal; [
|
||||
ipv4.address
|
||||
|
||||
+1
-1
@@ -191,7 +191,7 @@ let
|
||||
# Routes the custom modules into `baseModules` so the NixOS manual documents them. The old
|
||||
# infinite-recursion is gone, but enabling this makes every system build regenerate the
|
||||
# manual, and it documents everything the modules transitively import — including third-party
|
||||
# modules that aren't doc-clean (e.g. `services.sharry`). Prefer the generated
|
||||
# modules that aren't doc-clean. Prefer the generated
|
||||
# `nixos.optionsDoc` reference (`docs/reference/nixos-options.md`) instead.
|
||||
docCustom = mkBoolOpt' false "Whether to document nixfiles' custom NixOS modules.";
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@ in
|
||||
imports = [
|
||||
inputs.impermanence.nixosModules.default
|
||||
inputs.ragenix.nixosModules.age
|
||||
inputs.sharry.nixosModules.default
|
||||
inputs.copyparty.nixosModules.default
|
||||
inputs.harmonia.nixosModules.harmonia
|
||||
];
|
||||
@@ -77,7 +76,6 @@ in
|
||||
nixpkgs = {
|
||||
overlays = [
|
||||
inputs.deploy-rs.overlays.default
|
||||
inputs.sharry.overlays.default
|
||||
# TODO: Re-enable when borgthin is updated
|
||||
# inputs.borgthin.overlays.default
|
||||
inputs.boardie.overlays.default
|
||||
@@ -169,7 +167,7 @@ in
|
||||
|
||||
services = {
|
||||
# TODO: Remove if-else when 26.11 releases
|
||||
kmscon = if (config.system.nixos.release == "26.06:u-26.11") then {
|
||||
kmscon = if (config.system.nixos.release == "26.08:u-26.11") then {
|
||||
enable = mkDefault false;
|
||||
config = {
|
||||
hwaccel = config.hardware.graphics.enable;
|
||||
|
||||
Reference in New Issue
Block a user