mirror of
https://github.com/oqyude/nixos.git
synced 2026-06-11 04:30:41 +03:00
Merge branch 'master' of github.com:oqyude/nixos
This commit is contained in:
@@ -24,7 +24,7 @@ let
|
|||||||
services = {
|
services = {
|
||||||
journald = {
|
journald = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
SystemMaxUse=512M
|
SystemMaxUse=512M
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
earlyoom.enable = true;
|
earlyoom.enable = true;
|
||||||
|
|||||||
@@ -36,11 +36,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;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
theme = "robbyrussell";
|
theme = "robbyrussell";
|
||||||
};
|
};
|
||||||
shellInit = ''
|
shellInit = ''
|
||||||
beetn() {
|
beetn() {
|
||||||
echo "$*" | aichat -cer beets
|
echo "$*" | aichat -cer beets
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
# shell
|
# shell
|
||||||
|
|||||||
@@ -153,10 +153,10 @@ 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 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 = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
#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}/ ${xlib.dirs.archive-drive}/Services/
|
${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/ ${xlib.dirs.archive-drive}/Services/
|
||||||
'';
|
'';
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
|
|||||||
@@ -36,16 +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";
|
||||||
|
|||||||
@@ -64,8 +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 .
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+13
-13
@@ -25,7 +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" = {
|
||||||
@@ -46,8 +46,8 @@ client_max_body_size 5G;
|
|||||||
# kTLS = true;
|
# kTLS = true;
|
||||||
locations."/.well-known/discord" = {
|
locations."/.well-known/discord" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
default_type text/plain;
|
default_type text/plain;
|
||||||
return 200 "dh=c2d103553a4cfdaa1b7952a87a7d8120a1e167cc";
|
return 200 "dh=c2d103553a4cfdaa1b7952a87a7d8120a1e167cc";
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -60,7 +60,7 @@ return 200 "dh=c2d103553a4cfdaa1b7952a87a7d8120a1e167cc";
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"office.zeroq.ru" = {
|
"office.zeroq.ru" = {
|
||||||
@@ -74,10 +74,10 @@ client_max_body_size 5G;
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
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" = {
|
||||||
@@ -89,7 +89,7 @@ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"nextcloud.zeroq.ru" = {
|
"nextcloud.zeroq.ru" = {
|
||||||
@@ -111,7 +111,7 @@ client_max_body_size 5G;
|
|||||||
# };
|
# };
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"calibre.zeroq.ru" = {
|
"calibre.zeroq.ru" = {
|
||||||
@@ -123,7 +123,7 @@ client_max_body_size 5G;
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"pdf.zeroq.ru" = {
|
"pdf.zeroq.ru" = {
|
||||||
@@ -135,7 +135,7 @@ client_max_body_size 5G;
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"ai.zeroq.ru" = {
|
"ai.zeroq.ru" = {
|
||||||
@@ -146,7 +146,7 @@ client_max_body_size 5G;
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user