4 Commits

Author SHA1 Message Date
NixOS Builder Bot
823c4be1e7 Weekly flake update: 2025-10-06 09:54 UTC 2025-10-06 03:54:05 -06:00
Danilo Reyes
a09d10ab90 replaced stash readonly paths with normal binds
All checks were successful
Weekly NixOS Build & Cache / build-and-cache (push) Successful in 23m49s
2025-10-05 13:12:07 -06:00
Danilo Reyes
84737df99b fix to have stash plugins work 2025-10-04 19:46:04 -06:00
Danilo Reyes
3746abd6ec rate limits + reverted keyring 2025-10-04 11:14:31 -06:00
4 changed files with 73 additions and 29 deletions

View File

@@ -4,7 +4,7 @@
cookies = [ cookies = [
"firefox" "firefox"
"/home/jawz/.librewolf/jawz" "/home/jawz/.librewolf/jawz"
"gcr_4" "gnomekeyring"
]; ];
retries = 10; retries = 10;
sleep-request = 0; sleep-request = 0;
@@ -13,6 +13,7 @@
directory = [ ]; directory = [ ];
}; };
bluesky = { bluesky = {
limit-rate = "400k-1M";
username = "blablablamagic.bsky.social"; username = "blablablamagic.bsky.social";
password = "{env[GALLERY_DL_BLUESKY_PASSWORD]}"; password = "{env[GALLERY_DL_BLUESKY_PASSWORD]}";
reposts = false; reposts = false;
@@ -49,8 +50,9 @@
]; ];
}; };
instagram = { instagram = {
limit-rate = "200k-300k";
browser = "firefox:linux"; browser = "firefox:linux";
user-agent = "Mozilla/5.0 (X11; Linux x86_64; rv:138.0) Gecko/20100101 Firefox/138.0"; user-agent = "Mozilla/5.0 (X11; Linux x86_64; rv:143.0) Gecko/20100101 Firefox/143.0";
sleep = "66-123"; sleep = "66-123";
sleep-request = "66-123"; sleep-request = "66-123";
parent-directory = true; parent-directory = true;
@@ -71,6 +73,7 @@
]; ];
}; };
kemonoparty = { kemonoparty = {
limit-rate = "200k-300k";
retries = 10; retries = 10;
timeout = 5; timeout = 5;
filename = "{id}_{filename}.{extension}"; filename = "{id}_{filename}.{extension}";
@@ -96,6 +99,7 @@
directory = [ "{blog_name}" ]; directory = [ "{blog_name}" ];
}; };
deviantart = { deviantart = {
limit-rate = "200k-300k";
refresh-token = "{env[GALLERY_DL_DEVIANTART_REFRESH_TOKEN]}"; refresh-token = "{env[GALLERY_DL_DEVIANTART_REFRESH_TOKEN]}";
include = "gallery,scraps"; include = "gallery,scraps";
flat = true; flat = true;
@@ -116,6 +120,7 @@
]; ];
}; };
patreon = { patreon = {
limit-rate = "400k-1M";
filename = "{filename}.{num}.{extension}"; filename = "{filename}.{num}.{extension}";
browser = "firefox"; browser = "firefox";
directory = [ directory = [
@@ -196,6 +201,7 @@
]; ];
}; };
readcomiconline = { readcomiconline = {
limit-rate = "400k-1M";
chapter-reverse = true; chapter-reverse = true;
quality = "hq"; quality = "hq";
captcha = "wait"; captcha = "wait";

50
flake.lock generated
View File

@@ -215,11 +215,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1756770412, "lastModified": 1759362264,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "4524271976b625a4a605beefd893f270620fd751", "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -473,11 +473,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1759530922, "lastModified": 1759674289,
"narHash": "sha256-9NgZKpibALekGTPDc2O8lP8vFealQSZkXe+L+S7MMZU=", "narHash": "sha256-k5rLyuqOpiks2nKINgPmzui1cpi03tMdabQFmITI7/w=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "76d998743ac10e712238c1016db4d8e8d16f1049", "rev": "cfac27251af5df4352f747c4539ea9f65450f05a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -666,11 +666,11 @@
"sudoku-solver": "sudoku-solver" "sudoku-solver": "sudoku-solver"
}, },
"locked": { "locked": {
"lastModified": 1759462273, "lastModified": 1759620370,
"narHash": "sha256-eQVmWzWE9gzLSqEkvURyYoqLmDeiokGbQGkYvQ58kVc=", "narHash": "sha256-GTyxqIhtDTySs8f2l8N1zoS2wEBVFfF60nMJ7jEIWn0=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "9ab256ded797f78c9e411fe186dde9410be3049d", "rev": "6aea10172155c10e63d2efb454e28b9c1e50e3a6",
"revCount": 107, "revCount": 108,
"type": "git", "type": "git",
"url": "https://git.servidos.lat/jawz/scripts.git" "url": "https://git.servidos.lat/jawz/scripts.git"
}, },
@@ -687,11 +687,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759455985, "lastModified": 1759692973,
"narHash": "sha256-8qDv7NXH3fj1CDXed7c7vJLtrRKDZSo0x6TaWSfelVg=", "narHash": "sha256-5evwJEYP5clwnDy+vX4MfAnGepxi0NaHjka7igXDU94=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "eb5ab503cbd3cb386e8d85a55a9faed73ec7dc37", "rev": "5958a54eed219604b8a0ddeef6ab48fe4029f083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -787,11 +787,11 @@
}, },
"nixpkgs-small": { "nixpkgs-small": {
"locked": { "locked": {
"lastModified": 1759499817, "lastModified": 1759652726,
"narHash": "sha256-a4OoPmarWnVUfroI/ZFFtybpwnxjfL3rO5lNCEOVK5E=", "narHash": "sha256-2VjnimOYDRb3DZHyQ2WH2KCouFqYm9h0Rr007Al/WSA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b160419b1b40637913ff7204b375e259319c42d9", "rev": "06b2985f0cc9eb4318bf607168f4b15af1e5e81d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -819,11 +819,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1759439645, "lastModified": 1759580034,
"narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=", "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "879bd460b3d3e8571354ce172128fbcbac1ed633", "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -862,11 +862,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759591752, "lastModified": 1759742154,
"narHash": "sha256-jp1vZ+XKusYThPr2fBD+eqNACAXUDKyiC/M3tB8NNPc=", "narHash": "sha256-0a89URcJm+UW01/Wooum0GZWpk0uRkp7IrNyAlZh3XY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "38a31b2183210fe4aebf48c232ed89cc624456d5", "rev": "76c75e5077c704dcf29da0cef840a9c5818abc32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -968,11 +968,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759188042, "lastModified": 1759635238,
"narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=", "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d", "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -1,7 +1,31 @@
{ lib, config, ... }: {
lib,
config,
pkgs,
...
}:
let let
cfg = config.my.servers.stash; cfg = config.my.servers.stash;
cfgS = config.services.stash;
setup = import ../factories/mkserver.nix { inherit lib config; }; setup = import ../factories/mkserver.nix { inherit lib config; };
stashPythonFHS = pkgs.buildFHSEnv {
name = "stash-python-fhs";
targetPkgs =
pkgs:
builtins.attrValues {
inherit (pkgs)
python3
gcc
glibc
;
inherit (pkgs.python3Packages)
pip
virtualenv
;
inherit (pkgs.stdenv.cc.cc) lib;
};
runScript = "bash";
};
in in
{ {
options.my.servers.stash = setup.mkOptions "stash" "xxx" 9999; options.my.servers.stash = setup.mkOptions "stash" "xxx" 9999;
@@ -29,5 +53,19 @@ in
]; ];
}; };
}; };
systemd.services.stash = {
environment = {
PYTHONPATH = "/var/lib/stash/venv/lib/python3.12/site-packages";
LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib:${pkgs.glibc}/lib:${pkgs.zlib}/lib:${pkgs.libffi}/lib:${pkgs.openssl}/lib";
};
serviceConfig = {
BindReadOnlyPaths = lib.mkForce [ ];
BindPaths = lib.mkIf (cfgS.settings != { }) (map (stash: "${stash.path}") cfgS.settings.stash);
};
};
users.users.stash = {
isSystemUser = true;
packages = [ stashPythonFHS ];
};
}; };
} }

View File

@@ -19,7 +19,7 @@
embed-thumbnail = true; embed-thumbnail = true;
embed-subs = true; embed-subs = true;
sub-langs = "all"; sub-langs = "all";
cookies-from-browser = "firefox+gcr_4:/home/jawz/.librewolf/jawz"; cookies-from-browser = "firefox+gnomekeyring:/home/jawz/.librewolf/jawz";
}; };
}; };
gallery-dl = { gallery-dl = {