Merge pull request 'add hostnames, remove refs' (#154) from feature/notifiarr-fixes into main

Reviewed-on: #154

flake.lock

@@ -76,11 +76,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1766203416,
+        "lastModified": 1766117060,
-        "narHash": "sha256-UrIuqnXvM+73owAiq1zjHNtaWrv72wD1yKO6jTowhTQ=",
+        "narHash": "sha256-wOPdAVKLiI1vE3IzNVR5mx0eM6Mf6+WWOsMETuKEyoU=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "8b55bb199045aa79e2965b7482b04ee4773192e3",
+        "rev": "0f011296901c43d84590b262ce64259b79dee3ac",
         "type": "gitlab"
       },
       "original": {
@@ -502,11 +502,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1766070988,
+        "lastModified": 1765779637,
-        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
         "type": "github"
       },
       "original": {
@@ -596,11 +596,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766198367,
+        "lastModified": 1766112155,
-        "narHash": "sha256-f1L1rCEu2Zew6zdiZ38jJDZd65ktE7UN+Gqn2LHPiFI=",
+        "narHash": "sha256-N0KUOJSIBw2fFF2ACZhwYX2e0EGaHBVPlJh7bnxcGE4=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "66bb33fdfb50b1ee724381c3f5d6012dac6c89b3",
+        "rev": "2a6db3fc1c27ae77f9caa553d7609b223cb770b5",
         "type": "github"
       },
       "original": {

hydra/jobsets.nix

@@ -18,7 +18,7 @@ let
     };
 
   prs = readJSONFile pulls;
-  refs = readJSONFile branches;
+  #refs = readJSONFile branches;
 
   # template for creating a job
   makeJob =
@@ -47,19 +47,19 @@ let
   giteaHost = "ssh://gitea@nayeonie.com:2222";
   repo = "ahuston-0/nix-dotfiles";
   # # 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
   jobOfPR = id: info: {
@@ -77,12 +77,12 @@ let
   # wrapper function for reading json from file
   readJSONFile = f: builtins.fromJSON (builtins.readFile f);
   # 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
   jobs = makeSpec (
     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
 {

systems/palatine-hill/docker/arr.nix

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