Format

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

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;

hosts/jupiter/default.nix

@@ -1,4 +1,4 @@
-{ lib, inputs, ... }:
+{ inputs, ... }:
 {
   imports = [
     inputs.disko.nixosModules.disko

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="${
-            NTFY_PASSWORD=${hmConfig.sops.placeholder."ntfy/users/karaolidis"} ntfy user change-pass karaolidis
+              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

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 = [

lib/runtime/merge/default.nix

@@ -1,13 +1,4 @@
 { pkgs, ... }:
 {
-  keyValue = "${
+  keyValue = import ./keyValue { inherit pkgs; };
-    pkgs.writeShellApplication {
-      name = "merge-key-value";
-      runtimeInputs = with pkgs; [
-        coreutils
-        gawk
-      ];
-      text = builtins.readFile ./key-value.sh;
-    }
-  }/bin/merge-key-value";
 }

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"