update flake lock, set nixpkgs config for IFD

flake.lock

@@ -76,11 +76,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1765080359,
+        "lastModified": 1765685099,
-        "narHash": "sha256-BvAgmqgswcokD2eWoyO3uB1k1VTdpxDHGSx0RYRFjDg=",
+        "narHash": "sha256-D4VYn8NN0sLOzoo4geYDiV/T/Ilor78CaS50gNq6Ep0=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "35f8ab2ecd954b3a348aa0e253878211c48a0aa7",
+        "rev": "51712b3d3481dfaeef9a5f8b293ea1aa04a61cdb",
         "type": "gitlab"
       },
       "original": {
@@ -125,11 +125,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1763759067,
+        "lastModified": 1765495779,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
         "type": "github"
       },
       "original": {
@@ -242,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764998300,
+        "lastModified": 1765682243,
-        "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=",
+        "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb",
+        "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
         "type": "github"
       },
       "original": {
@@ -337,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765080594,
+        "lastModified": 1765267181,
-        "narHash": "sha256-5t3d655GqLblE+p5xN5ntkeRfZBesN7vehOWcRcU88M=",
+        "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "4194c582d0a3f440382ee00b729ea5cc5ef59754",
+        "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
         "type": "github"
       },
       "original": {
@@ -440,11 +440,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764726320,
+        "lastModified": 1765680822,
-        "narHash": "sha256-0AD/V/uCDG15xZSkQayaKjn/4Rlvoilwa+PsoSaubco=",
+        "narHash": "sha256-e5YH/ypoOYwmT7mnK1NzxHMg9XMIOr449TdCivh1cHs=",
         "owner": "NuschtOS",
         "repo": "nixos-modules",
-        "rev": "1e03233c1b662f91c5ff8c7dba1a0a693a930e51",
+        "rev": "457cb20476534590ea8911a6cc5f614fcc683528",
         "type": "github"
       },
       "original": {
@@ -455,11 +455,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1765053261,
+        "lastModified": 1764020296,
-        "narHash": "sha256-CBVtkpfM7pMgXuXvByXn53p5lSm7fiDZK4EGOMnhaoo=",
+        "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "60a511057b110094129bdfb99f343548b59f0aba",
+        "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829",
         "type": "github"
       },
       "original": {
@@ -502,11 +502,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1764950072,
+        "lastModified": 1765472234,
-        "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
+        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f61125a668a320878494449750330ca58b78c557",
+        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
         "type": "github"
       },
       "original": {
@@ -552,11 +552,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765016596,
+        "lastModified": 1765464257,
-        "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=",
+        "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c",
+        "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509",
         "type": "github"
       },
       "original": {
@@ -596,11 +596,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765075567,
+        "lastModified": 1765680428,
-        "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=",
+        "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f",
+        "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f",
         "type": "github"
       },
       "original": {
@@ -616,11 +616,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765079830,
+        "lastModified": 1765684837,
-        "narHash": "sha256-i9GMbBLkeZ7MVvy7+aAuErXkBkdRylHofrAjtpUPKt8=",
+        "narHash": "sha256-fJCnsYcpQxxy/wit9EBOK33c0Z9U4D3Tvo3gf2mvHos=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "aeb517262102f13683d7a191c7e496b34df8d24c",
+        "rev": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc",
         "type": "github"
       },
       "original": {
@@ -650,11 +650,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1765047449,
+        "lastModified": 1765474444,
-        "narHash": "sha256-VQcqjJ2g0kT9TW4ENwA2HBQJzfbCUd5s1Wm3K+R2QZY=",
+        "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "bd00e01aab676aee88e6cc5c9238b4a5a7d6639a",
+        "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e",
         "type": "github"
       },
       "original": {

modules/nix.nix

@@ -1,5 +1,6 @@
 { lib, pkgs, ... }:
 {
+  nixpkgs.config.allowImportrFromDerivation = true;
   nix = {
     #package = pkgs.nixVersions.latest;
     diffSystem = true;

systems/palatine-hill/docker/arr.nix

@@ -1,51 +1,13 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
 let
   vars = import ../vars.nix;
-  arr_postgres_config =
-    container_type:
-    let
-      ctype = lib.strings.toUpper container_type;
-    in
-    {
-      "${ctype}__POSTGRES__HOST" = "host.docker.internal";
-      "${ctype}__POSTGRES__USER" = "SOPS_ONLY";
-      "${ctype}__POSTGRES__PASSWORD" = "SOPS_ONLY";
-      "${ctype}__POSTGRES__PORT" = toString config.services.postgresql.settings.port;
-    };
 in
 {
-  # Notes:
-  # Jellyplex-watched - sync watch status between plex and jellyfin as long as users and library is the same
-  # Tdarr - for distributed transcoding?
-  #
-  # list of containers supporting postgres:
-  #   bazarr:
-  #     POSTGRES_ENABED: true
-  #     POSTGRES_HOST:
-  #     POSTGRES_PORT:
-  #     POSTGRES_DATABASE: bazarr
-  #     POSTGRES_USERNAME: arr
-  #     POSTGRES_PASSWORD: sops
-  #   prowlarr:
-  #     see ctype
-  #   radarr:
-  #     see ctype
-  #   sonarr:
-  #     see ctype
-  #   lidarr:
-  #     see ctype
-  #   jellyseerr:
-  #     DB_TYPE: postgres
-  #     DB_HOST:
-  #     DB_PORT:
-  #     DB_USER: arr
-  #     DB_PASS: sops
-  #     DB_NAME: jellyseerr
-  #
   virtualisation.oci-containers.containers = {
     bazarr = {
       image = "ghcr.io/linuxserver/bazarr:latest";
@@ -54,19 +16,11 @@ in
         PUID = "600";
         PGID = "100";
         TZ = "America/New_York";
-        POSTGRES_HOST = "host.docker.internal";
-        POSTGRES_USER = "SOPS_ONLY";
-        POSTGRES_PASSWORD = "SOPS_ONLY";
-        POSTGRES_PORT = toString config.services.postgresql.settings.port;
       };
       volumes = [
         "${vars.primary_docker}/bazarr:/config"
         "${vars.primary_plex_storage}/data:/data"
       ];
-      extraOptions = [
-        "--network=arrnet"
-        "--add-host=host.docker.internal:host-gateway"
-      ];
       autoStart = true;
     };
     prowlarr = {
@@ -76,9 +30,7 @@ in
         PUID = "600";
         PGID = "100";
         TZ = "America/New_York";
-      }
+      };
-      // arr_postgres_config "prowlarr";
-      extraOptions = [ "--network=arrnet" ];
       volumes = [ "${vars.primary_docker}/prowlarr:/config" ];
       autoStart = true;
     };
@@ -89,13 +41,11 @@ in
         PUID = "600";
         PGID = "100";
         TZ = "America/New_York";
-      }
+      };
-      // arr_postgres_config "radarr";
       volumes = [
         "${vars.primary_docker}/radarr:/config"
         "${vars.primary_plex_storage}/data:/data"
       ];
-      extraOptions = [ "--network=arrnet" ];
       autoStart = true;
     };
     sonarr = {
@@ -105,13 +55,11 @@ in
         PUID = "600";
         PGID = "100";
         TZ = "America/New_York";
-      }
+      };
-      // arr_postgres_config "sonarr";
       volumes = [
         "${vars.primary_docker}/sonarr:/config"
         "${vars.primary_plex_storage}/data:/data"
       ];
-      extraOptions = [ "--network=arrnet" ];
       autoStart = true;
     };
     lidarr = {
@@ -121,13 +69,11 @@ in
         PUID = "600";
         PGID = "100";
         TZ = "America/New_York";
-      }
+      };
-      // arr_postgres_config "lidarr";
       volumes = [
         "${vars.primary_docker}/lidarr:/config"
         "${vars.primary_plex_storage}/data:/data"
       ];
-      extraOptions = [ "--network=arrnet" ];
       autoStart = true;
     };
     unpackerr = {
@@ -140,60 +86,36 @@ in
         "${vars.primary_docker}/unpackerr:/config"
         "${vars.primary_plex_storage}:/data"
       ];
-      extraOptions = [ "--network=arrnet" ];
       autoStart = true;
     };
     notifiarr = {
       image = "golift/notifiarr:latest";
-      ports = [ "5454:5454" ];
       user = "600:100";
       environment = {
         TZ = "America/New_York";
-      }
+      };
-      // arr_postgres_config "notifiarr";
-      environmentFiles = [ config.sops.secrets."docker/notifiarr".path ];
       volumes = [
         "${vars.primary_docker}/notifiarr:/config"
         "${vars.primary_plex_storage}:/data"
       ];
-      extraOptions = [ "--network=arrnet" ];
       autoStart = true;
     };
-    jellyseerr = {
+    overseerr = {
-      image = "fallenbagel/jellyseerr:latest";
+      image = "fallenbagel/jellyseerr:preview-seerr";
       environment = {
         PUID = "600";
         PGID = "100";
         TZ = "America/New_York";
-        DB_TYPE = "postgres";
-        DB_HOST = "host.docker.internal";
-        DB_PORT = toString config.services.postgresql.settings.port;
-        DB_USER = "SOPS_ONLY";
-        DB_PASS = "SOPS_ONLY";
       };
       volumes = [ "${vars.primary_docker}/overseerr:/config" ];
       # TODO: remove ports later since this is going through web
-      extraOptions = [
-        "--network=arrnet"
-        "--network=haproxy-net"
-        # "--health-cmd \"wget --no-verbose --tries 1 --spider http://localhost:5055/api/v1/status || exit 1\""
-        # "--health-start-period 20s"
-        # "--health-timeout 3s"
-        # "--health-interval 15s"
-        # "--health-retries 3"
-      ];
       ports = [ "5055:5055" ]; # Web UI port
       dependsOn = [
         "radarr"
         "sonarr"
       ];
+      extraOptions = [ "--network=haproxy-net" ];
       autoStart = true;
     };
   };
-
-  sops = {
-    secrets = {
-      "docker/notifiarr".owner = "docker-service";
-    };
-  };
 }

systems/palatine-hill/hydra.nix

@@ -43,9 +43,9 @@ in
     hydra = {
       enable = true;
       package = inputs.hydra.packages.x86_64-linux.hydra.overrideAttrs (old: {
-        preCheck = ''
+        checkPhase = ''
           export YATH_JOB_COUNT=8
-          ${old.preCheck or ""}
+          ${old.checkPhase or "yath test"}
         '';
       });
       hydraURL = "https://hydra.alicehuston.xyz";

systems/palatine-hill/postgresql.nix

@@ -1,5 +1,6 @@
 {
   config,
+  lib,
   pkgs,
   ...
 }:

systems/palatine-hill/secrets.yaml

@@ -25,7 +25,7 @@ docker:
     collabora: ENC[AES256_GCM,data:LPRkzPEv5qfzeWSDbf+L+0asfmiK5Mhj8jCdfVyvVQAaD75Cbo4qLD0Nc80z,iv:/l2vAyYYJChhv6T+JkHT4I74ZpdhvbVqxlDWIM4Y4bw=,tag:/+uzn1vtd1RnO9/lGiQAKA==,type:str]
     delugevpn: ENC[AES256_GCM,data:YGkgaQUuA9oteKD77tnFzxZSHctyOQjMNlfvJr3mPWAl2P8wfcshiUoa6SNp69pagxbzRV6mfuzwzinbkQCoZN3lw7uF76y0,iv:Bro0H4tFR+3wi9DGGq9a6ge4o4uPlVXBUF7h17zyqg8=,tag:N1kVNFasqGMx8R9qTq2dJA==,type:str]
     protonvpn-start-script: ENC[AES256_GCM,data:ZnlDpCLdILHXSUCI6itWkqO4y75Lwjj7qT1DBkfueLneQOaQ0JhuE2FbOOajkmI046nP9fMrJbu3g4QZHsq1g8yqGU1wb0OOT+eS9+M92Md29B4NnUdwnVAO6/RzvRKXP2tsQ4iprx9An+BEFwZYD6WG6DQc6NjJVSgRcYvfH9rQey2VdwLysNsgFCs8eC6QgikqBpeg4eOIvDDNbdXPKkW+ZPph9xpzGkcFIMwlX5esg0n7qyUoMvWwBn4avC46U5erOw0fNajY60ri9sm5Afht6LZrFal71Hx/K9/5EXBp9dD4teLO2Ew0CQX0i94pKCuR207l9868s7Ao3udLp4wbiLnXoRKq+w==,iv:qR0kNYpb50NXEqSksvHBPAaRG51RKCsSwTq32nosxzo=,tag:+xRQyuWi4Ja/N9lcd11oJA==,type:str]
-    notifiarr: ENC[AES256_GCM,data:XxVEhp4Rei6mRcdSSooRnofuVNZDalVhDYiVUmvQUr8QihrVRMKRE9Kpl5PGWUBw,iv:urMLaUf3XUjMks2vk0E7iRUU3mLHBiMAiwtQgmWQq20=,tag:dHdTOyC/ukd71UlYEI5fWw==,type:str]
+    notifiarr: ENC[AES256_GCM,data:8p7+58u1WSjBMjgxxkyDVp0CK26RMBAOFe7Ax5ugfs85+K97loSCAgTaDzplkHwZ0W1jc7rKUyEp6H22R+VwIUL5CvlYZ4XIZbcbrTfcuAqXcVExDNP/hQQs0Kg6,iv:kXKVrHPiBKvUvaeZvf1AG8M+Zu3SaSv5UacBqeHeBWA=,tag:jiZe/6oEZ8IPybZ3rDevEg==,type:str]
 acme:
     bunny: ENC[AES256_GCM,data:P2yROVUga9mORcq8VR/l0i4/2Vod1zvlYq+ZJLLNKow0SpblkwQX/i1ucQYAOkTTRddN+3C+t0zj1rMWkdLoaLjEUJJi3VsSxi+chV2FFiVKFQGEcg24,iv:aQvGgGLsgRGoEmwTgZHR8Jm/MYxmGtVTT/fZKaTLeMs=,tag:m3ssF4O8qs4yxvMu6yUcjw==,type:str]
     dnsimple: ENC[AES256_GCM,data:37FKyBibFtXZgI4EduJQ0z8F+shBc5Q6YlLa3YkVPh9XuJVS20eybi75bfJxiozcZ9d+YRaqcbkBQCSdFOCotDU=,iv:oq3JjqbfAm2C4jcL1lvUb2EOmnwlR07vPoO8H0BmydQ=,tag:E3NO/jMElL6Q817666gIyg==,type:str]
@@ -44,8 +44,8 @@ sops:
             cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At
             LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-12-08T03:05:16Z"
+    lastmodified: "2025-10-15T02:30:11Z"
-    mac: ENC[AES256_GCM,data:gIw//fnDU/lE2rDP4890MjnQ2xp0I4fXwvSWrLC0kFjW1RMLzNCaRLlJzw5/khALH/IZgTrnRqTHF3zHZd+mlyqvC/vzkyBBVdWRRX6w5l9JhFDfe83r86tvsV9G/AOeRchDp1gGuBBNkRamSuCOj7QFc1l334e/jNdKDadhwgI=,iv:nrOQxvJBce5/NDvpowJX/AiIssQdNOStvjj/Lkutppk=,tag:MlRJxbG3laajsi5KHAxy5g==,type:str]
+    mac: ENC[AES256_GCM,data:uG3ZnIAepcCDFXZNhE18dqd0R3pL0a4JTxTaYx8fnaoT3ooN580yIA6tfjGj+6M3JyqPCM56dmqmnMsPplkr+WToW5Wgc8EBe+L2UdSpVK6Zk1ClxvG+NMmZK0u+dNOszJHpoRWTFLl5Wffku9hKEwcgYTA0nwVcrqPc3FSZQyA=,iv:hN2Wfr/IopxM1ItekB7YcXPjR5zBIwPvq1EzW1yjS34=,tag:ao059oZR+kT7IMBF4b2aAQ==,type:str]
     pgp:
         - created_at: "2024-11-28T18:56:39Z"
           enc: |-

systems/palatine-hill/zfs.nix

@@ -49,7 +49,7 @@
           daily = 30;
           weekly = 0;
           monthly = 6;
-          yearly = 2;
+          yearly = 3;
           autosnap = true;
           autoprune = true;
         };

users/alice/non-server.nix

@@ -108,8 +108,5 @@
 
     # media tools
     #deepin.deepin-music
-
-    # arch zed deps
-    nixd
   ];
 }