diff --git a/modules/msjd.nix b/modules/msjd.nix index 51983e4..ae9c610 100644 --- a/modules/msjd.nix +++ b/modules/msjd.nix @@ -22,7 +22,5 @@ in "PORT=3709" ]; }; - - ConditionPathIsDirectory = projectDir; }; } diff --git a/modules/secrets/default.nix b/modules/secrets/default.nix index 72ad18b..b83f5ab 100644 --- a/modules/secrets/default.nix +++ b/modules/secrets/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: let thisDir = ./.; @@ -7,8 +7,8 @@ let #!${pkgs.bash}/bin/bash set -euo pipefail if [[ -f "${thisDir}/secrets.age" && -f "${config.users.users."me".home}/.ssh/id_ed25519" ]]; then - ${pkgs.age}/bin/age -d -i "${config.users.users."me".home}/.ssh/id_ed25519" "${thisDir}/secrets.age" - end + ${pkgs.age}/bin/age -d -i "${config.users.users."me".home}/.ssh/id_ed25519" "${thisDir}/secrets.age" > /run/secrets.env + fi ''; in { @@ -16,9 +16,10 @@ in systemd.services.unlocker = { description = "Secrets manager"; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "oneshot"; - StandardOutput = "file:/run/secrets.env"; + User = "root"; RemainAfterExit = true; }; script = "${unlocker}/bin/unlocker";