3 Commits

Author SHA1 Message Date
github-actions[bot]
c3596eb0d1 automated: Update flake.lock
All checks were successful
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 6s
Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m5s
Auto-generated by [update.yml][1] with the help of
[create-pull-request][2].

[1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml
[2]: https://forgejo.stefka.eu/jiriks74/create-pull-request
2025-12-22 12:09:22 +00:00
625d12d497 Merge pull request 'add hostnames, remove refs' (#154) from feature/notifiarr-fixes into main
All checks were successful
Check flake.lock / Check health of `flake.lock` (push) Successful in 14s
Check Nix flake / Perform Nix flake checks (push) Successful in 3m3s
Update flakes / update_lockfile (push) Successful in 9m59s
Reviewed-on: #154
2025-12-21 23:04:24 -05:00
f08d7ac1d2 add hostnames, remove refs
All checks were successful
Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 8s
Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m4s
2025-12-21 22:57:28 -05:00
3 changed files with 39 additions and 31 deletions

30
flake.lock generated
View File

@@ -76,11 +76,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1766289817, "lastModified": 1766376221,
"narHash": "sha256-Y2GlcwoB72HeWGB40y2V3rSw7b7o1mTlb7pLgod2WSA=", "narHash": "sha256-lgVbMWgkWTE9a2Ndgz0Y+QYW/gBzNyQ/IYA3j3MzVwU=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "6509da5789e9ee79a30983950b44a0f5ceaefb2a", "rev": "bcbdb535178d3c0fd6aba19f41b82858793586f5",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -242,11 +242,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766282146, "lastModified": 1766387499,
"narHash": "sha256-0V/nKU93KdYGi+5LB/MVo355obBJw/2z9b2xS3bPJxY=", "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "61fcc9de76b88e55578eb5d79fc80f2b236df707", "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -440,11 +440,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766248562, "lastModified": 1766370075,
"narHash": "sha256-NpjL3aX4Gn3nWKue6/3UDj5OVdZsGv2Qv9mfCaXB8Bc=", "narHash": "sha256-gbhR8+gNrhmYxKaNJpTjFivuibr3ZdlB5eU0a8yE36I=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "nixos-modules", "repo": "nixos-modules",
"rev": "a22343ed9bfe0dadbf51ef058cc2583824473fd4", "rev": "db6f2a33500dadb81020b6e5d4281b4820d1b862",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -596,11 +596,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1766285238, "lastModified": 1766371695,
"narHash": "sha256-DqVXFZ4ToiFHgnxebMWVL70W+U+JOxpmfD37eWD/Qc8=", "narHash": "sha256-W7CX9vy7H2Jj3E8NI4djHyF8iHSxKpb2c/7uNQ/vGFU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "c4249d0c370d573d95e33b472014eae4f2507c2f", "rev": "d81285ba8199b00dc31847258cae3c655b605e8c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -650,11 +650,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1765897595, "lastModified": 1766360762,
"narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=", "narHash": "sha256-g0aHXl+htuBpBpYxeXemocARRr1xtyNPzIIV1/tofAc=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "e6829552d4bb659ebab00f08c61d8c62754763f3", "rev": "c53b4a548a75895c69811a719bb4ed750ea41a17",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -18,7 +18,7 @@ let
}; };
prs = readJSONFile pulls; prs = readJSONFile pulls;
refs = readJSONFile branches; #refs = readJSONFile branches;
# template for creating a job # template for creating a job
makeJob = makeJob =
@@ -47,19 +47,19 @@ let
giteaHost = "ssh://gitea@nayeonie.com:2222"; giteaHost = "ssh://gitea@nayeonie.com:2222";
repo = "ahuston-0/nix-dotfiles"; repo = "ahuston-0/nix-dotfiles";
# # Create a hydra job for a branch # # Create a hydra job for a branch
jobOfRef = #jobOfRef =
name: # name:
{ ref, ... }: # { ref, ... }:
if ((builtins.match "^refs/heads/(.*)$" ref) == null) then # if ((builtins.match "^refs/heads/(.*)$" ref) == null) then
null # null
else # else
{ # {
name = builtins.replaceStrings [ "/" ] [ "-" ] "branch-${name}"; # name = builtins.replaceStrings [ "/" ] [ "-" ] "branch-${name}";
value = makeJob { # value = makeJob {
description = "Branch ${name}"; # description = "Branch ${name}";
flake = "git+${giteaHost}/${repo}?ref=${ref}"; # flake = "git+${giteaHost}/${repo}?ref=${ref}";
}; # };
}; # };
# Create a hydra job for a PR # Create a hydra job for a PR
jobOfPR = id: info: { jobOfPR = id: info: {
@@ -77,12 +77,12 @@ let
# wrapper function for reading json from file # wrapper function for reading json from file
readJSONFile = f: builtins.fromJSON (builtins.readFile f); readJSONFile = f: builtins.fromJSON (builtins.readFile f);
# remove null values from a set, in-case of branches that don't exist # remove null values from a set, in-case of branches that don't exist
mapFilter = f: l: builtins.filter (x: (x != null)) (map f l); #mapFilter = f: l: builtins.filter (x: (x != null)) (map f l);
# Create job set from PRs and branches # Create job set from PRs and branches
jobs = makeSpec ( jobs = makeSpec (
builtins.listToAttrs (map ({ name, value }: jobOfPR name value) (attrsToList prs)) builtins.listToAttrs (map ({ name, value }: jobOfPR name value) (attrsToList prs))
// builtins.listToAttrs (mapFilter ({ name, value }: jobOfRef name value) (attrsToList refs)) #// builtins.listToAttrs (mapFilter ({ name, value }: jobOfRef name value) (attrsToList refs))
); );
in in
{ {

View File

@@ -50,6 +50,7 @@ in
bazarr = { bazarr = {
image = "ghcr.io/linuxserver/bazarr:latest"; image = "ghcr.io/linuxserver/bazarr:latest";
ports = [ "6767:6767" ]; ports = [ "6767:6767" ];
hostname = "bazarr";
environment = { environment = {
PUID = "600"; PUID = "600";
PGID = "100"; PGID = "100";
@@ -72,6 +73,7 @@ in
prowlarr = { prowlarr = {
image = "ghcr.io/linuxserver/prowlarr:latest"; image = "ghcr.io/linuxserver/prowlarr:latest";
ports = [ "9696:9696" ]; ports = [ "9696:9696" ];
hostname = "prowlarr";
environment = { environment = {
PUID = "600"; PUID = "600";
PGID = "100"; PGID = "100";
@@ -85,6 +87,7 @@ in
radarr = { radarr = {
image = "ghcr.io/linuxserver/radarr:latest"; image = "ghcr.io/linuxserver/radarr:latest";
ports = [ "7878:7878" ]; ports = [ "7878:7878" ];
hostname = "radarr";
environment = { environment = {
PUID = "600"; PUID = "600";
PGID = "100"; PGID = "100";
@@ -101,6 +104,7 @@ in
sonarr = { sonarr = {
image = "ghcr.io/linuxserver/sonarr:latest"; image = "ghcr.io/linuxserver/sonarr:latest";
ports = [ "8989:8989" ]; ports = [ "8989:8989" ];
hostname = "sonarr";
environment = { environment = {
PUID = "600"; PUID = "600";
PGID = "100"; PGID = "100";
@@ -117,6 +121,7 @@ in
lidarr = { lidarr = {
image = "ghcr.io/linuxserver/lidarr:latest"; image = "ghcr.io/linuxserver/lidarr:latest";
ports = [ "8686:8686" ]; ports = [ "8686:8686" ];
hostname = "lidarr";
environment = { environment = {
PUID = "600"; PUID = "600";
PGID = "100"; PGID = "100";
@@ -133,6 +138,7 @@ in
unpackerr = { unpackerr = {
image = "golift/unpackerr:latest"; image = "golift/unpackerr:latest";
user = "600:100"; user = "600:100";
hostname = "unpackerr";
environment = { environment = {
TZ = "America/New_York"; TZ = "America/New_York";
}; };
@@ -147,6 +153,7 @@ in
image = "golift/notifiarr:latest"; image = "golift/notifiarr:latest";
ports = [ "5454:5454" ]; ports = [ "5454:5454" ];
user = "600:100"; user = "600:100";
hostname = "notifiarr";
environment = { environment = {
TZ = "America/New_York"; TZ = "America/New_York";
} }
@@ -161,6 +168,7 @@ in
}; };
jellyseerr = { jellyseerr = {
image = "fallenbagel/jellyseerr:latest"; image = "fallenbagel/jellyseerr:latest";
hostname = "jellyseerr";
environment = { environment = {
PUID = "600"; PUID = "600";
PGID = "100"; PGID = "100";