diff --git a/flake.lock b/flake.lock index 88ace98..0e8270b 100644 --- a/flake.lock +++ b/flake.lock @@ -422,11 +422,11 @@ ] }, "locked": { - "lastModified": 1769580047, - "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=", + "lastModified": 1770260404, + "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "owner": "nix-community", "repo": "home-manager", - "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826", + "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "type": "github" }, "original": { @@ -513,11 +513,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1769965155, - "narHash": "sha256-KAgGtueNnwLtekIh9tnmLAUDFbRxSff0OZwQwSi05Nk=", + "lastModified": 1770330959, + "narHash": "sha256-OPmJ6dBL615GGX7ENJXtJm4zeMv5uXDjmO8WB1MI5wM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a0ec2e4daf8e508761f6bc53fc163fbb92ac7aa1", + "rev": "562171ab668e7ee98a9d2bbb62a9477ad2b1e24e", "type": "github" }, "original": { @@ -806,11 +806,11 @@ ] }, "locked": { - "lastModified": 1769914377, - "narHash": "sha256-8wH3ZYNs36V0A3f/ikraqdoVE++BfnXg9Ql8nAuUkHw=", + "lastModified": 1770345361, + "narHash": "sha256-/kldWxogKCw1ykliO6lLwLE4aqUQ+yZOS9fHiFdI7u0=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "f7d17740ed90663b11ae907d33b3fed9fc9e15a9", + "rev": "2b6e7914c9ba6ad7effd53fab40d7acf34873069", "type": "github" }, "original": { @@ -885,11 +885,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1769983561, - "narHash": "sha256-Hv7yml1x0gU14H1zxGATCXb+ueeBH7DFBUTIMkLWD4A=", + "lastModified": 1770235692, + "narHash": "sha256-VvqTQ2RYZE4PUWiefJKAPKW3H4fahCbp3L8yv4c7B8s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8dcf33716a525a7a0b6815cd8d0f4fa9b13abb1b", + "rev": "39dfe6111bc5b19a710bcf409a9b179688f381eb", "type": "github" }, "original": { @@ -901,11 +901,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1769789167, - "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -917,11 +917,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769900590, - "narHash": "sha256-I7Lmgj3owOTBGuauy9FL6qdpeK2umDoe07lM4V+PnyA=", + "lastModified": 1770136044, + "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=", "owner": "nixos", "repo": "nixpkgs", - "rev": "41e216c0ca66c83b12ab7a98cc326b5db01db646", + "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e", "type": "github" }, "original": { @@ -960,11 +960,11 @@ ] }, "locked": { - "lastModified": 1770024533, - "narHash": "sha256-EXQWqlbhkkune23d6xq/0bz3iyJzkVklvDsSlYE3n3Y=", + "lastModified": 1770368476, + "narHash": "sha256-myWSpD+v5TmQ47grn+gbLou1dNy5hCXvfvc6VGF72kk=", "owner": "nix-community", "repo": "nur", - "rev": "cdb7c463555d7c6de5ba7251f9b4940249b651e8", + "rev": "2959831b0338e196f2d864fb5e6bb309fa1c99c1", "type": "github" }, "original": { @@ -1088,11 +1088,11 @@ ] }, "locked": { - "lastModified": 1769921679, - "narHash": "sha256-twBMKGQvaztZQxFxbZnkg7y/50BW9yjtCBWwdjtOZew=", + "lastModified": 1770145881, + "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1e89149dcfc229e7e2ae24a8030f124a31e4f24f", + "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c", "type": "github" }, "original": { @@ -1122,11 +1122,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769885983, - "narHash": "sha256-jLS7410B58f+3WfZ4PQ28aaaTONnmxlfAbDPdNuciLc=", + "lastModified": 1770308890, + "narHash": "sha256-7bx8Bn9B2g/loBaz+uLwdKI2rUW+RhDPyP/MqAgvrxU=", "owner": "danth", "repo": "stylix", - "rev": "fe06391a1e1905fc7e6c13443ea439a89695ca69", + "rev": "7e7fa955abac04a8e118b1cedf930a8fd41c34a6", "type": "github" }, "original": { diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 6a6d841..c1964c2 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -67,7 +67,7 @@ in hostName = "server"; firewall = { allowedUDPPorts = config.networking.firewall.allowedTCPPorts; - interfaces.wg0.allowedTCPPorts = [ 8081 ]; + interfaces.wg0.allowedTCPPorts = [ config.my.servers.nextcloud.port ]; }; wireguard.interfaces.wg0 = lib.mkIf config.my.secureHost { ips = [ "${config.my.ips.wg-server}/32" ]; diff --git a/modules/servers/homepage/service-widgets.nix b/modules/servers/homepage/service-widgets.nix index 72466b8..754b2d5 100644 --- a/modules/servers/homepage/service-widgets.nix +++ b/modules/servers/homepage/service-widgets.nix @@ -209,7 +209,7 @@ icon = "${cfg.name}.png"; href = cfg.url; widget = { - url = "http://${config.my.ips.wg-server}:8081"; + url = "http://${config.my.ips.wg-server}:${toString cfg.port}"; type = cfg.name; username = "{{HOMEPAGE_VAR_NEXTCLOUD_USERNAME}}"; password = "{{HOMEPAGE_VAR_NEXTCLOUD_PASSWORD}}"; diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix index 34f4bb3..e96c988 100644 --- a/modules/servers/nextcloud.nix +++ b/modules/servers/nextcloud.nix @@ -176,11 +176,11 @@ in listen = [ { addr = config.my.ips.wg-server; - port = 8081; + inherit (cfg) port; } { addr = config.my.localhost; - port = 8081; + inherit (cfg) port; } ]; };