oqyude/nixos
1
0
Fork 0
mirror of https://github.com/oqyude/nixos.git synced 2026-08-09 08:03:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

path refactoring

Browse Source
This commit is contained in:
oqyude
2026-08-09 01:11:23 +03:00
parent 27d81a27e2
commit 5b3da95fc2
6 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/containers/3x-ui.nix
+12 -9
View File
@@ -5,6 +5,9 @@
xlib, xlib,
... ...
}: }:
let
panel = "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}/3x-ui";
in
{ {
virtualisation = { virtualisation = {
podman = { podman = {
@@ -25,8 +28,8 @@
"TZ" = "Europe/Moscow"; "TZ" = "Europe/Moscow";
}; };
volumes = [ volumes = [
"${xlib.dirs.services-mnt-folder}/containers/3x-ui/cert/:/root/cert:rw" "${panel}/cert/:/root/cert:rw"
"${xlib.dirs.services-mnt-folder}/containers/3x-ui/db/:/etc/x-ui:rw" "${panel}/db/:/etc/x-ui:rw"
]; ];
log-driver = "journald"; log-driver = "journald";
extraOptions = [ extraOptions = [
@@ -97,13 +100,13 @@
}; };
# Folders # Folders
tmpfiles.rules = [ tmpfiles.rules = [
"d /mnt 0755 root root -" "d ${xlib.dirs.services-mnt-folder} 0755 root root -"
"d /mnt/services 0755 root root -" "d ${xlib.dirs.services-nodes-folder} 0755 root root -"
"d /mnt/services/containers 0755 root root -" "d ${xlib.dirs.services-nodes-folder}/${xlib.device.hostname} 0755 root root -"
"d /mnt/services/containers/3x-ui 0755 root root -" "d ${panel} 0755 root root -"
"d /mnt/services/containers/3x-ui/cert 0755 root root -" "d ${panel}/db 0755 root root -"
"d /mnt/services/containers/3x-ui/db 0755 root root -" "d ${panel}/cert 0755 root root -"
"Z /mnt/services/containers/3x-ui 0755 root root -" "Z ${panel} 0755 root root -"
]; ];
}; };
modules/options.nix
+5
View File
@@ -118,6 +118,11 @@
default = "/mnt/services"; default = "/mnt/services";
description = "All services folder."; description = "All services folder.";
}; };
services-nodes-folder = lib.mkOption {
type = lib.types.str;
default = "${config.xlib.dirs.services-mnt-folder}/nodes";
description = "All nodes folder.";
};
postgresql-folder = lib.mkOption { postgresql-folder = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "${config.xlib.dirs.services-mnt-folder}/postgresql"; default = "${config.xlib.dirs.services-mnt-folder}/postgresql";
modules/server/calibre-web.nix
+1 -1
View File
@@ -13,7 +13,7 @@ in
{ {
services = { services = {
calibre-web = { calibre-web = {
package = stable.calibre-web; # package = stable.calibre-web;
enable = true; enable = true;
# dataDir = "${xlib.dirs.services-mnt-folder}/calibre-web"; # dataDir = "${xlib.dirs.services-mnt-folder}/calibre-web";
options = { options = {
modules/server/navidrome.nix
+12 -1
View File
@@ -15,8 +15,19 @@
settings = { settings = {
Address = "0.0.0.0"; Address = "0.0.0.0";
Port = 4533; Port = 4533;
MusicFolder = "/mnt/beets/music"; MusicFolder = "${xlib.dirs.server-home}/Music";
}; };
}; };
}; };
# systemd.mounts = [
# {
# enable = true;
# options = "bind,x-systemd.automount,nofail";
# requires = [ "local-fs.target" ];
# type = "none";
# wantedBy = [ "multi-user.target" ];
# what = "${xlib.dirs.server-home}/Music";
# where = "/home/${xlib.device.username}/.config/beets";
# }
# ];
} }
modules/server/power.nix
-6
View File
@@ -13,10 +13,4 @@
power-profiles-daemon.enable = lib.mkForce false; power-profiles-daemon.enable = lib.mkForce false;
throttled.enable = false; throttled.enable = false;
}; };
environment = {
systemPackages = with pkgs; [
cpupower-gui
];
};
} }
modules/vds/systemd.nix
+2 -2
View File
@@ -8,8 +8,8 @@
let let
serviceName = "rsync-services-sync"; serviceName = "rsync-services-sync";
serverAddress = "oqyude@100.64.0.0"; serverAddress = "oqyude@100.64.0.0";
serverDir = "/mnt/services/nodes/vds"; serverDir = "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}";
nodeDir = "/mnt/services"; nodeDir = "${xlib.dirs.services-mnt-folder}";
in in
{ {
systemd = { systemd = {