From 4676201fce06a82eec012a436e9635cfbc073b78 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Fri, 7 Mar 2025 22:56:25 +0000
Subject: [PATCH] Format

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 hosts/common/configs/system/backup/default.nix        |  2 +-
 hosts/jupiter/default.nix                             |  2 +-
 .../storm/configs/console/podman/ntfy/default.nix     |  8 ++++++--
 .../storm/configs/console/podman/traefik/default.nix  |  1 +
 lib/runtime/merge/default.nix                         | 11 +----------
 lib/runtime/merge/keyValue/default.nix                | 11 +++++++++++
 lib/runtime/merge/{ => keyValue}/key-value.sh         |  0
 7 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 lib/runtime/merge/keyValue/default.nix
 rename lib/runtime/merge/{ => keyValue}/key-value.sh (100%)

diff --git a/hosts/common/configs/system/backup/default.nix b/hosts/common/configs/system/backup/default.nix
index 7a5a12a..c2d8367 100644
--- a/hosts/common/configs/system/backup/default.nix
+++ b/hosts/common/configs/system/backup/default.nix
@@ -5,7 +5,7 @@
       name = "backup";
       runtimeInputs = with pkgs; [
         btrfs-progs
-        coreutils-full
+        coreutils
         util-linux
       ];
       text = builtins.readFile ./backup.sh;
diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index 44c3981..90d8373 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -1,4 +1,4 @@
-{ lib, inputs, ... }:
+{ inputs, ... }:
 {
   imports = [
     inputs.disko.nixosModules.disko
diff --git a/hosts/jupiter/users/storm/configs/console/podman/ntfy/default.nix b/hosts/jupiter/users/storm/configs/console/podman/ntfy/default.nix
index a903f59..4e12a4b 100644
--- a/hosts/jupiter/users/storm/configs/console/podman/ntfy/default.nix
+++ b/hosts/jupiter/users/storm/configs/console/podman/ntfy/default.nix
@@ -84,8 +84,12 @@ in
             kill "$NTFY_PID"
             wait "$NTFY_PID" || true
 
-            NTFY_PASSWORD=${hmConfig.sops.placeholder."ntfy/users/karaolidis"} ntfy user add karaolidis || true
-            NTFY_PASSWORD=${hmConfig.sops.placeholder."ntfy/users/karaolidis"} ntfy user change-pass karaolidis
+            NTFY_PASSWORD="${
+              hmConfig.sops.placeholder."ntfy/users/karaolidis"
+            }" ntfy user add karaolidis || true
+            NTFY_PASSWORD="${
+              hmConfig.sops.placeholder."ntfy/users/karaolidis"
+            }" ntfy user change-pass karaolidis
             ntfy user change-role karaolidis admin
 
             exec ntfy serve
diff --git a/hosts/jupiter/users/storm/configs/console/podman/traefik/default.nix b/hosts/jupiter/users/storm/configs/console/podman/traefik/default.nix
index c76df12..d5c6856 100644
--- a/hosts/jupiter/users/storm/configs/console/podman/traefik/default.nix
+++ b/hosts/jupiter/users/storm/configs/console/podman/traefik/default.nix
@@ -86,6 +86,7 @@ in
           After = [
             "traefik-http.socket"
             "traefik-https.socket"
+            "sops-nix.service"
           ];
 
           Requires = [
diff --git a/lib/runtime/merge/default.nix b/lib/runtime/merge/default.nix
index b95d472..347ec94 100644
--- a/lib/runtime/merge/default.nix
+++ b/lib/runtime/merge/default.nix
@@ -1,13 +1,4 @@
 { pkgs, ... }:
 {
-  keyValue = "${
-    pkgs.writeShellApplication {
-      name = "merge-key-value";
-      runtimeInputs = with pkgs; [
-        coreutils
-        gawk
-      ];
-      text = builtins.readFile ./key-value.sh;
-    }
-  }/bin/merge-key-value";
+  keyValue = import ./keyValue { inherit pkgs; };
 }
diff --git a/lib/runtime/merge/keyValue/default.nix b/lib/runtime/merge/keyValue/default.nix
new file mode 100644
index 0000000..e4504c8
--- /dev/null
+++ b/lib/runtime/merge/keyValue/default.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+"${
+  pkgs.writeShellApplication {
+    name = "merge-key-value";
+    runtimeInputs = with pkgs; [
+      coreutils
+      gawk
+    ];
+    text = builtins.readFile ./key-value.sh;
+  }
+}/bin/merge-key-value"
diff --git a/lib/runtime/merge/key-value.sh b/lib/runtime/merge/keyValue/key-value.sh
similarity index 100%
rename from lib/runtime/merge/key-value.sh
rename to lib/runtime/merge/keyValue/key-value.sh