diff --git a/configurations/wsl.nix b/configurations/wsl.nix index a1c78f1..89b36aa 100644 --- a/configurations/wsl.nix +++ b/configurations/wsl.nix @@ -24,7 +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 0170511..b2c8947 100644 --- a/modules/essentials/settings.nix +++ b/modules/essentials/settings.nix @@ -36,11 +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 711cd88..e03974e 100644 --- a/modules/essentials/tty.nix +++ b/modules/essentials/tty.nix @@ -19,9 +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 64e2709..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 0c74ad1..f2a8348 100644 --- a/modules/server/systemd.nix +++ b/modules/server/systemd.nix @@ -14,7 +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 14c046c..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 7891061..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 7b34dc2..c1c2928 100644 --- a/modules/vds/nginx.nix +++ b/modules/vds/nginx.nix @@ -25,7 +25,7 @@ in proxyWebsockets = true; }; extraConfig = '' -client_max_body_size 5G; + client_max_body_size 5G; ''; }; # "node-red.zeroq.ru" = { @@ -46,8 +46,8 @@ client_max_body_size 5G; # kTLS = true; locations."/.well-known/discord" = { extraConfig = '' -default_type text/plain; -return 200 "dh=c2d103553a4cfdaa1b7952a87a7d8120a1e167cc"; + default_type text/plain; + return 200 "dh=c2d103553a4cfdaa1b7952a87a7d8120a1e167cc"; ''; }; }; @@ -60,7 +60,7 @@ return 200 "dh=c2d103553a4cfdaa1b7952a87a7d8120a1e167cc"; proxyWebsockets = true; }; extraConfig = '' -client_max_body_size 5G; + client_max_body_size 5G; ''; }; "office.zeroq.ru" = { @@ -74,10 +74,10 @@ client_max_body_size 5G; }; }; 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" = { @@ -89,7 +89,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxyWebsockets = true; }; extraConfig = '' -client_max_body_size 5G; + client_max_body_size 5G; ''; }; "nextcloud.zeroq.ru" = { @@ -111,7 +111,7 @@ client_max_body_size 5G; # }; }; extraConfig = '' -client_max_body_size 5G; + client_max_body_size 5G; ''; }; "calibre.zeroq.ru" = { @@ -123,7 +123,7 @@ client_max_body_size 5G; proxyWebsockets = true; }; extraConfig = '' -client_max_body_size 5G; + client_max_body_size 5G; ''; }; "pdf.zeroq.ru" = { @@ -135,7 +135,7 @@ client_max_body_size 5G; proxyWebsockets = true; }; extraConfig = '' -client_max_body_size 5G; + client_max_body_size 5G; ''; }; "ai.zeroq.ru" = { @@ -146,7 +146,7 @@ client_max_body_size 5G; proxyWebsockets = true; }; extraConfig = '' -client_max_body_size 5G; + client_max_body_size 5G; ''; }; };