From b9b22774f52e0c2ed66041f5b9028cafdad750d4 Mon Sep 17 00:00:00 2001 From: oqyude Date: Wed, 11 Feb 2026 13:35:48 +0300 Subject: [PATCH 01/25] nix flake update --- flake.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index ebb9fd2..8b0c744 100755 --- a/flake.lock +++ b/flake.lock @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1770318660, - "narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=", + "lastModified": 1770779995, + "narHash": "sha256-Evbc+u49wYQ5uyEi/HHxVFEt3g/w4MZxkMXMe7McjRM=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e6a065f9efed51488d7c51a9abbd387df91b8", + "rev": "b3f43db171474132528be57610bfa5fb3b766879", "type": "github" }, "original": { @@ -182,11 +182,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1770631810, + "narHash": "sha256-b7iK/x+zOXbjhRqa+XBlYla4zFvPZyU5Ln2HJkiSnzc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "2889685785848de940375bf7fea5e7c5a3c8d502", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1769217863, - "narHash": "sha256-RY9kJDXD6+2Td/59LkZ0PFSereCXHdBX9wIkbYjRKCY=", + "lastModified": 1770657009, + "narHash": "sha256-v/LA5ZSJ+JQYzMSKB4sySM0wKfsAqddNzzxLLnbsV/E=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "38a5250e57f583662eac3b944830e4b9e169e965", + "rev": "5b50ea1aaa14945d4794c80fcc99c4aa1db84d2d", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770169770, - "narHash": "sha256-awR8qIwJxJJiOmcEGgP2KUqYmHG4v/z8XpL9z8FnT1A=", + "lastModified": 1770689213, + "narHash": "sha256-N6JiSpfi0s8NjUTnjwo3c+YAmvYhCDzjCKCrTUC97xM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa290c9891fa4ebe88f8889e59633d20cc06a5f2", + "rev": "49d75834011c94a120a9cb874ac1c4d8b7bfc767", "type": "github" }, "original": { @@ -238,11 +238,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1770399603, - "narHash": "sha256-m71il0j9Q8gt2Y0mskoXBTugdhP6lvC+CqfG2qgGt58=", + "lastModified": 1770804659, + "narHash": "sha256-c7mvGE1d7ZxTzZsmjmTx/NDe9GtK8vnci9Tyu3Y5eyY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f282aecd2b049a5a5e66c204d85fadf06463b2b2", + "rev": "d2e55892626954a846bcc078f1f463c9429c3828", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1770136044, - "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=", + "lastModified": 1770617025, + "narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e", + "rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", "type": "github" }, "original": { @@ -275,11 +275,11 @@ ] }, "locked": { - "lastModified": 1770398074, - "narHash": "sha256-MSOnwHi3BJu6xbBJZOMGA+Xhw1mTAJMJfnc/IopCzz4=", + "lastModified": 1770804330, + "narHash": "sha256-caiGYuMNCV2utCZjNP9A2YvRuE4I9KQfW2bWUrO6uw8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "4449ba25f83393d5f3fec2547b6d99e99bdc9451", + "rev": "eedbfed5eeae28b61815c6a6790f9b68b65281a2", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1769956244, + "lastModified": 1770766818, "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "fe54ea85c6e4413fba03b84d50f2b431d2f7c831", + "rev": "44b928068359b7d2310a34de39555c63c93a2c90", "type": "github" }, "original": { @@ -383,11 +383,11 @@ ] }, "locked": { - "lastModified": 1770145881, - "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=", + "lastModified": 1770683991, + "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c", + "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033", "type": "github" }, "original": { From 6b84713f564e523d78772299b1bc4b721d436484 Mon Sep 17 00:00:00 2001 From: oqyude Date: Wed, 11 Feb 2026 13:23:55 +0300 Subject: [PATCH 02/25] 213 --- modules/essentials/settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/essentials/settings.nix b/modules/essentials/settings.nix index 9e4fe4e..c3637b8 100644 --- a/modules/essentials/settings.nix +++ b/modules/essentials/settings.nix @@ -3,7 +3,7 @@ lib, ... }: -{ +{ # new things https://git.voronind.com/voronind/nix/src/commit/c4a70068a474e9f30b8e367b69520c563e02fbd9/system/nix.nix system.nixos.label = "default"; nix = { From 2ceef90e4c18fc35923c14ed4f0071b932066852 Mon Sep 17 00:00:00 2001 From: oqyude Date: Sat, 14 Feb 2026 11:22:56 +0300 Subject: [PATCH 03/25] nix flake update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 8b0c744..11f92e8 100755 --- a/flake.lock +++ b/flake.lock @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1770779995, - "narHash": "sha256-Evbc+u49wYQ5uyEi/HHxVFEt3g/w4MZxkMXMe7McjRM=", + "lastModified": 1771037579, + "narHash": "sha256-NX5XuhGcsmk0oEII2PEtMRgvh2KaAv3/WWQsOpxAgR4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3f43db171474132528be57610bfa5fb3b766879", + "rev": "05e6dc0f6ed936f918cb6f0f21f1dad1e4c53150", "type": "github" }, "original": { @@ -182,11 +182,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1770631810, - "narHash": "sha256-b7iK/x+zOXbjhRqa+XBlYla4zFvPZyU5Ln2HJkiSnzc=", + "lastModified": 1770882871, + "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2889685785848de940375bf7fea5e7c5a3c8d502", + "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770689213, - "narHash": "sha256-N6JiSpfi0s8NjUTnjwo3c+YAmvYhCDzjCKCrTUC97xM=", + "lastModified": 1770843696, + "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "49d75834011c94a120a9cb874ac1c4d8b7bfc767", + "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", "type": "github" }, "original": { @@ -238,11 +238,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1770804659, - "narHash": "sha256-c7mvGE1d7ZxTzZsmjmTx/NDe9GtK8vnci9Tyu3Y5eyY=", + "lastModified": 1771056776, + "narHash": "sha256-0l776LxthDY08ujQ1h83k9z6K5vBg1bGc415AWeFOOI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2e55892626954a846bcc078f1f463c9429c3828", + "rev": "d22fe1660f1f1ccbd52c9d2c09e92fe3861dd691", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1770617025, - "narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", + "lastModified": 1770770419, + "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", + "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", "type": "github" }, "original": { @@ -275,11 +275,11 @@ ] }, "locked": { - "lastModified": 1770804330, - "narHash": "sha256-caiGYuMNCV2utCZjNP9A2YvRuE4I9KQfW2bWUrO6uw8=", + "lastModified": 1771045170, + "narHash": "sha256-esBQIlClWRgYYvtYW27N79fCbOUkuFj3gxwJrb8WFX4=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "eedbfed5eeae28b61815c6a6790f9b68b65281a2", + "rev": "92612c09a9dce53d5dd60e53f066160f1cdf13b4", "type": "github" }, "original": { From 081730a6a5ca02cc4bcca4f3bf950898bda57462 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 18:39:57 +0300 Subject: [PATCH 04/25] 123 --- modules/vds/docker.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/vds/docker.nix b/modules/vds/docker.nix index c6f8844..8314da0 100644 --- a/modules/vds/docker.nix +++ b/modules/vds/docker.nix @@ -6,7 +6,7 @@ }: { imports = [ - # ./3x-ui.nix + ./3x-ui.nix ]; # virtualisation = { @@ -14,6 +14,6 @@ # }; environment.systemPackages = [ - # inputs.compose2nix.packages.x86_64-linux.default + inputs.compose2nix.packages.x86_64-linux.default ]; } From c019a9adb5062eab5cf6593cc0e993629dcbd8d2 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 18:43:59 +0300 Subject: [PATCH 05/25] 123 --- modules/vds/docker.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/vds/docker.nix b/modules/vds/docker.nix index 8314da0..b5fa2ea 100644 --- a/modules/vds/docker.nix +++ b/modules/vds/docker.nix @@ -14,6 +14,6 @@ # }; environment.systemPackages = [ - inputs.compose2nix.packages.x86_64-linux.default + pkgs.compose2nix ]; } From 0a8fcda81a79d2f086cccb1b0e298bd8a702857d Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 18:52:31 +0300 Subject: [PATCH 06/25] 123 --- modules/vds/3x-ui.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index ac583ca..07a07af 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -27,7 +27,8 @@ # Containers virtualisation.oci-containers.containers."3xui_app" = { - image = "localhost:7443/compose2nix/3xui_app"; + image = "docker.io/metaligh/3x-ui:latest"; + # image = "localhost:7443/compose2nix/3xui_app"; environment = { "XRAY_VMESS_AEAD_FORCED" = "false"; "XUI_ENABLE_FAIL2BAN" = "true"; From bdc362c29e16d958b96ef4e4279aaecb6e8a3331 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 19:04:48 +0300 Subject: [PATCH 07/25] 123 --- modules/vds/nginx.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/vds/nginx.nix b/modules/vds/nginx.nix index 75434da..c4d1fa1 100644 --- a/modules/vds/nginx.nix +++ b/modules/vds/nginx.nix @@ -33,6 +33,14 @@ in ''; }; }; + "x.zeroq.ru" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://${server}:2053"; + proxyWebsockets = true; + }; + }; "kuma.zeroq.ru" = { forceSSL = true; enableACME = true; From 0261dd14492f18f8bc8c458d91dd6102e75ba2ea Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 19:05:17 +0300 Subject: [PATCH 08/25] 213 --- modules/vds/docker.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/vds/docker.nix b/modules/vds/docker.nix index b5fa2ea..0a4ccf0 100644 --- a/modules/vds/docker.nix +++ b/modules/vds/docker.nix @@ -9,10 +9,6 @@ ./3x-ui.nix ]; - # virtualisation = { - # docker.enable = true; - # }; - environment.systemPackages = [ pkgs.compose2nix ]; From 053c4c2582dff989f32c3c6d319d893b77f33ec0 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 19:07:13 +0300 Subject: [PATCH 09/25] 123 --- modules/vds/nginx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/vds/nginx.nix b/modules/vds/nginx.nix index c4d1fa1..2025711 100644 --- a/modules/vds/nginx.nix +++ b/modules/vds/nginx.nix @@ -37,7 +37,7 @@ in forceSSL = true; enableACME = true; locations."/" = { - proxyPass = "http://${server}:2053"; + proxyPass = "http://localhost:2053"; proxyWebsockets = true; }; }; From 36e48e9bf45d282afb1d7b3f0f32b5b91ef41084 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 20:06:47 +0300 Subject: [PATCH 10/25] 123 --- modules/vds/3x-ui.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index 07a07af..ae6bda9 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -23,6 +23,14 @@ "${matchAll}".allowedUDPPorts = [ 53 ]; }; + networking.firewall = { + allowedTCPPorts = [ + 14380 + ]; + allowedUDPPorts = [ + 14380 + ]; + }; virtualisation.oci-containers.backend = "podman"; # Containers From 37f3b8a7640779ef2ee22605dcd2bdf4fc492f84 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 20:42:48 +0300 Subject: [PATCH 11/25] 123 --- modules/vds/nginx.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/vds/nginx.nix b/modules/vds/nginx.nix index 2025711..f37c4a5 100644 --- a/modules/vds/nginx.nix +++ b/modules/vds/nginx.nix @@ -36,9 +36,15 @@ in "x.zeroq.ru" = { forceSSL = true; enableACME = true; - locations."/" = { - proxyPass = "http://localhost:2053"; - proxyWebsockets = true; + locations = { + "/" = { + proxyPass = "http://localhost:2053"; + proxyWebsockets = true; + }; + "/subs/" = { + proxyPass = "http://localhost:2096"; + proxyWebsockets = true; + }; }; }; "kuma.zeroq.ru" = { From a842f8b3a1c412daed18eacfafc2d11b27ee8ca9 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 21:03:29 +0300 Subject: [PATCH 12/25] 123 --- modules/vds/3x-ui.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index ae6bda9..3aaf248 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -35,7 +35,8 @@ # Containers virtualisation.oci-containers.containers."3xui_app" = { - image = "docker.io/metaligh/3x-ui:latest"; + image = "/mnt/containers/3x-ui.image"; + # image = "docker.io/metaligh/3x-ui:latest"; # image = "localhost:7443/compose2nix/3xui_app"; environment = { "XRAY_VMESS_AEAD_FORCED" = "false"; From 663820b72f4e16d31f1c4c4ecbeeaa814cc278b8 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 21:09:19 +0300 Subject: [PATCH 13/25] 123 --- modules/vds/3x-ui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index 3aaf248..9f4501e 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -35,7 +35,7 @@ # Containers virtualisation.oci-containers.containers."3xui_app" = { - image = "/mnt/containers/3x-ui.image"; + image = "localhost/compose2nix/3xui_app:latest"; # image = "docker.io/metaligh/3x-ui:latest"; # image = "localhost:7443/compose2nix/3xui_app"; environment = { From 45cbdbff2d9b8f7a13af7dbe640cc6b2de834675 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 21:17:08 +0300 Subject: [PATCH 14/25] 123 --- modules/vds/3x-ui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index 9f4501e..122463a 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -35,7 +35,7 @@ # Containers virtualisation.oci-containers.containers."3xui_app" = { - image = "localhost/compose2nix/3xui_app:latest"; + image = "http://localhost:7443/compose2nix/3xui_app:latest"; # image = "docker.io/metaligh/3x-ui:latest"; # image = "localhost:7443/compose2nix/3xui_app"; environment = { From 4aa8edecacdbef6c5000b848f8fa45a22e03ddc8 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 21:26:27 +0300 Subject: [PATCH 15/25] 123 --- modules/vds/3x-ui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index 122463a..3308168 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -35,7 +35,7 @@ # Containers virtualisation.oci-containers.containers."3xui_app" = { - image = "http://localhost:7443/compose2nix/3xui_app:latest"; + image = "localhost:7443/compose2nix/3xui_app:latest"; # image = "docker.io/metaligh/3x-ui:latest"; # image = "localhost:7443/compose2nix/3xui_app"; environment = { From d8418c2dd4f68f8c8e81e8be59f6eafdc8935880 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 21:30:10 +0300 Subject: [PATCH 16/25] 123 --- modules/essentials/settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/essentials/settings.nix b/modules/essentials/settings.nix index c3637b8..a989dc0 100644 --- a/modules/essentials/settings.nix +++ b/modules/essentials/settings.nix @@ -30,7 +30,7 @@ stalled-download-timeout = 4; connect-timeout = 4; auto-optimise-store = true; - # fallback = true; + fallback = true; # allow-import-from-derivation = false; # keep-derivations = true; # keep-outputs = true; From d3b8189aa6ccddac632dc2d98ab6df72f6dd1bd8 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 21:33:21 +0300 Subject: [PATCH 17/25] 123 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 11f92e8..3503813 100755 --- a/flake.lock +++ b/flake.lock @@ -446,11 +446,11 @@ }, "zeroq-credentials": { "locked": { - "lastModified": 1767550838, - "narHash": "sha256-AExKXIA9d66V8JGYKqaw5o+xxQR/v4b8omAqgSGHYyg=", + "lastModified": 1771353173, + "narHash": "sha256-uTLQzud01UGJo3ZZ4LG8ku3RHyo0M8YeBdLRMtB7yDY=", "ref": "refs/heads/master", - "rev": "5df30a8ba769e4039768f27cfae6666006903dc4", - "revCount": 72, + "rev": "c07dd5f1fe91646604db115bfcd0baaf1dc0bbb9", + "revCount": 73, "type": "git", "url": "ssh://git@github.com/oqyude/zeroq-credentials.git" }, From 14624190529c818c4f70500d7b93bce76be271bc Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 21:48:35 +0300 Subject: [PATCH 18/25] 123 --- modules/vds/3x-ui.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index 3308168..e638824 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -35,7 +35,16 @@ # Containers virtualisation.oci-containers.containers."3xui_app" = { - image = "localhost:7443/compose2nix/3xui_app:latest"; + image = "3xui_app:latest"; + imageFile = pkgs.dockerTools.buildImage { + name = "3xui_app"; + fromImage = /mnt/containers/3x-ui/3x-ui.tar.gz; + config = { + Cmd = [ "/3xui_app/serve" ]; + WorkingDir = "/3xui_app"; + }; + }; + # image = "docker.io/metaligh/3x-ui:latest"; # image = "localhost:7443/compose2nix/3xui_app"; environment = { From 1dd0808f8fea3d6d80755d8510c0f623e32d946c Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 21:49:51 +0300 Subject: [PATCH 19/25] 123 --- modules/vds/3x-ui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index e638824..539d370 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -38,7 +38,7 @@ image = "3xui_app:latest"; imageFile = pkgs.dockerTools.buildImage { name = "3xui_app"; - fromImage = /mnt/containers/3x-ui/3x-ui.tar.gz; + fromImage = /etc/containers/3x-ui.tar.gz; config = { Cmd = [ "/3xui_app/serve" ]; WorkingDir = "/3xui_app"; From 2988c9cf560335e18b24e0bf5519467e664bc568 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 21:56:26 +0300 Subject: [PATCH 20/25] 123 --- modules/vds/3x-ui.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index 539d370..dabfac6 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -35,17 +35,8 @@ # Containers virtualisation.oci-containers.containers."3xui_app" = { - image = "3xui_app:latest"; - imageFile = pkgs.dockerTools.buildImage { - name = "3xui_app"; - fromImage = /etc/containers/3x-ui.tar.gz; - config = { - Cmd = [ "/3xui_app/serve" ]; - WorkingDir = "/3xui_app"; - }; - }; - # image = "docker.io/metaligh/3x-ui:latest"; + image = "compose2nix/3xui_app:latest"; # image = "localhost:7443/compose2nix/3xui_app"; environment = { "XRAY_VMESS_AEAD_FORCED" = "false"; @@ -83,7 +74,7 @@ TimeoutSec = 300; }; script = '' - cd /mnt/containers/3x-ui + cd /mnt/containers/3x-ui/image podman build -t compose2nix/3xui_app -f ./Dockerfile . ''; }; From f22981f87728b1d413956f3eb8e7c321bebdd91e Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 17 Feb 2026 22:05:53 +0300 Subject: [PATCH 21/25] 123 --- modules/vds/docker.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/vds/docker.nix b/modules/vds/docker.nix index 0a4ccf0..494db3a 100644 --- a/modules/vds/docker.nix +++ b/modules/vds/docker.nix @@ -9,7 +9,8 @@ ./3x-ui.nix ]; - environment.systemPackages = [ - pkgs.compose2nix + environment.systemPackages = with pkgs; [ + compose2nix + podman-tui ]; } From 37baca51aa0988e7f810759e6c93ce122167730e Mon Sep 17 00:00:00 2001 From: oqyude Date: Wed, 18 Feb 2026 09:08:02 +0300 Subject: [PATCH 22/25] 123 --- modules/vds/3x-ui.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index dabfac6..f3197db 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -35,8 +35,8 @@ # Containers virtualisation.oci-containers.containers."3xui_app" = { - # image = "docker.io/metaligh/3x-ui:latest"; - image = "compose2nix/3xui_app:latest"; + image = "ghcr.io/MHSanaei/3x-ui:latest"; + # image = "compose2nix/3xui_app:latest"; # image = "localhost:7443/compose2nix/3xui_app"; environment = { "XRAY_VMESS_AEAD_FORCED" = "false"; @@ -74,7 +74,7 @@ TimeoutSec = 300; }; script = '' - cd /mnt/containers/3x-ui/image + cd /mnt/containers/3x-ui podman build -t compose2nix/3xui_app -f ./Dockerfile . ''; }; From 9449dcaf653b514ebbdf9e3bb6cacb25d5ff4860 Mon Sep 17 00:00:00 2001 From: oqyude Date: Wed, 18 Feb 2026 09:21:56 +0300 Subject: [PATCH 23/25] 123 --- modules/vds/3x-ui.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index f3197db..97b9752 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -10,7 +10,10 @@ # Runtime virtualisation.podman = { enable = true; - autoPrune.enable = true; + autoPrune = { + enable = true; + flags = [ "--all" ]; + }; dockerCompat = true; }; @@ -35,7 +38,7 @@ # Containers virtualisation.oci-containers.containers."3xui_app" = { - image = "ghcr.io/MHSanaei/3x-ui:latest"; + image = "ghcr.io/mhsanaei/3x-ui:latest"; # image = "compose2nix/3xui_app:latest"; # image = "localhost:7443/compose2nix/3xui_app"; environment = { From 564458ecb57fad099173792c2a0e21fe62cf3a49 Mon Sep 17 00:00:00 2001 From: oqyude Date: Wed, 18 Feb 2026 09:24:29 +0300 Subject: [PATCH 24/25] 1 --- modules/vds/{docker.nix => containers.nix} | 0 modules/vds/default.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename modules/vds/{docker.nix => containers.nix} (100%) diff --git a/modules/vds/docker.nix b/modules/vds/containers.nix similarity index 100% rename from modules/vds/docker.nix rename to modules/vds/containers.nix diff --git a/modules/vds/default.nix b/modules/vds/default.nix index a949097..60f36d1 100644 --- a/modules/vds/default.nix +++ b/modules/vds/default.nix @@ -4,7 +4,7 @@ }: { imports = [ - ./docker.nix + ./containers.nix # ../services/uptime-kuma.nix # ./netbird.nix ./nginx.nix From f8b74e8d8817916407a82a5d344c8cefe7a15f73 Mon Sep 17 00:00:00 2001 From: oqyude Date: Wed, 18 Feb 2026 10:32:34 +0300 Subject: [PATCH 25/25] 123 --- modules/vds/3x-ui.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index 97b9752..3d75ee3 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -39,8 +39,6 @@ # Containers virtualisation.oci-containers.containers."3xui_app" = { image = "ghcr.io/mhsanaei/3x-ui:latest"; - # image = "compose2nix/3xui_app:latest"; - # image = "localhost:7443/compose2nix/3xui_app"; environment = { "XRAY_VMESS_AEAD_FORCED" = "false"; "XUI_ENABLE_FAIL2BAN" = "true";