diff --git a/modules/flake/deploy.nix b/modules/flake/deploy.nix index 1b65964..db11e63 100644 --- a/modules/flake/deploy.nix +++ b/modules/flake/deploy.nix @@ -5,6 +5,7 @@ let deploy-rs nixpkgs nixos-anywhere + agenix ; inherit (nixpkgs) lib; @@ -29,11 +30,11 @@ in { apps = rec { default = deploy; - # secrets = { - # type = "app"; - # program = "${agenix.packages.${system}.agenix}/bin/agenix"; - # meta.description = ""; - # }; + secrets = { + type = "app"; + program = "${agenix.packages.${system}.agenix}/bin/agenix"; + meta.description = ""; + }; install = { type = "app"; program = "${nixos-anywhere.packages.${system}.nixos-anywhere}/bin/nixos-anywhere"; diff --git a/modules/nixos/common/otf.nix b/modules/nixos/common/otf.nix index 5a3fda2..69d6618 100644 --- a/modules/nixos/common/otf.nix +++ b/modules/nixos/common/otf.nix @@ -19,10 +19,6 @@ in }; package = lib.mkPackageOption pkgs "otf" { }; pgPackage = lib.mkPackageOption pkgs "postgresql_16" { }; - environmentFile = lib.mkEnableOption { - type = with lib.types; nullOr path; - default = lib.types.null; - }; # this application is configured entirely by environment variables and needs to be exposed environment = lib.mkOption { type = @@ -89,7 +85,6 @@ in WorkingDirectory = cfg.dataDir; ExecStart = "${cfg.package}/bin/otfd"; Restart = "on-failure"; - EnvironmentFile = lib.mkIf (cfg.environment.file != null) cfg.environment.file; }; }; };