From 292840f1fb2a09cd2d9de42dee12cd18db9208e6 Mon Sep 17 00:00:00 2001 From: oqyude Date: Thu, 15 Jan 2026 20:43:03 +0300 Subject: [PATCH] 123 --- modules/essentials/shell.nix | 18 +++++++++--------- modules/server/nextcloud.nix | 8 ++++---- modules/server/systemd.nix | 6 +++--- modules/services/zapret.nix | 6 +++--- modules/vds/3x-ui.nix | 4 ++-- modules/vds/nginx.nix | 32 ++++++++++++++++---------------- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/modules/essentials/shell.nix b/modules/essentials/shell.nix index a83b63c..10df048 100644 --- a/modules/essentials/shell.nix +++ b/modules/essentials/shell.nix @@ -19,15 +19,15 @@ theme = "robbyrussell"; }; shellInit = '' - beet-n() { - echo "$*" | aichat -cer beets - } - beet-p() { - beet mod path:. playlist="$*" - } - beet-ims() { - beet im ./ -S $* - } + beet-n() { + echo "$*" | aichat -cer beets + } + beet-p() { + beet mod path:. playlist="$*" + } + beet-ims() { + beet im ./ -S $* + } ''; shellAliases = { # shell diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix index db86810..d77f163 100644 --- a/modules/server/nextcloud.nix +++ b/modules/server/nextcloud.nix @@ -153,10 +153,10 @@ in ]; requires = [ "coolwsd.service" ]; script = '' - ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url} - ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url} - ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist} - ${occ}/bin/nextcloud-occ richdocuments:setup + ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url} + ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url} + ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist} + ${occ}/bin/nextcloud-occ richdocuments:setup ''; serviceConfig = { Type = "oneshot"; diff --git a/modules/server/systemd.nix b/modules/server/systemd.nix index b640ae0..6301250 100644 --- a/modules/server/systemd.nix +++ b/modules/server/systemd.nix @@ -13,7 +13,7 @@ description = "Backup data using rsync"; requisite = [ "mnt-archive.mount" ]; # hard-code script = '' - ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/ ${xlib.dirs.archive-drive}/Services/ + ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/ ${xlib.dirs.archive-drive}/Services/ ''; serviceConfig = { Type = "oneshot"; @@ -28,8 +28,8 @@ description = "Backup data using rsync"; requisite = [ "mnt-mobile.mount" ]; # hard-code script = '' - ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.server-home}/Music/ ${xlib.dirs.mobile-drive}/Music/ - ${pkgs.rsync}/bin/rsync -rtv --delete "${xlib.dirs.server-home}/Hosts/epral/Neo Backup/" "${xlib.dirs.mobile-drive}/Neo Backup/" + ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.server-home}/Music/ ${xlib.dirs.mobile-drive}/Music/ + ${pkgs.rsync}/bin/rsync -rtv --delete "${xlib.dirs.server-home}/Hosts/epral/Neo Backup/" "${xlib.dirs.mobile-drive}/Neo Backup/" ''; serviceConfig = { Type = "oneshot"; diff --git a/modules/services/zapret.nix b/modules/services/zapret.nix index e231f1e..6ca32fd 100644 --- a/modules/services/zapret.nix +++ b/modules/services/zapret.nix @@ -36,16 +36,16 @@ WorkingDirectory = "${xlib.dirs.user-services}/zapret"; User = "root"; ExecStart = '' - /run/current-system/sw/bin/bash ${xlib.dirs.user-services}/zapret/main_script.sh -nointeractive + /run/current-system/sw/bin/bash ${xlib.dirs.user-services}/zapret/main_script.sh -nointeractive ''; ExecStop = '' - /run/current-system/sw/bin/bash ${xlib.dirs.user-services}/zapret/stop_and_clean_nft.sh + /run/current-system/sw/bin/bash ${xlib.dirs.user-services}/zapret/stop_and_clean_nft.sh ''; # ExecStopPost = '' # /run/current-system/sw/bin/echo "Сервис завершён" # ''; PIDFile = '' - /run/zapret_discord_youtube.pid + /run/zapret_discord_youtube.pid ''; # Restart = "on-failure"; # RestartSec = "5s"; diff --git a/modules/vds/3x-ui.nix b/modules/vds/3x-ui.nix index 3778fb7..ac583ca 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -64,8 +64,8 @@ TimeoutSec = 300; }; script = '' - cd /mnt/containers/3x-ui - podman build -t compose2nix/3xui_app -f ./Dockerfile . + cd /mnt/containers/3x-ui + podman build -t compose2nix/3xui_app -f ./Dockerfile . ''; }; diff --git a/modules/vds/nginx.nix b/modules/vds/nginx.nix index 1c7a449..1f0ad02 100644 --- a/modules/vds/nginx.nix +++ b/modules/vds/nginx.nix @@ -24,11 +24,11 @@ in root = "${inputs.zeroq-credentials.services.xray.subs}"; locations."/" = { extraConfig = '' - auth_basic "Restricted"; - auth_basic_user_file /etc/nginx/pubray; - - if ($subfile = "") { return 403; } - rewrite ^/$ $subfile break; + auth_basic "Restricted"; + auth_basic_user_file /etc/nginx/pubray; + + if ($subfile = "") { return 403; } + rewrite ^/$ $subfile break; ''; }; }; @@ -40,7 +40,7 @@ in proxyWebsockets = true; }; extraConfig = '' - client_max_body_size 5G; + client_max_body_size 5G; ''; }; # "node-red.zeroq.ru" = { @@ -73,7 +73,7 @@ in proxyWebsockets = true; }; extraConfig = '' - client_max_body_size 5G; + client_max_body_size 5G; ''; }; "office.zeroq.ru" = { @@ -86,10 +86,10 @@ in }; }; extraConfig = '' - client_max_body_size 5G; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + client_max_body_size 5G; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; ''; # absolute_redirect off; }; "immich.zeroq.ru" = { @@ -100,7 +100,7 @@ in proxyWebsockets = true; }; extraConfig = '' - client_max_body_size 5G; + client_max_body_size 5G; ''; }; "nextcloud.zeroq.ru" = { @@ -117,7 +117,7 @@ in }; }; extraConfig = '' - client_max_body_size 5G; + client_max_body_size 5G; ''; }; "calibre.zeroq.ru" = { @@ -128,7 +128,7 @@ in proxyWebsockets = true; }; extraConfig = '' - client_max_body_size 5G; + client_max_body_size 5G; ''; }; "pdf.zeroq.ru" = { @@ -139,7 +139,7 @@ in proxyWebsockets = true; }; extraConfig = '' - client_max_body_size 5G; + client_max_body_size 5G; ''; }; "ai.zeroq.ru" = { @@ -150,7 +150,7 @@ in proxyWebsockets = true; }; extraConfig = '' - client_max_body_size 5G; + client_max_body_size 5G; ''; }; };