123

configurations/server.nix

@@ -82,7 +82,6 @@ let
         throttled.enable = true;
         journald = {
           extraConfig = ''
-            
             SystemMaxUse=512M
           '';
         };

configurations/vds.nix

@@ -44,7 +44,6 @@ let
         preload.enable = true;
         journald = {
           extraConfig = ''
-            
             SystemMaxUse=512M
           '';
         };

configurations/wsl.nix

@@ -24,8 +24,7 @@ let
       services = {
         journald = {
           extraConfig = ''
-            
+SystemMaxUse=512M
-                        SystemMaxUse=512M
           '';
         };
         earlyoom.enable = true;

modules/essentials/settings.nix

@@ -36,12 +36,11 @@
     polkit = {
       enable = true;
       extraConfig = ''
-        
+polkit.addRule(function(action, subject) {
-                polkit.addRule(function(action, subject) {
   if (subject.isInGroup("wheel")){ // for sudo
       return polkit.Result.YES;
   }
-                });
+});
       '';
     };
   };

modules/essentials/tty.nix

@@ -19,10 +19,9 @@
       theme = "robbyrussell";
     };
     shellInit = ''
-      
+beetn() {
-            beetn() {
   echo "$*" | aichat -cer beets
-            }
+}
     '';
     shellAliases = {
       # shell

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 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 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 config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist}
+${occ}/bin/nextcloud-occ richdocuments:setup
-                ${occ}/bin/nextcloud-occ richdocuments:setup
       '';
       serviceConfig = {
         Type = "oneshot";

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";

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";

modules/vds/3x-ui.nix

@@ -64,9 +64,8 @@
       TimeoutSec = 300;
     };
     script = ''
-      
+cd /mnt/containers/3x-ui
-            cd /mnt/containers/3x-ui
+podman build -t compose2nix/3xui_app -f ./Dockerfile .
-            podman build -t compose2nix/3xui_app -f ./Dockerfile .
     '';
   };
 

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;
-                            default_type text/plain;
+return 200 "dh=c2d103553a4cfdaa1b7952a87a7d8120a1e167cc";
-                            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;
-                        client_max_body_size 5G;
+proxy_set_header X-Forwarded-Proto $scheme;
-                        proxy_set_header X-Forwarded-Proto $scheme;
+proxy_set_header X-Real-IP $remote_addr;
-                        proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                        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;
           '';
         };
       };