This commit is contained in:
2026-09-02 13:35:58 +03:00
parent e1d276097d
commit 482d32e1a6
5 changed files with 19 additions and 12 deletions
+3 -1
View File
@@ -85,7 +85,9 @@ let
extraSpecialArgs = {
inherit xlib;
};
config = { ... }: {
config =
{ ... }:
{
imports = [
../home/termux.nix
];
+1 -1
View File
@@ -32,7 +32,7 @@ in
./modules/dconf.nix
./modules/packages.nix
./modules/plasma-manager.nix
./modules/noctalia.nix
# ./modules/noctalia.nix
];
xdg = {
enable = true;
+1 -1
View File
@@ -27,7 +27,7 @@ in
./modules/dconf.nix
./modules/packages.nix
./modules/plasma-manager.nix
./modules/noctalia.nix
# ./modules/noctalia.nix
];
xdg = {
enable = true;
+8 -3
View File
@@ -9,7 +9,8 @@ let
panel = "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}/3x-ui";
certDomain = xlib.services."3x-ui".certDomain or null;
certMounts =
if certDomain == null then [ ]
if certDomain == null then
[ ]
else
# LE cert mounted read-only so 3x-ui can terminate TLS itself.
# The 3x-ui settings table must point webCertFile / webKeyFile at
@@ -54,7 +55,8 @@ in
volumes = [
"${panel}/cert/:/root/cert:rw"
"${panel}/db/:/etc/x-ui:rw"
] ++ certMounts;
]
++ certMounts;
log-driver = "journald";
# Adding a new inbound through the 3x-ui panel on a port outside
# the 14380-15379 range requires extending basePorts and rebuilding.
@@ -97,7 +99,10 @@ in
tmpfiles.rules = [
(xlib.helpers.mkTmpfile "d" xlib.dirs.services-mnt-folder "0755" "root" "root")
(xlib.helpers.mkTmpfile "d" xlib.dirs.services-nodes-folder "0755" "root" "root")
(xlib.helpers.mkTmpfile "d" "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}" "0755" "root" "root")
(xlib.helpers.mkTmpfile "d" "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}" "0755"
"root"
"root"
)
(xlib.helpers.mkTmpfile "d" panel "0755" "root" "root")
(xlib.helpers.mkTmpfile "d" "${panel}/db" "0755" "root" "root")
(xlib.helpers.mkTmpfile "d" "${panel}/cert" "0755" "root" "root")
+1 -1
View File
@@ -36,7 +36,7 @@ let
self.homeConfigurations.default.nixosModule # default homeConfigurations
disko.nixosModules.disko # disko module
]
++ lib.optional isDesktop ../desktop # desktop class: primary/secondary
++ lib.optional isDesktop ./desktop # desktop class: primary/secondary
# device-type module dir; "minimal" has no extra modules
++ lib.optional (!isDesktop && deviceType != "minimal") (./. + "/${deviceType}");
nixpkgs.overlays = with inputs; [