wo2w/nixos-config
1
0
Fork 0
Code Issues Pull requests Activity

Compare commits

base: wo2w:aed5d7f4c31970eb9178b1f9c3cd4f52de1c3821
Branches Tags
wo2w:main
..
compare: wo2w:c3d3bed26a8e00839803aa09c99b623698add993
Branches Tags
wo2w:main

No commits in common. "aed5d7f4c31970eb9178b1f9c3cd4f52de1c3821" and "c3d3bed26a8e00839803aa09c99b623698add993" have entirely different histories.
aed5d7f4c3 ... c3d3bed26a

5 changed files with 35 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

48
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770818644, "lastModified": 1768068402,
"narHash": "sha256-DYS4jIRpRoKOzJjnR/QqEd/MlT4OZZpt8CrBLv+cjsE=", "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0acbd1180697de56724821184ad2c3e6e7202cd7", "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -34,11 +34,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1770844822, "lastModified": 1768153577,
"narHash": "sha256-QgJZ+W6YE6nAzO/m7ezamAzr9DTflIEXRozMivL0+hc=", "narHash": "sha256-iR54iiyM4UtQCfAZVsI/BRwIrDUO1oNeiA1h/Jp+nro=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "7634add8bf2dd225d04f535de4bd0ee60982f367", "rev": "c65d3c7adfe488122c2c9b7ececb1d7fc893dc5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1770735554, "lastModified": 1768150783,
"narHash": "sha256-8GzUa8bCyQ688jYW2waXrOqetTr7oV8UPTO2He+5Hsg=", "narHash": "sha256-1gtx2la5f8RphvN+BUZuZjiGh25WdO0Hf9+kJKIu3rA=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "41b5de87692b8262fbdbff7faab93f04ff0be453", "rev": "e9d888cd52f8a783b07e0d6c0ec9a341a81031ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769132082, "lastModified": 1763322257,
"narHash": "sha256-cJVUBVP3qmRO2HGHqj18ChjOSztyo7eqElQJMRpWXw8=", "narHash": "sha256-eiKNbZXvkB2p/YhM5ltK1CO1znm5Nn2aHLW3Awcqq9g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-avf", "repo": "nixos-avf",
"rev": "d0a62c3f64b45a39570fde31a3a490b214bf19ee", "rev": "3fae0a3692b993bc0c40c61138a76fc1455d0b6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,11 +102,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1770631810, "lastModified": 1767185284,
"narHash": "sha256-b7iK/x+zOXbjhRqa+XBlYla4zFvPZyU5Ln2HJkiSnzc=", "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "2889685785848de940375bf7fea5e7c5a3c8d502", "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +118,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1770562336, "lastModified": 1767892417,
"narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,11 +166,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770683991, "lastModified": 1768104471,
"narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=", "narHash": "sha256-HdnXWQsA1EI27IJlaENUEEug58trUrh6+MT0cFiDHmY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033", "rev": "94f9cbd20f680ebb2ad6cdf39da97cbcfaedf004",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,11 +199,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1770583271, "lastModified": 1768106915,
"narHash": "sha256-Q75S8cEqJoZ92s1y4zArvk2U1ayAy2E4SaF7gbNXkYQ=", "narHash": "sha256-HlLo9zH4ULRXlmlIK948cHmdVhxyHgTHxGaoCRlW4k8=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "86f5bd5d867ad6e120935dfe825f6b903ebbeddd", "rev": "72245e108f3b03c3c4474d2de9de2d1830849603",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
modules/nixos/services/homeserver/caddy.nix
View file

@ -95,10 +95,6 @@
import default-settings import default-settings
import cloudflare-tls import cloudflare-tls
handle /.well-known/matrix/* {
reverse_proxy unix/${config.services.matrix-continuwuity.settings.global.unix_socket_path}
}
respond "{client_ip}" respond "{client_ip}"
''; '';
}; };

36
modules/nixos/services/homeserver/continuwuity.nix
View file

@ -1,36 +0,0 @@
{ config, ... }:
{
users.groups.continuwuity.members = [ "caddy" ];
services.caddy.virtualHosts."matrix.wo2wz.fyi".extraConfig = ''
import default-settings
import cloudflare-tls
reverse_proxy unix/${config.services.matrix-continuwuity.settings.global.unix_socket_path}
'';
services.matrix-continuwuity = {
enable = true;
settings = {
global = {
address = null;
unix_socket_path = "/run/continuwuity/continuwuity.sock";
unix_socket_perms = 660;
server_name = "wo2wz.fyi";
well_known = {
client = "https://matrix.wo2wz.fyi";
server = "matrix.wo2wz.fyi:443";
};
allow_registration = false;
allow_encryption = true;
allow_federation = true;
trusted_servers = [ "matrix.org" ];
new_user_displayname_suffix = "";
};
};
};
}

1
modules/nixos/services/homeserver/default.nix
View file

@ -6,7 +6,6 @@
./restic ./restic
./caddy.nix ./caddy.nix
./cloudflared.nix ./cloudflared.nix
./continuwuity.nix
./forgejo.nix ./forgejo.nix
./gameserver-caddy.nix ./gameserver-caddy.nix
./jellyfin.nix ./jellyfin.nix

12
modules/nixos/services/homeserver/kanidm.nix
View file

@ -47,11 +47,10 @@
''; '';
services.kanidm = { services.kanidm = {
enableServer = true;
package = pkgs.kanidmWithSecretProvisioning_1_8; package = pkgs.kanidmWithSecretProvisioning_1_8;
server = { serverSettings = {
enable = true;
settings = {
version = "2"; version = "2";
bindaddress = "127.0.0.1:8004"; bindaddress = "127.0.0.1:8004";
@ -61,7 +60,6 @@
tls_key = "${config.security.acme.certs."kanidm.wo2wz.fyi".directory}/key.pem"; tls_key = "${config.security.acme.certs."kanidm.wo2wz.fyi".directory}/key.pem";
http_client_address_info.x-forward-for = [ "127.0.0.1" "::1" ]; http_client_address_info.x-forward-for = [ "127.0.0.1" "::1" ];
}; };
};
provision = { provision = {
enable = true; enable = true;
@ -153,9 +151,7 @@
}; };
}; };
client = { enableClient = true;
enable = true; clientSettings.uri = "https://kanidm.wo2wz.fyi";
settings.uri = "https://kanidm.wo2wz.fyi";
};
}; };
} }