Compare commits

...
6 Commits
Author SHA1 Message Date
oqyude 97a5d8789a 1 2026-07-05 23:30:01 +03:00
oqyude d4836c5ed3 ch 2026-07-05 23:07:07 +03:00
oqyude 3bf463abeb non regress 2026-07-05 21:55:44 +03:00
oqyude a4589c520e regress 2026-07-05 19:04:46 +03:00
oqyude d7e736511d nix flake update 2026-07-05 17:09:49 +03:00
oqyude 2f4e4a92b9 test 2026-07-05 15:38:42 +03:00
12 changed files with 126 additions and 60 deletions
Generated
+36 -19
View File
@@ -88,11 +88,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781989573, "lastModified": 1783222121,
"narHash": "sha256-npfH7Zv7t1akX/ArqCNro4zU4ViPlghLaPnbEfHbCxk=", "narHash": "sha256-E/ElL373TO8lQ2aMvYyzN+k4xkVaUGoRqoa8AtM71tI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "78e7d8b13ecd7f5256a5c11ce216876164099d9f", "rev": "a1645f40777620c4bd2b6d854b290c2fc354a266",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -106,11 +106,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1781622756, "lastModified": 1782562157,
"narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", "narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", "rev": "a9cf7546a938c737b079e738de73934a13de9784",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -191,11 +191,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1782027080, "lastModified": 1783276901,
"narHash": "sha256-+swil9tg3vzwDC8J/Zgsty7ifxiqzWbE98hceRmcYrU=", "narHash": "sha256-ShZcHjvXc/Q4ew9ehgT5w3hjG1J8HX2opzm8+is1Ic8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85cea9e124238e3087be7816c11cbd71a9b40bc1", "rev": "eaf066ffc52fb96d433d75bac80f675bc0672928",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -205,13 +205,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-previous": {
"locked": { "locked": {
"lastModified": 1781509190, "lastModified": 1767892417,
"narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1782847189,
"narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -223,11 +239,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1781577229, "lastModified": 1782959384,
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -293,6 +309,7 @@
"nixpkgs-beets": "nixpkgs-beets", "nixpkgs-beets": "nixpkgs-beets",
"nixpkgs-calibre": "nixpkgs-calibre", "nixpkgs-calibre": "nixpkgs-calibre",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-previous": "nixpkgs-previous",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
"proxy-suite": "proxy-suite", "proxy-suite": "proxy-suite",
@@ -309,11 +326,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781943681, "lastModified": 1783174389,
"narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=", "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "420f8d2e9882911f65cfac15cc706f639ba96cca", "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
+1
View File
@@ -9,6 +9,7 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# nixpkgs-last-unstable.url = "github:NixOS/nixpkgs/6b4955211758ba47fac850c040a27f23b9b4008f"; # nixpkgs-last-unstable.url = "github:NixOS/nixpkgs/6b4955211758ba47fac850c040a27f23b9b4008f";
nixpkgs-calibre.url = "github:NixOS/nixpkgs/566acc07c54dc807f91625bb286cb9b321b5f42a"; nixpkgs-calibre.url = "github:NixOS/nixpkgs/566acc07c54dc807f91625bb286cb9b321b5f42a";
nixpkgs-previous.url = "github:NixOS/nixpkgs/3497aa5c9457a9d88d71fa93a4a8368816fbeeba";
nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixpkgs-master.url = "github:NixOS/nixpkgs/master";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs-beets.url = "github:NixOS/nixpkgs/832efc09b4caf6b4569fbf9dc01bec3082a00611"; # 2343bbb58f99267223bc2aac4fc9ea301a155a16 nixpkgs-beets.url = "github:NixOS/nixpkgs/832efc09b4caf6b4569fbf9dc01bec3082a00611"; # 2343bbb58f99267223bc2aac4fc9ea301a155a16
+1 -1
View File
@@ -27,7 +27,7 @@
# "https://nixos.snix.store" # https://nixos.snix.store/ # "https://nixos.snix.store" # https://nixos.snix.store/
]; ];
trusted-public-keys = [ trusted-public-keys = [
"cache.local:be5jFLkiwNyOep/McxSafB3jguBmztxx+oJ46ySyc/s=" "nix-cache.home.arpa:be5jFLkiwNyOep/McxSafB3jguBmztxx+oJ46ySyc/s="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
stalled-download-timeout = 8; stalled-download-timeout = 8;
-3
View File
@@ -3,9 +3,6 @@
inputs, inputs,
... ...
}: }:
# let
# pkgs-stable = import inputs.nixpkgs-stable { system = "x86_64-linux"; };
# in
{ {
services.bentopdf = { services.bentopdf = {
enable = true; enable = true;
+42 -19
View File
@@ -11,27 +11,50 @@ let
}; };
in in
{ {
services.calibre-web = { services = {
package = stable.calibre-web; calibre-web = {
enable = true; # package = stable.calibre-web;
# dataDir = "${xlib.dirs.services-mnt-folder}/calibre-web"; enable = true;
options = { # dataDir = "${xlib.dirs.services-mnt-folder}/calibre-web";
calibreLibrary = "${xlib.dirs.services-mnt-folder}/calibre-web-library"; options = {
enableBookUploading = true; calibreLibrary = "${xlib.dirs.services-mnt-folder}/calibre-web-library";
enableKepubify = true; enableBookUploading = true;
enableBookConversion = false; enableKepubify = true;
enableBookConversion = false;
};
listen.ip = "0.0.0.0";
listen.port = 8083;
openFirewall = true;
};
calibre-server = {
enable = true;
port = 8091;
host = "0.0.0.0";
openFirewall = true;
user = "calibre-web";
group = "calibre-web";
libraries = [
"/var/lib/calibre-server"
];
}; };
listen.ip = "0.0.0.0";
listen.port = 8083;
openFirewall = true;
}; };
fileSystems."/var/lib/calibre-web" = { fileSystems = {
device = "${xlib.dirs.services-mnt-folder}/calibre-web"; "/var/lib/calibre-web" = {
fsType = "none"; device = "${xlib.dirs.services-mnt-folder}/calibre-web";
options = [ fsType = "none";
"bind" options = [
"nofail" "bind"
]; "nofail"
];
};
"/var/lib/calibre-server" = {
device = "${xlib.dirs.services-mnt-folder}/calibre-web-library";
fsType = "none";
options = [
"bind"
"nofail"
];
};
}; };
} }
+2
View File
@@ -30,6 +30,7 @@
} }
home.arpa:53 { home.arpa:53 {
hosts { hosts {
192.168.1.100 vetymae.home.arpa
192.168.1.20 ca.home.arpa 192.168.1.20 ca.home.arpa
192.168.1.20 calibre.home.arpa 192.168.1.20 calibre.home.arpa
192.168.1.20 dns.home.arpa 192.168.1.20 dns.home.arpa
@@ -42,6 +43,7 @@
192.168.1.20 nextcloud.home.arpa 192.168.1.20 nextcloud.home.arpa
192.168.1.20 office.home.arpa 192.168.1.20 office.home.arpa
192.168.1.20 pdf.home.arpa 192.168.1.20 pdf.home.arpa
192.168.1.20 sapphira.home.arpa
192.168.1.20 syncthing.home.arpa 192.168.1.20 syncthing.home.arpa
fallthrough fallthrough
} }
+1 -1
View File
@@ -14,7 +14,6 @@
./glances.nix ./glances.nix
./immich.nix ./immich.nix
./miniflux.nix ./miniflux.nix
./netdata.nix
./nextcloud.nix ./nextcloud.nix
./nginx.nix ./nginx.nix
./nix-serve.nix ./nix-serve.nix
@@ -29,6 +28,7 @@
# ./memos.nix # ./memos.nix
# ./n8n.nix # ./n8n.nix
# ./navidrome.nix # ./navidrome.nix
# ./netdata.nix
# ./nfs.nix # ./nfs.nix
# ./node-red.nix # ./node-red.nix
# ./open-webui.nix # ./open-webui.nix
+1
View File
@@ -8,6 +8,7 @@
services = { services = {
nix-serve = { nix-serve = {
enable = true; enable = true;
package = pkgs.nix-serve-ng;
openFirewall = true; openFirewall = true;
port = 5000; port = 5000;
bindAddress = "0.0.0.0"; bindAddress = "0.0.0.0";
-17
View File
@@ -1,17 +0,0 @@
{
config,
inputs,
...
}:
# let
# pkgs-stable = import inputs.nixpkgs-stable { system = "x86_64-linux"; };
# in
{
services.stirling-pdf = {
enable = false;
# package = pkgs-stable.stirling-pdf;
environment = {
SERVER_PORT = 6060;
};
};
}
+1
View File
@@ -10,6 +10,7 @@
../software/beets ../software/beets
../software/whisper.nix ../software/whisper.nix
./containers ./containers
./nix-serve.nix
./tools ./tools
#../server/open-webui.nix #../server/open-webui.nix
#../services/tts.nix #../services/tts.nix
+25
View File
@@ -0,0 +1,25 @@
{
config,
lib,
pkgs,
...
}:
{
services = {
nix-serve = {
enable = true;
package = pkgs.nix-serve-ng;
openFirewall = true;
port = 5000;
bindAddress = "0.0.0.0";
secretKeyFile = config.sops.secrets.private-key.path;
};
};
sops.secrets = {
private-key = {
key = "private-key";
sopsFile = ./secrets/nix-serve.yaml;
mode = "0600";
};
};
}
+16
View File
@@ -0,0 +1,16 @@
private-key: ENC[AES256_GCM,data:VTj1cmhYLbBuUnIgtXI3CZtULaNZ5XOpoheJB0gUwrWrH5B0rmxcvZLlJWX7xhGs4oqcC3Wwmo+TBPhcgGylLVdCuhJG5A94UwOa9ZIV4s3x3IJ4RU3UcHTsA0xdtw7XxBfryw==,iv:8oZCojIU0JXWJgE5t+fNNW9trC109yOJp1UGAV76FbU=,tag:S74cHFy9B8C29npdcoVBeg==,type:str]
sops:
age:
- recipient: age13l2gtk0nzr484zprp7e0pkrt0ne0j4asyn2pjmlaw73nte7t7d8q4sqtxm
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6MHBkYzZneEdhUlN5MEpx
NGxud1BkVU1NUFdyVFE2VDJWb1M2cW9IcUVFCm9QZ3RvNHFaeWpFbnZ3Q1dKSDdn
RHQvUDgrZHRiUHpSR3FrWXRkQUxXWGMKLS0tIERsemNuL1BwR2xYYUpmbVFROWtN
RGI1WlRGMzlkS2tqQ0JPSFJHTUY1TUkKDeaivc+ST8MYtnJEDx07Y+IhtpvblR47
SLZf6WKQ8WNY4Bb5VeMWiCABPP/2L+VwoACqkOdZ01yGUVQSc9X6tw==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2026-05-03T17:05:41Z"
mac: ENC[AES256_GCM,data:6jNp7N7lIvsLez3zQbDKTWPyvkL8u9g34I3q27GudgXzYw8B3Pb26jc9dCYCxCylCZxN5IeWWyHvUt4PadQABI4jrrIKnIfVV1A2c+A90chu+xSyE/B9OhkSC7yYVOnCURJPYku8799RIRkpHAWeKawkydbOiszCiC3qIKZDSTQ=,iv:xXivLDNnTABlNeWOOWsCESDUOnFv+9Lh0o029r7rk+A=,tag:vUoIZjcNtE3xJX/jNCao7Q==,type:str]
unencrypted_suffix: _unencrypted
version: 3.12.2