This commit is contained in:
2025-10-07 16:36:50 +03:00
parent 2c865de832
commit 34e46a34d3
15 changed files with 3828 additions and 3809 deletions
+2 -1
View File
@@ -44,7 +44,8 @@ let
preload.enable = true; preload.enable = true;
journald = { journald = {
extraConfig = '' extraConfig = ''
SystemMaxUse=512M
SystemMaxUse=512M
''; '';
}; };
samba = { samba = {
+2 -1
View File
@@ -82,7 +82,8 @@ let
throttled.enable = true; throttled.enable = true;
journald = { journald = {
extraConfig = '' extraConfig = ''
SystemMaxUse=512M
SystemMaxUse=512M
''; '';
}; };
openssh = { openssh = {
+2 -1
View File
@@ -44,7 +44,8 @@ let
preload.enable = true; preload.enable = true;
journald = { journald = {
extraConfig = '' extraConfig = ''
SystemMaxUse=512M
SystemMaxUse=512M
''; '';
}; };
samba = { samba = {
+2 -1
View File
@@ -24,7 +24,8 @@ let
services = { services = {
journald = { journald = {
extraConfig = '' extraConfig = ''
SystemMaxUse=512M
SystemMaxUse=512M
''; '';
}; };
earlyoom.enable = true; earlyoom.enable = true;
+6 -5
View File
@@ -34,11 +34,12 @@
polkit = { polkit = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''
polkit.addRule(function(action, subject) {
if (subject.isInGroup("wheel")){ // for sudo polkit.addRule(function(action, subject) {
return polkit.Result.YES; if (subject.isInGroup("wheel")){ // for sudo
} return polkit.Result.YES;
}); }
});
''; '';
}; };
}; };
+9 -8
View File
@@ -19,9 +19,10 @@
theme = "robbyrussell"; theme = "robbyrussell";
}; };
shellInit = '' shellInit = ''
beetn() {
echo "$*" | aichat -cer beets beetn() {
} echo "$*" | aichat -cer beets
}
''; '';
shellAliases = { shellAliases = {
# shell # shell
@@ -31,11 +32,11 @@
st = "systemctl-tui"; st = "systemctl-tui";
# ssh # ssh
z-s="ssh sapphira"; z-s = "ssh sapphira";
z-st="ssh sapphira-tailscale"; z-st = "ssh sapphira-tailscale";
z-o="ssh otreca"; z-o = "ssh otreca";
z-ot="ssh otreca-tailscale"; z-ot = "ssh otreca-tailscale";
z-p-1="ssh pubray-1"; z-p-1 = "ssh pubray-1";
# Somethings # Somethings
reboot-bios = "sudo systemctl reboot --firmware-setup"; reboot-bios = "sudo systemctl reboot --firmware-setup";
+5 -4
View File
@@ -142,10 +142,11 @@ in
]; ];
requires = [ "coolwsd.service" ]; requires = [ "coolwsd.service" ];
script = '' 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_url --value ${lib.escapeShellArg 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 public_wopi_url --value ${lib.escapeShellArg public_wopi_url}
${occ}/bin/nextcloud-occ richdocuments:setup ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist}
${occ}/bin/nextcloud-occ richdocuments:setup
''; '';
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
+5 -4
View File
@@ -13,10 +13,11 @@
#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}/nextcloud/ ${xlib.dirs.archive-drive}/Services/nextcloud/ ${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}/node-red/ ${xlib.dirs.archive-drive}/Services/node-red/ ${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}/uptime-kuma/ ${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/
''; '';
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
+6 -3
View File
@@ -36,16 +36,19 @@
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";
+3 -2
View File
@@ -64,8 +64,9 @@
TimeoutSec = 300; TimeoutSec = 300;
}; };
script = '' 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 .
''; '';
}; };
+17 -10
View File
@@ -25,7 +25,8 @@ 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" = {
@@ -49,7 +50,8 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
client_max_body_size 5G;
''; '';
}; };
"office.zeroq.ru" = { "office.zeroq.ru" = {
@@ -63,10 +65,11 @@ in
}; };
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
proxy_set_header X-Forwarded-Proto $scheme; client_max_body_size 5G;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
''; # absolute_redirect off; ''; # absolute_redirect off;
}; };
"immich.zeroq.ru" = { "immich.zeroq.ru" = {
@@ -78,7 +81,8 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
client_max_body_size 5G;
''; '';
}; };
"nextcloud.zeroq.ru" = { "nextcloud.zeroq.ru" = {
@@ -100,7 +104,8 @@ in
# }; # };
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
client_max_body_size 5G;
''; '';
}; };
"calibre.zeroq.ru" = { "calibre.zeroq.ru" = {
@@ -112,7 +117,8 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
client_max_body_size 5G;
''; '';
}; };
"pdf.zeroq.ru" = { "pdf.zeroq.ru" = {
@@ -124,7 +130,8 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G;
client_max_body_size 5G;
''; '';
}; };
# "llm.zeroq.ru" = { # "llm.zeroq.ru" = {