From 48bd82b30f1f812617c1d372c7d5029679330b1b Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Wed, 8 Oct 2025 21:30:48 +0300
Subject: [PATCH] 123

---
 nixosModules/essentials/settings.nix | 11 +++++------
 nixosModules/essentials/tty.nix      |  3 +++
 nixosModules/server/systemd.nix      |  9 ++++-----
 nixosModules/services/zapret.nix     |  9 +++------
 nixosModules/vds/3x-ui.nix           |  5 ++---
 nixosModules/vds/nginx.nix           | 27 ++++++++++-----------------
 6 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/nixosModules/essentials/settings.nix b/nixosModules/essentials/settings.nix
index 40ea886..82558ed 100755
--- a/nixosModules/essentials/settings.nix
+++ b/nixosModules/essentials/settings.nix
@@ -34,12 +34,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/nixosModules/essentials/tty.nix b/nixosModules/essentials/tty.nix
index d15f894..559af7b 100755
--- a/nixosModules/essentials/tty.nix
+++ b/nixosModules/essentials/tty.nix
@@ -29,6 +29,9 @@
       l = "ls -l";
       lg = "lazygit";
       st = "systemctl-tui";
+      gp = "git pull";
+      ns = "nh os switch";
+      gp-ns = "gp && ns";
 
       # ssh
       z-s = "ssh sapphira";
diff --git a/nixosModules/server/systemd.nix b/nixosModules/server/systemd.nix
index 5d5013f..e19b0a5 100755
--- a/nixosModules/server/systemd.nix
+++ b/nixosModules/server/systemd.nix
@@ -13,11 +13,10 @@
       #after = [ ];
       requisite = [ "mnt-archive.mount" ]; # hard-code
       script = ''
-        
-                ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/immich/ ${xlib.dirs.archive-drive}/Services/immich/
-                ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/nextcloud/ ${xlib.dirs.archive-drive}/Services/nextcloud/
-                ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/node-red/ ${xlib.dirs.archive-drive}/Services/node-red/
-                ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/uptime-kuma/ ${xlib.dirs.archive-drive}/Services/node-red/
+        ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/immich/ ${xlib.dirs.archive-drive}/Services/immich/
+        ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/nextcloud/ ${xlib.dirs.archive-drive}/Services/nextcloud/
+        ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/node-red/ ${xlib.dirs.archive-drive}/Services/node-red/
+        ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/uptime-kuma/ ${xlib.dirs.archive-drive}/Services/node-red/
       '';
       serviceConfig = {
         Type = "oneshot";
diff --git a/nixosModules/services/zapret.nix b/nixosModules/services/zapret.nix
index 2c8799c..6ca32fd 100644
--- a/nixosModules/services/zapret.nix
+++ b/nixosModules/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/nixosModules/vds/3x-ui.nix b/nixosModules/vds/3x-ui.nix
index abc8e3b..ac583ca 100644
--- a/nixosModules/vds/3x-ui.nix
+++ b/nixosModules/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/nixosModules/vds/nginx.nix b/nixosModules/vds/nginx.nix
index 404fae3..eb8437e 100755
--- a/nixosModules/vds/nginx.nix
+++ b/nixosModules/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" = {
@@ -50,8 +49,7 @@ in
             proxyWebsockets = true;
           };
           extraConfig = ''
-            
-                        client_max_body_size 5G;
+            client_max_body_size 5G;
           '';
         };
         "office.zeroq.ru" = {
@@ -65,11 +63,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" = {
@@ -81,8 +78,7 @@ in
             proxyWebsockets = true;
           };
           extraConfig = ''
-            
-                        client_max_body_size 5G;
+            client_max_body_size 5G;
           '';
         };
         "nextcloud.zeroq.ru" = {
@@ -104,8 +100,7 @@ in
             # };
           };
           extraConfig = ''
-            
-                        client_max_body_size 5G;
+            client_max_body_size 5G;
           '';
         };
         "calibre.zeroq.ru" = {
@@ -117,8 +112,7 @@ in
             proxyWebsockets = true;
           };
           extraConfig = ''
-            
-                        client_max_body_size 5G;
+            client_max_body_size 5G;
           '';
         };
         "pdf.zeroq.ru" = {
@@ -130,8 +124,7 @@ in
             proxyWebsockets = true;
           };
           extraConfig = ''
-            
-                        client_max_body_size 5G;
+            client_max_body_size 5G;
           '';
         };
         # "llm.zeroq.ru" = {