This commit is contained in:
2025-10-08 21:30:48 +03:00
parent 99b35f6045
commit 48bd82b30f
6 changed files with 27 additions and 37 deletions
+5 -6
View File
@@ -34,12 +34,11 @@
polkit = { polkit = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''
polkit.addRule(function(action, subject) {
polkit.addRule(function(action, subject) { if (subject.isInGroup("wheel")){ // for sudo
if (subject.isInGroup("wheel")){ // for sudo return polkit.Result.YES;
return polkit.Result.YES; }
} });
});
''; '';
}; };
}; };
+3
View File
@@ -29,6 +29,9 @@
l = "ls -l"; l = "ls -l";
lg = "lazygit"; lg = "lazygit";
st = "systemctl-tui"; st = "systemctl-tui";
gp = "git pull";
ns = "nh os switch";
gp-ns = "gp && ns";
# ssh # ssh
z-s = "ssh sapphira"; z-s = "ssh sapphira";
+4 -5
View File
@@ -13,11 +13,10 @@
#after = [ ]; #after = [ ];
requisite = [ "mnt-archive.mount" ]; # hard-code requisite = [ "mnt-archive.mount" ]; # hard-code
script = '' 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}/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}/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}/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}/uptime-kuma/ ${xlib.dirs.archive-drive}/Services/node-red/
''; '';
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
+3 -6
View File
@@ -36,19 +36,16 @@
WorkingDirectory = "${xlib.dirs.user-services}/zapret"; WorkingDirectory = "${xlib.dirs.user-services}/zapret";
User = "root"; User = "root";
ExecStart = '' 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 = '' 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 = '' # ExecStopPost = ''
# /run/current-system/sw/bin/echo "Сервис завершён" # /run/current-system/sw/bin/echo "Сервис завершён"
# ''; # '';
PIDFile = '' PIDFile = ''
/run/zapret_discord_youtube.pid
/run/zapret_discord_youtube.pid
''; '';
# Restart = "on-failure"; # Restart = "on-failure";
# RestartSec = "5s"; # RestartSec = "5s";
+2 -3
View File
@@ -64,9 +64,8 @@
TimeoutSec = 300; TimeoutSec = 300;
}; };
script = '' 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 .
''; '';
}; };
+10 -17
View File
@@ -25,8 +25,7 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
client_max_body_size 5G;
''; '';
}; };
# "node-red.zeroq.ru" = { # "node-red.zeroq.ru" = {
@@ -50,8 +49,7 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
client_max_body_size 5G;
''; '';
}; };
"office.zeroq.ru" = { "office.zeroq.ru" = {
@@ -65,11 +63,10 @@ in
}; };
}; };
extraConfig = '' 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; ''; # absolute_redirect off;
}; };
"immich.zeroq.ru" = { "immich.zeroq.ru" = {
@@ -81,8 +78,7 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
client_max_body_size 5G;
''; '';
}; };
"nextcloud.zeroq.ru" = { "nextcloud.zeroq.ru" = {
@@ -104,8 +100,7 @@ in
# }; # };
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
client_max_body_size 5G;
''; '';
}; };
"calibre.zeroq.ru" = { "calibre.zeroq.ru" = {
@@ -117,8 +112,7 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
client_max_body_size 5G;
''; '';
}; };
"pdf.zeroq.ru" = { "pdf.zeroq.ru" = {
@@ -130,8 +124,7 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
client_max_body_size 5G;
''; '';
}; };
# "llm.zeroq.ru" = { # "llm.zeroq.ru" = {