mirror of
https://github.com/oqyude/nixos.git
synced 2026-06-15 06:30:10 +03:00
123
This commit is contained in:
@@ -95,6 +95,7 @@ let
|
|||||||
throttled.enable = true;
|
throttled.enable = true;
|
||||||
journald = {
|
journald = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
SystemMaxUse=512M
|
SystemMaxUse=512M
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ let
|
|||||||
earlyoom.enable = true;
|
earlyoom.enable = true;
|
||||||
journald = {
|
journald = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
SystemMaxUse=512M
|
SystemMaxUse=512M
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ let
|
|||||||
services = {
|
services = {
|
||||||
journald = {
|
journald = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
SystemMaxUse=512M
|
SystemMaxUse=512M
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -117,5 +117,6 @@
|
|||||||
// (import ./deploy flakeContext)
|
// (import ./deploy flakeContext)
|
||||||
// (import ./home flakeContext)
|
// (import ./home flakeContext)
|
||||||
// (import ./modules flakeContext)
|
// (import ./modules flakeContext)
|
||||||
|
// (import ./overlays flakeContext)
|
||||||
// (import ./pkgs flakeContext);
|
// (import ./pkgs flakeContext);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ let
|
|||||||
disko.nixosModules.disko # disko module
|
disko.nixosModules.disko # disko module
|
||||||
nixvim.nixosModules.nixvim # nixvim module
|
nixvim.nixosModules.nixvim # nixvim module
|
||||||
];
|
];
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
inputs.self.nixosOverlays.default
|
||||||
|
];
|
||||||
_module.args = {
|
_module.args = {
|
||||||
inputs = inputs;
|
inputs = inputs;
|
||||||
xlib = config.xlib;
|
xlib = config.xlib;
|
||||||
|
|||||||
@@ -97,6 +97,7 @@ in
|
|||||||
nano = {
|
nano = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nanorc = ''
|
nanorc = ''
|
||||||
|
|
||||||
set nowrap
|
set nowrap
|
||||||
set tabstospaces
|
set tabstospaces
|
||||||
set tabsize 2
|
set tabsize 2
|
||||||
|
|||||||
@@ -38,6 +38,7 @@
|
|||||||
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,6 +19,7 @@
|
|||||||
theme = "robbyrussell";
|
theme = "robbyrussell";
|
||||||
};
|
};
|
||||||
shellInit = ''
|
shellInit = ''
|
||||||
|
|
||||||
beet-n() {
|
beet-n() {
|
||||||
echo "$*" | aichat -cer beets
|
echo "$*" | aichat -cer beets
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -153,6 +153,7 @@ 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}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
description = "Backup data using rsync";
|
description = "Backup data using rsync";
|
||||||
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 = {
|
||||||
@@ -28,6 +29,7 @@
|
|||||||
description = "Backup data using rsync";
|
description = "Backup data using rsync";
|
||||||
requisite = [ "mnt-mobile.mount" ]; # hard-code
|
requisite = [ "mnt-mobile.mount" ]; # hard-code
|
||||||
script = ''
|
script = ''
|
||||||
|
|
||||||
${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.server-home}/Music/ ${xlib.dirs.mobile-drive}/Music/
|
${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.server-home}/Music/ ${xlib.dirs.mobile-drive}/Music/
|
||||||
${pkgs.rsync}/bin/rsync -rtv --delete "${xlib.dirs.server-home}/Hosts/epral/Neo Backup/" "${xlib.dirs.mobile-drive}/Neo Backup/"
|
${pkgs.rsync}/bin/rsync -rtv --delete "${xlib.dirs.server-home}/Hosts/epral/Neo Backup/" "${xlib.dirs.mobile-drive}/Neo Backup/"
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -36,15 +36,18 @@
|
|||||||
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";
|
||||||
|
|||||||
@@ -64,6 +64,7 @@
|
|||||||
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 .
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ in
|
|||||||
root = "${inputs.zeroq-credentials.services.xray.subs}";
|
root = "${inputs.zeroq-credentials.services.xray.subs}";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
auth_basic "Restricted";
|
auth_basic "Restricted";
|
||||||
auth_basic_user_file /etc/nginx/pubray;
|
auth_basic_user_file /etc/nginx/pubray;
|
||||||
|
|
||||||
@@ -40,6 +41,7 @@ in
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@@ -73,6 +75,7 @@ in
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@@ -86,6 +89,7 @@ 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;
|
||||||
@@ -100,6 +104,7 @@ in
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@@ -117,6 +122,7 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@@ -128,6 +134,7 @@ in
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@@ -139,6 +146,7 @@ in
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@@ -150,6 +158,7 @@ in
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
client_max_body_size 5G;
|
client_max_body_size 5G;
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{ inputs, ... }@flakeContext:
|
||||||
|
{
|
||||||
|
nixosOverlays = {
|
||||||
|
default = import ./pkgs.nix flakeContext;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
{ inputs, ... }:
|
||||||
|
|
||||||
|
self: super: {
|
||||||
|
yazi = super.yazi.overrideDerivation (old: {
|
||||||
|
passthru = (old.passthru or { }) // {
|
||||||
|
configHome = configHome;
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@ let
|
|||||||
unpackZigArtifact =
|
unpackZigArtifact =
|
||||||
{ name, artifact }:
|
{ name, artifact }:
|
||||||
runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
|
runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
|
||||||
|
|
||||||
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
|
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
|
||||||
mv "$TMPDIR/p/$hash" "$out"
|
mv "$TMPDIR/p/$hash" "$out"
|
||||||
chmod 755 "$out"
|
chmod 755 "$out"
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
hash = "sha256-868FK3wr/fjXzrQJ4YVDBvzNuX818lufEx/K0fvJdWo=";
|
hash = "sha256-868FK3wr/fjXzrQJ4YVDBvzNuX818lufEx/K0fvJdWo=";
|
||||||
};
|
};
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
||||||
ln -s ${
|
ln -s ${
|
||||||
callPackage ./build.zig.zon.nix {
|
callPackage ./build.zig.zon.nix {
|
||||||
zig = zig_0_15;
|
zig = zig_0_15;
|
||||||
|
|||||||
Reference in New Issue
Block a user