Compare commits
8
Commits
4045f25aee
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5324b5472c | ||
|
|
7ac086a420 | ||
|
|
ba18336430 | ||
|
|
1550e333e0 | ||
|
|
ff0b2efa06 | ||
|
|
461017e792 | ||
|
|
eff12d2c4c | ||
|
|
9b595a1a69 |
Generated
+14
-28
@@ -2,15 +2,17 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"herdr": {
|
"herdr": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790589489,
|
"lastModified": 1792105523,
|
||||||
"narHash": "sha256-Sn9W64W4KOga829nzathqymFvtwZsb/klyQFS/3Nq1A=",
|
"narHash": "sha256-DGj+1Z+3zHwyi+Wh6SQqY1ya9kUElF1xVNg3V054X0s=",
|
||||||
"owner": "ogulcancelik",
|
"owner": "ogulcancelik",
|
||||||
"repo": "herdr",
|
"repo": "herdr",
|
||||||
"rev": "7f89b11a11160874ba89f3be7c64b29960bd2df3",
|
"rev": "143bf5fd4781d164260c63fe28e7dc08054ad32f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -26,11 +28,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790215976,
|
"lastModified": 1792438572,
|
||||||
"narHash": "sha256-VkR1rMGyjU9jtw8ISFx5uqR9e+LEaOlhHwrseFkiIVk=",
|
"narHash": "sha256-5mQQOcggBRBXB7NlzUxO0dbvQN4euJOISjNybrtfxPk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "a6631107a83ceab5872f298a2ea710859c80c4cb",
|
"rev": "24f8f8e786f87d6a818e1746cb2389bf922afdab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -42,27 +44,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779911860,
|
"lastModified": 1792503283,
|
||||||
"narHash": "sha256-ubcLAcKBDCZjhxw/kH5DL5GdBZQdzLqpkTe7HonvJVs=",
|
"narHash": "sha256-OtQ9jaQ9aXZDm61TqykPLZdXJa2NMykYG3d0tbT683U=",
|
||||||
"owner": "NixOS",
|
"rev": "cd4ea8d57de16f4810bc5f14207bac45fbf19f67",
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "c0a89c379b4ac67c7b13b051ddbd4e0dbc9b0eaf",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1790533781,
|
|
||||||
"narHash": "sha256-hzJtu90JIQXnmgxKeP23CAx86G4L+dcQ+GHB1JK04qA=",
|
|
||||||
"rev": "cf5e76507c6e23b59f7e0ffcc7baa2a39ddd8442",
|
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.10769.cf5e76507c6e/nixexprs.tar.zst"
|
"url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.12297.cd4ea8d57de1/nixexprs.tar.zst"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
@@ -74,7 +60,7 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"herdr": "herdr",
|
"herdr": "herdr",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs",
|
||||||
"rssdownloader-src": "rssdownloader-src"
|
"rssdownloader-src": "rssdownloader-src"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -8,7 +8,10 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
herdr.url = "github:ogulcancelik/herdr";
|
herdr = {
|
||||||
|
url = "github:ogulcancelik/herdr";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
rssdownloader-src = {
|
rssdownloader-src = {
|
||||||
url = "git+https://codeberg.org/ulve/rssdownloader";
|
url = "git+https://codeberg.org/ulve/rssdownloader";
|
||||||
|
|||||||
@@ -144,6 +144,7 @@
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
wget
|
wget
|
||||||
curl
|
curl
|
||||||
|
google-chrome
|
||||||
];
|
];
|
||||||
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
|
|||||||
@@ -9,6 +9,11 @@
|
|||||||
networking.hostName = "nixserve";
|
networking.hostName = "nixserve";
|
||||||
networking.hostId = "941b956b";
|
networking.hostId = "941b956b";
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
# nixserve's own DNS lookups (e.g. HACS/docker pulls) go to the local Pi-hole
|
||||||
|
# first instead of detouring through Tailscale's DNS proxy -> home router,
|
||||||
|
# which was timing out under HACS's bursty concurrent lookups. Tailscale's
|
||||||
|
# MagicDNS resolver (100.100.100.100) stays as a fallback nameserver.
|
||||||
|
networking.nameservers = [ "127.0.0.1" ];
|
||||||
|
|
||||||
boot.supportedFilesystems = [ "zfs" ];
|
boot.supportedFilesystems = [ "zfs" ];
|
||||||
boot.zfs.forceImportRoot = false;
|
boot.zfs.forceImportRoot = false;
|
||||||
@@ -47,8 +52,8 @@
|
|||||||
users.groups.media = {};
|
users.groups.media = {};
|
||||||
users.users.jellyfin.extraGroups = [ "media" ];
|
users.users.jellyfin.extraGroups = [ "media" ];
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 80 443 /* HTTP */ 111 2049 4000 4001 4002 20048 /* NFS */ 3923 /* copyparty */ 8123 /* Home Assistant (LAN devices, e.g. Cast TTS fetch) */ ];
|
networking.firewall.allowedTCPPorts = [ 80 443 /* HTTP */ 111 2049 4000 4001 4002 20048 /* NFS */ 3923 /* copyparty */ 8123 /* Home Assistant (LAN devices, e.g. Cast TTS fetch) */ 8095 8097 /* Music Assistant (web UI + stream server) */ ];
|
||||||
networking.firewall.allowedUDPPorts = [ 111 2049 4000 4001 4002 20048 /* NFS */ ];
|
networking.firewall.allowedUDPPorts = [ 111 2049 4000 4001 4002 20048 /* NFS */ 5353 /* mDNS - Chromecast discovery */ ];
|
||||||
networking.firewall.trustedInterfaces = [ "tailscale0" ];
|
networking.firewall.trustedInterfaces = [ "tailscale0" ];
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
|
|||||||
@@ -52,10 +52,27 @@ in
|
|||||||
|
|
||||||
services.jellyfin.enable = true;
|
services.jellyfin.enable = true;
|
||||||
|
|
||||||
|
services.paperless = {
|
||||||
|
enable = true;
|
||||||
|
dataDir = "/media/apps/paperless";
|
||||||
|
address = "127.0.0.1";
|
||||||
|
port = 28981;
|
||||||
|
domain = "paperless.maybec.at";
|
||||||
|
settings = {
|
||||||
|
PAPERLESS_OCR_LANGUAGE = "eng+swe";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
services.tailscale = {
|
services.tailscale = {
|
||||||
enable = true;
|
enable = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
useRoutingFeatures = "server";
|
useRoutingFeatures = "server";
|
||||||
|
# Don't let Tailscale take over nixserve's own DNS resolution: its stub
|
||||||
|
# resolver (100.100.100.100) intermittently times out under bursty lookups
|
||||||
|
# (a known upstream issue, e.g. tailscale/tailscale#6850, #10768, #8829),
|
||||||
|
# which broke HACS updates. nixserve resolves via local Pi-hole instead
|
||||||
|
# (see networking.nameservers in hosts/nixserve/default.nix).
|
||||||
|
extraSetFlags = [ "--accept-dns=false" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
services.syncthing = {
|
services.syncthing = {
|
||||||
@@ -313,5 +330,6 @@ virtualHosts."aftersummer.maybec.at" = proxyVhost { upstream = "http://127.0.0.
|
|||||||
virtualHosts."share.maybec.at" = proxyVhost { upstream = "http://127.0.0.1:8090"; maxBodySize = "10g"; };
|
virtualHosts."share.maybec.at" = proxyVhost { upstream = "http://127.0.0.1:8090"; maxBodySize = "10g"; };
|
||||||
virtualHosts."cam.maybec.at" = proxyVhost { upstream = "https://127.0.0.1:8971"; proxySsl = true; };
|
virtualHosts."cam.maybec.at" = proxyVhost { upstream = "https://127.0.0.1:8971"; proxySsl = true; };
|
||||||
virtualHosts."home.maybec.at" = proxyVhost { upstream = "http://127.0.0.1:8123"; };
|
virtualHosts."home.maybec.at" = proxyVhost { upstream = "http://127.0.0.1:8123"; };
|
||||||
|
virtualHosts."paperless.maybec.at" = proxyVhost { upstream = "http://127.0.0.1:28981"; };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -253,6 +253,10 @@
|
|||||||
User = "ulve";
|
User = "ulve";
|
||||||
IdentityFile = "~/.ssh/id_ed25519_nixserve";
|
IdentityFile = "~/.ssh/id_ed25519_nixserve";
|
||||||
};
|
};
|
||||||
|
"Host ssh.dev.azure.com" = {
|
||||||
|
User = "git";
|
||||||
|
IdentityFile = "~/.ssh/id_rsa_azuredevops";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user