Compare commits
16 Commits
8f7332b099
...
update-fla
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f7d85cb4f7 | ||
| a226d68df7 | |||
| 8e6cfa47b8 | |||
| 9d702285b6 | |||
| ef128b240e | |||
| f66c8792c4 | |||
| dde6dc3246 | |||
| 0d3d41c8f9 | |||
| 8c566ed869 | |||
| eb09fdf8fd | |||
| 650ae4ef16 | |||
| cac57806b5 | |||
| 6e8246672d | |||
| b80322f58a | |||
| 936df3b7fc | |||
| 38809d7c3c |
18
.github/instructions/ai-doc-attribution.instructions.md
vendored
Normal file
18
.github/instructions/ai-doc-attribution.instructions.md
vendored
Normal file
@@ -0,0 +1,18 @@
|
||||
---
|
||||
description: "Use when writing or updating documentation (Markdown, README, docs pages, guides). Require explicit top-of-document labeling when a document is fully AI-generated."
|
||||
name: "AI Documentation Attribution"
|
||||
applyTo: "**/*.md"
|
||||
---
|
||||
# AI Documentation Attribution
|
||||
|
||||
- When documentation is fully AI-generated, include an explicit attribution note.
|
||||
- The attribution must be visible in the document body and easy to find by readers.
|
||||
- Acceptable labels include one of:
|
||||
1. "AI-generated documentation"
|
||||
- Place the attribution at the top of the document by default.
|
||||
- If only parts are AI-assisted, attribution is optional unless you want to disclose assistance.
|
||||
- Do not imply fully human authorship for content produced by AI.
|
||||
|
||||
Example attribution lines:
|
||||
|
||||
- `> Note: This document was AI-generated and reviewed by a maintainer.`
|
||||
11
.vscode/mcp.json
vendored
11
.vscode/mcp.json
vendored
@@ -1,10 +1 @@
|
||||
{
|
||||
"servers": {
|
||||
"nixos": {
|
||||
"command": "uvx",
|
||||
"args": [
|
||||
"mcp-nixos"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
{}
|
||||
@@ -10,6 +10,8 @@ This repo supports `x86_64-linux` and (theorically) `aarch64-linux`.
|
||||
Please see [our setup guide](./docs/setting-up.md) for more information on how
|
||||
to onboard a new user or system.
|
||||
|
||||
For the media request stack on palatine-hill, see [the media stack guide](./docs/media-stack.md).
|
||||
|
||||
## For Those Interested
|
||||
|
||||
Although we are not actively looking for new members to join in on this repo,
|
||||
|
||||
422
docs/media-stack.md
Normal file
422
docs/media-stack.md
Normal file
@@ -0,0 +1,422 @@
|
||||
# Media Request Stack Setup
|
||||
|
||||
> Note: This is AI-generated documentation and was reviewed by a maintainer.
|
||||
|
||||
This page documents the setup needed to make media requests flow from Jellyseerr to the Starr apps to qBittorrent and finally into a Jellyfin library.
|
||||
|
||||
It is based on the services defined for palatine-hill in:
|
||||
|
||||
- `systems/palatine-hill/docker/arr.nix`
|
||||
- `systems/palatine-hill/docker/torr.nix`
|
||||
- `systems/palatine-hill/postgresql.nix`
|
||||
- `systems/palatine-hill/vars.nix`
|
||||
|
||||
The guidance here follows the same hardlink principles used by TRaSH Guides: keep downloads and library folders separate, but make sure they live on the same filesystem and appear under the same container path.
|
||||
|
||||
## What Exists In This Repo
|
||||
|
||||
The media-request side currently defines these containers on palatine-hill:
|
||||
|
||||
- Jellyseerr on port `5055`
|
||||
- Prowlarr on port `9696`
|
||||
- Radarr on port `7878`
|
||||
- Sonarr on port `8989`
|
||||
- Lidarr on port `8686`
|
||||
- Bazarr on port `6767`
|
||||
- qBittorrent variants in `docker/torr.nix`
|
||||
|
||||
Related supporting details:
|
||||
|
||||
- The Starr apps and qBittorrent both mount `/data` from `vars.primary_torr`.
|
||||
- PostgreSQL is enabled locally and used by the arr stack.
|
||||
|
||||
Two caveats matter before expecting the flow to work:
|
||||
|
||||
1. Jellyfin is not currently defined on palatine-hill in this repo, so this guide treats Jellyfin as the destination media server you will point at the finished library.
|
||||
2. qBittorrent is using host-exposed or gluetun-attached networking rather than `arrnet`, so the Starr apps should connect to qBittorrent through the host and published port.
|
||||
|
||||
## Required Hardlink Layout
|
||||
|
||||
For hardlinks and atomic moves to work reliably, these rules need to be true:
|
||||
|
||||
- qBittorrent and the Starr apps must see the same underlying host filesystem and the same ZFS dataset.
|
||||
- qBittorrent and the Starr apps should use the same in-container prefix, ideally `/data`.
|
||||
- Downloads and the final library must be separate directories.
|
||||
- Jellyfin should only read the final media library, not the download directories.
|
||||
|
||||
For ZFS specifically, sibling child datasets in the same pool are not enough. Hardlinks do not cross dataset boundaries, so `/data/torrents` and `/data/media` must be directories inside the same dataset.
|
||||
|
||||
Recommended logical layout inside containers:
|
||||
|
||||
```text
|
||||
/data
|
||||
├── torrents
|
||||
│ ├── movies
|
||||
│ ├── music
|
||||
│ └── tv
|
||||
└── media
|
||||
├── movies
|
||||
├── music
|
||||
└── tv
|
||||
```
|
||||
|
||||
This repo draft uses one shared host root from `vars.primary_torr` and mounts that as `/data` for qBittorrent, Radarr, Sonarr, Lidarr, Bazarr, Unpackerr, and Notifiarr.
|
||||
|
||||
### What Matters
|
||||
|
||||
The exact host path is less important than this invariant:
|
||||
|
||||
```text
|
||||
same host filesystem + same container path prefix + separate downloads/media folders
|
||||
```
|
||||
|
||||
If you split torrents and media across different datasets, imports may still be made to work with copies or path fixes, but hardlinks and instant moves will not be dependable.
|
||||
|
||||
## Suggested Host Layout
|
||||
|
||||
Once you choose a shared host root, create a structure like this beneath it:
|
||||
|
||||
```text
|
||||
data/
|
||||
├── torrents/
|
||||
│ ├── movies/
|
||||
│ ├── music/
|
||||
│ └── tv/
|
||||
└── media/
|
||||
├── movies/
|
||||
├── music/
|
||||
└── tv/
|
||||
```
|
||||
|
||||
In this repo draft, the shared host root is `vars.primary_torr`, with container mounts set to `"${vars.primary_torr}/data:/data"`.
|
||||
|
||||
The matching container paths should then be:
|
||||
|
||||
- qBittorrent download root: `/data/torrents`
|
||||
- Radarr root folder: `/data/media/movies`
|
||||
- Sonarr root folder: `/data/media/tv`
|
||||
- Lidarr root folder: `/data/media/music`
|
||||
- Jellyfin library roots: `/data/media/movies`, `/data/media/tv`, `/data/media/music`
|
||||
|
||||
Do not point any Starr app root folder at `/data/torrents`.
|
||||
|
||||
## Service Roles
|
||||
|
||||
### Jellyseerr
|
||||
|
||||
Jellyseerr is the user-facing request layer. It should:
|
||||
|
||||
- connect to Jellyfin for users, authentication, and media availability
|
||||
- connect to Radarr for movies
|
||||
- connect to Sonarr for series
|
||||
|
||||
Jellyseerr does not talk directly to qBittorrent for normal request flow.
|
||||
|
||||
### Prowlarr Values
|
||||
|
||||
Prowlarr should be the single source of indexers. Configure indexers there, then sync them to:
|
||||
|
||||
- Radarr
|
||||
- Sonarr
|
||||
- Lidarr
|
||||
|
||||
This avoids duplicating indexer setup in every Starr app.
|
||||
|
||||
### Radarr, Sonarr, Lidarr
|
||||
|
||||
These apps should:
|
||||
|
||||
- receive requests from Jellyseerr
|
||||
- search indexers via Prowlarr
|
||||
- send downloads to qBittorrent
|
||||
- import completed downloads from `/data/torrents/...` into `/data/media/...`
|
||||
|
||||
### qBittorrent
|
||||
|
||||
qBittorrent should only download into `/data/torrents/...` and should not write directly into `/data/media/...`.
|
||||
|
||||
### Jellyfin
|
||||
|
||||
Jellyfin should only read the final library under `/data/media/...`.
|
||||
|
||||
## Configuration Order
|
||||
|
||||
Set the stack up in this order:
|
||||
|
||||
1. Shared path layout
|
||||
2. qBittorrent
|
||||
3. Prowlarr
|
||||
4. Radarr, Sonarr, Lidarr
|
||||
5. Jellyfin
|
||||
6. Jellyseerr
|
||||
7. Bazarr
|
||||
|
||||
That order keeps each layer pointing at services that already exist.
|
||||
|
||||
## qBittorrent Setup
|
||||
|
||||
The repo defines these Web UI ports:
|
||||
|
||||
- `8082` for `qbit`
|
||||
- `8081` for `qbitVPN`
|
||||
- `8083` for `qbitPerm`
|
||||
|
||||
Choose one instance for the Starr apps to use and keep that consistent.
|
||||
|
||||
Recommended qBittorrent settings:
|
||||
|
||||
- Default save path: `/data/torrents`
|
||||
- Category mode: enabled
|
||||
- Automatic torrent management: enabled
|
||||
- Incomplete directory: optional, but avoid a different filesystem if you want cheap moves
|
||||
- Listening port: use the instance-specific torrent port if applicable
|
||||
|
||||
Recommended categories:
|
||||
|
||||
- `radarr` -> `/data/torrents/movies`
|
||||
- `sonarr` -> `/data/torrents/tv`
|
||||
- `lidarr` -> `/data/torrents/music`
|
||||
|
||||
This matches the TRaSH pattern and keeps imports predictable.
|
||||
|
||||
## Prowlarr Setup
|
||||
|
||||
In Prowlarr:
|
||||
|
||||
1. Add your indexers.
|
||||
2. Add app connections for Radarr, Sonarr, and Lidarr.
|
||||
3. Sync indexers from Prowlarr into each Starr app.
|
||||
|
||||
Use the container hostnames from the repo when apps share the `arrnet` network:
|
||||
|
||||
- `http://radarr:7878`
|
||||
- `http://sonarr:8989`
|
||||
- `http://lidarr:8686`
|
||||
|
||||
If you are configuring through host-exposed ports in a browser from outside Docker, use the server host and published ports instead.
|
||||
|
||||
## Radarr Setup
|
||||
|
||||
In Radarr:
|
||||
|
||||
1. Add a root folder: `/data/media/movies`
|
||||
2. Add qBittorrent as the download client
|
||||
3. Set the category to `radarr`
|
||||
4. Prefer completed download handling on
|
||||
5. Do not use a movie root inside the downloads tree
|
||||
|
||||
For qBittorrent, use the chosen instance endpoint.
|
||||
|
||||
Examples:
|
||||
|
||||
- preferred for this repo draft: `http://<server>:8082`
|
||||
- VPN-backed alternative if you intentionally use that instance: `http://<server>:8081`
|
||||
|
||||
The important part is that the path qBittorrent writes must still be visible to Radarr as `/data/torrents/movies`.
|
||||
|
||||
## Sonarr Setup
|
||||
|
||||
In Sonarr:
|
||||
|
||||
1. Add a root folder: `/data/media/tv`
|
||||
2. Add qBittorrent as the download client
|
||||
3. Set the category to `sonarr`
|
||||
4. Enable completed download handling
|
||||
|
||||
Keep the same shared-path rule: Sonarr must be able to see qBittorrent output directly at `/data/torrents/tv`.
|
||||
|
||||
## Lidarr Setup
|
||||
|
||||
In Lidarr:
|
||||
|
||||
1. Add a root folder: `/data/media/music`
|
||||
2. Add qBittorrent as the download client
|
||||
3. Set the category to `lidarr`
|
||||
4. Enable completed download handling
|
||||
|
||||
## Jellyfin Setup
|
||||
|
||||
Jellyfin should be pointed only at the final library paths:
|
||||
|
||||
- Movies: `/data/media/movies`
|
||||
- TV: `/data/media/tv`
|
||||
- Music: `/data/media/music`
|
||||
|
||||
Do not add `/data/torrents` as a Jellyfin library.
|
||||
|
||||
If Jellyfin runs in Docker, mount only the media sub-tree if you want a tighter boundary:
|
||||
|
||||
- `host-shared-root/media:/data/media`
|
||||
|
||||
If Jellyfin runs directly on the host, point it at the equivalent host paths.
|
||||
|
||||
## Jellyseerr Setup
|
||||
|
||||
Jellyseerr in this repo runs on port `5055` and joins both `arrnet` and `haproxy-net`.
|
||||
|
||||
Configure it with:
|
||||
|
||||
1. Jellyfin server URL
|
||||
2. Jellyfin API key
|
||||
3. Radarr server URL and API key
|
||||
4. Sonarr server URL and API key
|
||||
|
||||
Suggested internal URLs when services share `arrnet`:
|
||||
|
||||
- Radarr: `http://radarr:7878`
|
||||
- Sonarr: `http://sonarr:8989`
|
||||
|
||||
Jellyseerr request defaults should map:
|
||||
|
||||
- Movies -> Radarr root `/data/media/movies`
|
||||
- Series -> Sonarr root `/data/media/tv`
|
||||
|
||||
After that, user flow is:
|
||||
|
||||
1. User requests media in Jellyseerr
|
||||
2. Jellyseerr hands the request to Radarr or Sonarr
|
||||
3. The Starr app searches via Prowlarr indexers
|
||||
4. The Starr app sends the download to qBittorrent with its category
|
||||
5. qBittorrent writes into `/data/torrents/...`
|
||||
6. The Starr app imports into `/data/media/...`
|
||||
7. Jellyfin scans or detects the new item in the final library
|
||||
|
||||
## Bazarr Setup
|
||||
|
||||
Bazarr is optional for the request-to-library path, but it fits after Radarr and Sonarr are stable.
|
||||
|
||||
Point Bazarr at:
|
||||
|
||||
- Radarr
|
||||
- Sonarr
|
||||
- the final media library visible under `/data/media`
|
||||
|
||||
It does not need the download tree for ordinary subtitle management.
|
||||
|
||||
## Remote Path Mappings
|
||||
|
||||
If you align the mounts properly, you should not need remote path mappings.
|
||||
|
||||
That is the preferred setup.
|
||||
|
||||
Only use remote path mappings if the downloader and the importing app see different absolute paths for the same files.
|
||||
In a Docker-only setup with shared `/data`, that is a sign the mounts are wrong rather than a feature you should rely on.
|
||||
|
||||
## ZFS Notes
|
||||
|
||||
For a hardlink-safe media layout on ZFS:
|
||||
|
||||
- Keep `/data/torrents` and `/data/media` in the same dataset.
|
||||
- Do not split them into separate child datasets if you want hardlinks.
|
||||
- It is fine to keep qBittorrent config, Jellyfin metadata, and other appdata in separate datasets because those do not need hardlinks with payload files.
|
||||
|
||||
For `ZFS-primary/torr`, a better baseline for bulk media than a small-record, high-compression profile is:
|
||||
|
||||
- `recordsize=1M`
|
||||
- `compression=zstd-3` or `lz4`
|
||||
- `sync=standard`
|
||||
- `logbias=throughput`
|
||||
- `primarycache=metadata`
|
||||
- `dnodesize=auto`
|
||||
|
||||
These are new-write behavior settings. `recordsize` only affects newly written data.
|
||||
|
||||
## Repo-Specific Notes
|
||||
|
||||
- Arr containers use `PUID=600` and `PGID=100`.
|
||||
- qBittorrent containers also use `PUID=600` and `PGID=100`.
|
||||
- The arr stack uses the local PostgreSQL service via `/var/run/postgresql`.
|
||||
- `jellyseerr` stores config under `${vars.primary_docker}/overseerr` even though the container is Jellyseerr.
|
||||
- The hardlink draft in this repo chooses `vars.primary_torr` as the shared `/data` root.
|
||||
|
||||
- `systems/palatine-hill/docker/default.nix` imports `torr.nix`, so the downloader stack is part of the host configuration.
|
||||
|
||||
## Deployment Checklist (Exact Values)
|
||||
|
||||
Use this checklist when configuring the stack so every app matches the current draft.
|
||||
|
||||
### Shared Paths
|
||||
|
||||
- Shared container path for arr + downloader: `/data`
|
||||
- Download root: `/data/torrents`
|
||||
- Media roots:
|
||||
- Movies: `/data/media/movies`
|
||||
- TV: `/data/media/tv`
|
||||
- Music: `/data/media/music`
|
||||
|
||||
### qBittorrent (Primary Instance)
|
||||
|
||||
- Web UI URL for Starr apps: `http://<server>:8082`
|
||||
- Web UI port: `8082`
|
||||
- Torrent port: `29432` (TCP/UDP)
|
||||
- Default save path: `/data/torrents`
|
||||
- Category save-path mode: enabled
|
||||
- Automatic torrent management: enabled
|
||||
|
||||
Category paths:
|
||||
|
||||
- `radarr` -> `/data/torrents/movies`
|
||||
- `sonarr` -> `/data/torrents/tv`
|
||||
- `lidarr` -> `/data/torrents/music`
|
||||
|
||||
### Radarr
|
||||
|
||||
- URL: `http://radarr:7878` (inside arr network)
|
||||
- Root folder: `/data/media/movies`
|
||||
- Download client: qBittorrent at `http://<server>:8082`
|
||||
- qBittorrent category: `radarr`
|
||||
- Completed download handling: enabled
|
||||
|
||||
### Sonarr
|
||||
|
||||
- URL: `http://sonarr:8989` (inside arr network)
|
||||
- Root folder: `/data/media/tv`
|
||||
- Download client: qBittorrent at `http://<server>:8082`
|
||||
- qBittorrent category: `sonarr`
|
||||
- Completed download handling: enabled
|
||||
|
||||
### Lidarr
|
||||
|
||||
- URL: `http://lidarr:8686` (inside arr network)
|
||||
- Root folder: `/data/media/music`
|
||||
- Download client: qBittorrent at `http://<server>:8082`
|
||||
- qBittorrent category: `lidarr`
|
||||
- Completed download handling: enabled
|
||||
|
||||
### Prowlarr
|
||||
|
||||
- URL: `http://prowlarr:9696` (inside arr network)
|
||||
- App sync targets:
|
||||
- `http://radarr:7878`
|
||||
- `http://sonarr:8989`
|
||||
- `http://lidarr:8686`
|
||||
|
||||
### Jellyseerr Values
|
||||
|
||||
- URL: `http://jellyseerr:5055` (internal) or via your reverse proxy externally
|
||||
- Radarr target: `http://radarr:7878`
|
||||
- Sonarr target: `http://sonarr:8989`
|
||||
- Request defaults:
|
||||
- Movies root: `/data/media/movies`
|
||||
- Series root: `/data/media/tv`
|
||||
|
||||
### Jellyfin Values
|
||||
|
||||
- Library roots only:
|
||||
- `/data/media/movies`
|
||||
- `/data/media/tv`
|
||||
- `/data/media/music`
|
||||
- Do not add `/data/torrents` as a library.
|
||||
|
||||
## Validation Checklist
|
||||
|
||||
Use this after setup:
|
||||
|
||||
1. qBittorrent can create files in `/data/torrents/movies`, `/data/torrents/tv`, and `/data/torrents/music`.
|
||||
2. Radarr, Sonarr, and Lidarr can browse both `/data/torrents/...` and `/data/media/...`.
|
||||
3. A test download lands in the expected category folder.
|
||||
4. The corresponding Starr app imports the item into `/data/media/...` without copy-delete behavior.
|
||||
5. Jellyfin can see the imported file in the final library.
|
||||
6. Jellyseerr shows the item as available after import and scan.
|
||||
|
||||
If imports fail or hardlinks do not work, check the mount design before changing app logic.
|
||||
60
flake.lock
generated
60
flake.lock
generated
@@ -76,11 +76,11 @@
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1776398575,
|
||||
"narHash": "sha256-WArU6WOdWxzbzGqYk4w1Mucg+bw/SCl6MoSp+/cZMio=",
|
||||
"lastModified": 1777348977,
|
||||
"narHash": "sha256-9aKuCI5TKHKnP073B1VzBdLRLAQJE7R9rbJWaSFXr3M=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "05815686caf4e3678f5aeb5fd36e567886ab0d30",
|
||||
"rev": "a314975f42bfa9665bf77d1586ee0e123790ed27",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -240,11 +240,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776454077,
|
||||
"narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=",
|
||||
"lastModified": 1777349711,
|
||||
"narHash": "sha256-PGKgo2dO6fK603QGI+DWXdKmS09pbJjjTxwRHdhkGZA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "565e5349208fe7d0831ef959103c9bafbeac0681",
|
||||
"rev": "c1140540536d483e2730320100f6835d62c94fdf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -335,11 +335,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775970782,
|
||||
"narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=",
|
||||
"lastModified": 1777181277,
|
||||
"narHash": "sha256-yVJbd07ortDRAttDFmDV5p220aOLTHgVAx//0nW/xW8=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "bedba5989b04614fc598af9633033b95a937933f",
|
||||
"rev": "b8eb7acee0f7604fe1bf6a5b3dcf5254369180fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -415,11 +415,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1775490113,
|
||||
"narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
|
||||
"lastModified": 1776983936,
|
||||
"narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
|
||||
"rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -500,11 +500,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1776169885,
|
||||
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
|
||||
"lastModified": 1776877367,
|
||||
"narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
|
||||
"rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -550,11 +550,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775585728,
|
||||
"narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=",
|
||||
"lastModified": 1776796298,
|
||||
"narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "580633fa3fe5fc0379905986543fd7495481913d",
|
||||
"rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -594,11 +594,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776395632,
|
||||
"narHash": "sha256-Mi1uF5f2FsdBIvy+v7MtsqxD3Xjhd0ARJdwoqqqPtJo=",
|
||||
"lastModified": 1777346187,
|
||||
"narHash": "sha256-oVxyGjpiIsrXhWTJVUOs38fZQkLjd0nZGOY9K7Kfot8=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "8087ff1f47fff983a1fba70fa88b759f2fd8ae97",
|
||||
"rev": "146e7bf7569b8288f24d41d806b9f584f7cfd5b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -614,11 +614,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776119890,
|
||||
"narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
|
||||
"lastModified": 1777338324,
|
||||
"narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
|
||||
"rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -647,11 +647,11 @@
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776170745,
|
||||
"narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=",
|
||||
"lastModified": 1776893932,
|
||||
"narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9",
|
||||
"rev": "84971726c7ef0bb3669a5443e151cc226e65c518",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -767,11 +767,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775531246,
|
||||
"narHash": "sha256-sbVYa4TS2Q1pkSjs8CvHsPGYFM5w4d9od4ltzIGV/bA=",
|
||||
"lastModified": 1777064547,
|
||||
"narHash": "sha256-hssXWvyy6bzaGi9FuZQPGxVBLzQKRPDht13O0Y+Qxmo=",
|
||||
"owner": "Toqozz",
|
||||
"repo": "wired-notify",
|
||||
"rev": "4fd4283803f198302af1a6a75b2225568004b343",
|
||||
"rev": "95edd8613b1636639857a3fba403155cef82eb5d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -54,6 +54,12 @@
|
||||
"starcoder2:7b"
|
||||
];
|
||||
};
|
||||
avahi = {
|
||||
enable = true;
|
||||
#publish.enable = true;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
flatpak.enable = true;
|
||||
calibre-web = {
|
||||
# temp disable this
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
attic-client
|
||||
amdgpu_top
|
||||
android-tools
|
||||
bat
|
||||
bitwarden-cli
|
||||
bfg-repo-cleaner
|
||||
brightnessctl
|
||||
@@ -19,7 +18,6 @@
|
||||
#claude-code
|
||||
croc
|
||||
deadnix
|
||||
direnv
|
||||
easyeffects
|
||||
eza
|
||||
fanficfare
|
||||
@@ -107,4 +105,13 @@
|
||||
zoom-us
|
||||
zoxide
|
||||
];
|
||||
programs = {
|
||||
appimage = {
|
||||
enable = true;
|
||||
binfmt = true;
|
||||
};
|
||||
bat.enable = true;
|
||||
direnv.enable = true;
|
||||
kdeconnect.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,8 +34,7 @@
|
||||
loader.grub.device = "/dev/sda";
|
||||
useSystemdBoot = true;
|
||||
kernelParams = [
|
||||
"i915.force_probe=56a5"
|
||||
"i915.enable_guc=2"
|
||||
"xe.force_probe=56a5"
|
||||
];
|
||||
kernel.sysctl = {
|
||||
"vm.overcommit_memory" = lib.mkForce 1;
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
}:
|
||||
let
|
||||
vars = import ../vars.nix;
|
||||
shared_data_path = "${vars.primary_torr}/data";
|
||||
arr_postgres_config =
|
||||
container_type:
|
||||
let
|
||||
@@ -62,7 +63,7 @@ in
|
||||
];
|
||||
volumes = [
|
||||
"${vars.primary_docker}/bazarr:/config"
|
||||
"${vars.primary_plex_storage}/data:/data"
|
||||
"${shared_data_path}:/data"
|
||||
"/var/run/postgresql:/var/run/postgresql"
|
||||
];
|
||||
extraOptions = [
|
||||
@@ -110,7 +111,7 @@ in
|
||||
];
|
||||
volumes = [
|
||||
"${vars.primary_docker}/radarr:/config"
|
||||
"${vars.primary_plex_storage}/data:/data"
|
||||
"${shared_data_path}:/data"
|
||||
"/var/run/postgresql:/var/run/postgresql"
|
||||
];
|
||||
extraOptions = [
|
||||
@@ -134,7 +135,7 @@ in
|
||||
];
|
||||
volumes = [
|
||||
"${vars.primary_docker}/sonarr:/config"
|
||||
"${vars.primary_plex_storage}/data:/data"
|
||||
"${shared_data_path}:/data"
|
||||
"/var/run/postgresql:/var/run/postgresql"
|
||||
];
|
||||
extraOptions = [
|
||||
@@ -158,7 +159,7 @@ in
|
||||
];
|
||||
volumes = [
|
||||
"${vars.primary_docker}/lidarr:/config"
|
||||
"${vars.primary_plex_storage}/data:/data"
|
||||
"${shared_data_path}:/data"
|
||||
"/var/run/postgresql:/var/run/postgresql"
|
||||
];
|
||||
extraOptions = [
|
||||
@@ -176,7 +177,7 @@ in
|
||||
};
|
||||
volumes = [
|
||||
"${vars.primary_docker}/unpackerr:/config"
|
||||
"${vars.primary_plex_storage}:/data"
|
||||
"${shared_data_path}:/data"
|
||||
"/var/run/postgresql:/var/run/postgresql"
|
||||
];
|
||||
extraOptions = [ "--network=arrnet" ];
|
||||
@@ -194,7 +195,7 @@ in
|
||||
environmentFiles = [ config.sops.secrets."docker/notifiarr".path ];
|
||||
volumes = [
|
||||
"${vars.primary_docker}/notifiarr:/config"
|
||||
"${vars.primary_plex_storage}:/data"
|
||||
"${shared_data_path}:/data"
|
||||
"/var/run/postgresql:/var/run/postgresql"
|
||||
];
|
||||
extraOptions = [ "--network=arrnet" ];
|
||||
|
||||
@@ -1,9 +1,4 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
@@ -20,7 +15,7 @@
|
||||
./nextcloud.nix
|
||||
# ./postgres.nix
|
||||
# ./restic.nix
|
||||
#./torr.nix
|
||||
./torr.nix
|
||||
# ./unifi.nix
|
||||
];
|
||||
|
||||
|
||||
@@ -58,6 +58,7 @@ in
|
||||
volumes = [ "${nextcloud_path}/nc_data:/var/www/html:ro" ];
|
||||
extraOptions = [
|
||||
"--device=/dev/dri:/dev/dri"
|
||||
"--network=nextcloud_default"
|
||||
];
|
||||
};
|
||||
collabora-code = {
|
||||
|
||||
@@ -15,5 +15,6 @@ in
|
||||
driver = "postgres";
|
||||
};
|
||||
dataDir = "${vars.primary_mattermost}/mattermost";
|
||||
host = "0.0.0.0";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -132,6 +132,7 @@
|
||||
"ZFS-primary/docker".useTemplate = [ "production" ];
|
||||
"ZFS-primary/hydra".useTemplate = [ "nix-prod" ];
|
||||
"ZFS-primary/nextcloud".useTemplate = [ "production" ];
|
||||
"ZFS-primary/mattermost".useTemplate = [ "production" ];
|
||||
# all docker containers should have a bind mount if they expect lasting zfs snapshots
|
||||
"ZFS-primary/vardocker".useTemplate = [ "nix-prod" ];
|
||||
"ZFS-primary/minio".useTemplate = [ "nix-prod" ];
|
||||
|
||||
@@ -194,21 +194,23 @@ in
|
||||
onSave = true;
|
||||
forwardSearchAfter = true;
|
||||
};
|
||||
forwardSearch = {
|
||||
executable = "zathura";
|
||||
args = [
|
||||
"--synctex-forward"
|
||||
"%l:1:%f"
|
||||
"-x"
|
||||
"zed %%{input}:%%{line}"
|
||||
"%p"
|
||||
];
|
||||
};
|
||||
#forwardSearch = {
|
||||
# #executable = "zathura";
|
||||
# args = [
|
||||
# "--synctex-forward"
|
||||
# "%l:1:%f"
|
||||
# "-x"
|
||||
# "zed %%{input}:%%{line}"
|
||||
# "%p"
|
||||
# ];
|
||||
#};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.gnome-keyring.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
cmake
|
||||
shellcheck
|
||||
@@ -268,7 +270,6 @@ in
|
||||
bitwarden-cli
|
||||
bitwarden-menu
|
||||
wtype
|
||||
zathura
|
||||
obsidian
|
||||
libreoffice-qt-fresh
|
||||
wlr-randr
|
||||
@@ -282,5 +283,8 @@ in
|
||||
|
||||
pdf4qt
|
||||
masterpdfeditor4
|
||||
|
||||
gitea-mcp-server
|
||||
tea
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user