diff --git a/configurations/mobile.nix b/configurations/mobile.nix index ffb37b1..bce7a5b 100644 --- a/configurations/mobile.nix +++ b/configurations/mobile.nix @@ -85,12 +85,14 @@ let extraSpecialArgs = { inherit xlib; }; - config = { ... }: { - imports = [ - ../home/termux.nix - ]; - home.stateVersion = "24.05"; - }; + config = + { ... }: + { + imports = [ + ../home/termux.nix + ]; + home.stateVersion = "24.05"; + }; }; # Read the changelog before changing this value diff --git a/home/primary.nix b/home/primary.nix index 7e89ac9..b98791d 100644 --- a/home/primary.nix +++ b/home/primary.nix @@ -32,7 +32,7 @@ in ./modules/dconf.nix ./modules/packages.nix ./modules/plasma-manager.nix - ./modules/noctalia.nix + # ./modules/noctalia.nix ]; xdg = { enable = true; diff --git a/home/secondary.nix b/home/secondary.nix index b36a478..c40292e 100644 --- a/home/secondary.nix +++ b/home/secondary.nix @@ -27,7 +27,7 @@ in ./modules/dconf.nix ./modules/packages.nix ./modules/plasma-manager.nix - ./modules/noctalia.nix + # ./modules/noctalia.nix ]; xdg = { enable = true; diff --git a/modules/containers/3x-ui.nix b/modules/containers/3x-ui.nix index 3891f9c..871aa2a 100644 --- a/modules/containers/3x-ui.nix +++ b/modules/containers/3x-ui.nix @@ -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") diff --git a/modules/default.nix b/modules/default.nix index 04b88ad..baa7af8 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -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; [