oqyude/nixos
1
0
Fork 0
mirror of https://github.com/oqyude/nixos.git synced 2026-10-07 20:47:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

microfix

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