diff --git a/configurations/server.nix b/configurations/server.nix index 1f9c505..1baa5dd 100644 --- a/configurations/server.nix +++ b/configurations/server.nix @@ -82,8 +82,7 @@ let throttled.enable = true; journald = { extraConfig = '' - - SystemMaxUse=512M + SystemMaxUse=512M ''; }; openssh = { diff --git a/configurations/vds.nix b/configurations/vds.nix index 21582e6..d283020 100644 --- a/configurations/vds.nix +++ b/configurations/vds.nix @@ -44,8 +44,7 @@ let preload.enable = true; journald = { extraConfig = '' - - SystemMaxUse=512M + SystemMaxUse=512M ''; }; samba = { diff --git a/configurations/wsl.nix b/configurations/wsl.nix index 87a95d7..a1c78f1 100644 --- a/configurations/wsl.nix +++ b/configurations/wsl.nix @@ -24,8 +24,7 @@ let services = { journald = { extraConfig = '' - - SystemMaxUse=512M +SystemMaxUse=512M ''; }; earlyoom.enable = true; diff --git a/modules/essentials/settings.nix b/modules/essentials/settings.nix index 91eab87..0170511 100644 --- a/modules/essentials/settings.nix +++ b/modules/essentials/settings.nix @@ -36,12 +36,11 @@ polkit = { enable = true; extraConfig = '' - - polkit.addRule(function(action, subject) { - if (subject.isInGroup("wheel")){ // for sudo - return polkit.Result.YES; - } - }); +polkit.addRule(function(action, subject) { + if (subject.isInGroup("wheel")){ // for sudo + return polkit.Result.YES; + } +}); ''; }; }; diff --git a/modules/essentials/tty.nix b/modules/essentials/tty.nix index 1847325..711cd88 100644 --- a/modules/essentials/tty.nix +++ b/modules/essentials/tty.nix @@ -19,10 +19,9 @@ theme = "robbyrussell"; }; shellInit = '' - - beetn() { - echo "$*" | aichat -cer beets - } +beetn() { + echo "$*" | aichat -cer beets +} ''; shellAliases = { # shell diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix index 9d06cd3..64e2709 100644 --- a/modules/server/nextcloud.nix +++ b/modules/server/nextcloud.nix @@ -153,11 +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 89caffd..0c74ad1 100644 --- a/modules/server/systemd.nix +++ b/modules/server/systemd.nix @@ -14,8 +14,7 @@ #after = [ ]; 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"; diff --git a/modules/services/zapret.nix b/modules/services/zapret.nix index a415853..14c046c 100644 --- a/modules/services/zapret.nix +++ b/modules/services/zapret.nix @@ -36,19 +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 77f12b4..7891061 100644 --- a/modules/vds/3x-ui.nix +++ b/modules/vds/3x-ui.nix @@ -64,9 +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 cb37320..7b34dc2 100644 --- a/modules/vds/nginx.nix +++ b/modules/vds/nginx.nix @@ -25,8 +25,7 @@ in proxyWebsockets = true; }; extraConfig = '' - - client_max_body_size 5G; +client_max_body_size 5G; ''; }; # "node-red.zeroq.ru" = { @@ -47,9 +46,8 @@ in # kTLS = true; locations."/.well-known/discord" = { extraConfig = '' - - default_type text/plain; - return 200 "dh=c2d103553a4cfdaa1b7952a87a7d8120a1e167cc"; +default_type text/plain; +return 200 "dh=c2d103553a4cfdaa1b7952a87a7d8120a1e167cc"; ''; }; }; @@ -62,8 +60,7 @@ in proxyWebsockets = true; }; extraConfig = '' - - client_max_body_size 5G; +client_max_body_size 5G; ''; }; "office.zeroq.ru" = { @@ -77,11 +74,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" = { @@ -93,8 +89,7 @@ in proxyWebsockets = true; }; extraConfig = '' - - client_max_body_size 5G; +client_max_body_size 5G; ''; }; "nextcloud.zeroq.ru" = { @@ -116,8 +111,7 @@ in # }; }; extraConfig = '' - - client_max_body_size 5G; +client_max_body_size 5G; ''; }; "calibre.zeroq.ru" = { @@ -129,8 +123,7 @@ in proxyWebsockets = true; }; extraConfig = '' - - client_max_body_size 5G; +client_max_body_size 5G; ''; }; "pdf.zeroq.ru" = { @@ -142,8 +135,7 @@ in proxyWebsockets = true; }; extraConfig = '' - - client_max_body_size 5G; +client_max_body_size 5G; ''; }; "ai.zeroq.ru" = { @@ -154,8 +146,7 @@ in proxyWebsockets = true; }; extraConfig = '' - - client_max_body_size 5G; +client_max_body_size 5G; ''; }; };