From 7124e2c0a55051564507b223f9c36cabe184f8b3 Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Sun, 23 Jul 2023 21:12:11 -0400
Subject: [PATCH] Update flake

---
 flake.lock | 18 +++++++++---------
 flake.nix  | 17 +++++------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 23f076f..a46c7e2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1666885127,
-        "narHash": "sha256-uXA/3lhLhwOTBMn9a5zJODKqaRT+SuL5cpEmOz2ULoo=",
+        "lastModified": 1688466019,
+        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "0e101dbae756d35a376a5e1faea532608e4a4b9a",
+        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1667629849,
-        "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=",
+        "lastModified": 1690031011,
+        "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62",
+        "rev": "12303c652b881435065a98729eb7278313041e49",
         "type": "github"
       },
       "original": {
@@ -37,11 +37,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1665349835,
-        "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=",
+        "lastModified": 1688049487,
+        "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1",
+        "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 918a1a7..3c8261f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,24 +6,17 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
   };
 
-  outputs = { self, flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit self; } {
+  outputs = inputs@{ self, flake-parts, ... }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [ "x86_64-linux" "aarch64-darwin" ];
       perSystem = { config, self', inputs', pkgs, system, ... }:
         let
           to-docker-compose = pkgs.writeShellApplication {
             name = "to-docker-compose";
-            runtimeInputs = [ pkgs.jsonnet ];
+            runtimeInputs = [ pkgs.go-jsonnet ];
             text =
-              let
-                vars = [ "PLEX_CLAIM" "PLEX_ADVERTISE_IP" "FIREFLY_APP_KEY" ];
-                varRow = var: "${var}: '\$${var}',";
-              in
               ''
-                jsonnet services.jsonnet \
-                  --tla-code secrets="{
-                    ${pkgs.lib.concatMapStrings varRow vars}
-                  }"
+                jsonnet services.jsonnet --tla-code-file secrets=.secrets.jsonnet
               '';
           };
           remote-docker-compose = pkgs.writeShellApplication {
@@ -41,7 +34,7 @@
         {
           devShells.default = pkgs.mkShell {
             buildInputs = with pkgs; [
-              jsonnet
+              go-jsonnet
               to-docker-compose
               remote-docker-compose
             ];