diff --git a/flake.nix b/flake.nix index 77979f4..cd62a99 100644 --- a/flake.nix +++ b/flake.nix @@ -118,9 +118,7 @@ runCommandHook = { newalan = pkgs.writeScript "run-me" '' #!${pkgs.runtimeShell} - echo ${self.rev} - - bd=$(mktemp -d) + export bd=$(mktemp -d) cd $bd @@ -133,7 +131,9 @@ cd * ls PATH=${pkgs.nixos-container}/bin:$PATH - ${pkgs.sops}/bin/sops -d secrets/deploy.sh | ${pkgs.runtimeShell} + ${pkgs.sops}/bin/sops -i -d secrets/deploy.sh + chmod +x ./secrets/deploy.sh + ./secrets/deploy.sh cd rm -rf $bd ''; diff --git a/secrets/deploy.sh b/secrets/deploy.sh index da65da3..89b888f 100644 --- a/secrets/deploy.sh +++ b/secrets/deploy.sh @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:rgDgcWXPEdH9F3IE2LFawVduiZK8bLHYrcaZ0tWgZ/tJyFJKWGwx4znyexeS/hmCXHrWLmGCbDPvAgLyuz8dLrTyrUt6m3RDjK/3d8XKWOc/R5hsjFnYmVGfWX/s+b5MzcG0HLMQFmOExA9kcMCo,iv:px+IFpQzmf3/RN1zDfqAjioW5I0c66AQ6Jlx4CI/WLM=,tag:R4GQ8/Jv7qdKUOIOGROxbQ==,type:str]", + "data": "ENC[AES256_GCM,data:fjXZHtS6NQJJVDLpWKdU/wYwB9xIDDy8Gn1+ZO+j2i4vo4a1z/RqbPzeMivYissdbnexzKwNWG/kXOC+hufaeQCyHZYyDH5ZTNsVMXheTspgAtFNyOSQJ8GV0nXWgNWrbELwS89Kp8P4e5VXGJcIaGwx04fYN+NOkttgYd1kxsZvBKMcnTZd,iv:Qiy/f/szojwtFKSfXwcxdCVp/sd+ekKNuWp1g2+NgN4=,tag:2kToZV5zqbpQepyjt5Do7A==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -15,8 +15,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKdUtHMERreXlZTGRGMWlM\nbldjMHFWWWRQZHRvZWx5QmhmVno0VmZQNmljCnFRUnZxT29iZkNxaExQbCtUNFFy\nMkttVkkrQkh0Ky91bnRxRmJ4VDk0N2MKLS0tIHhYREFwRUZ6a1BDM1FWZjlpcTJR\nVW5YSkwvZWQyMXNuaUdBTWpwa2Y1VWcKawzPRiMB/ruOBCylNssB/k+hITJDYX+6\nKpwHk9Avh6Pzhptm21yeY1zmVQkqEx6YU24aJiqs1RRmrQAvnWr3WQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2023-03-10T01:06:44Z", - "mac": "ENC[AES256_GCM,data:RNPujoMopAVzbFpkgJ8TFVZltuLTmAAxl4jCwIMuILvs0wL/YVRQR8jy+aYdsKidIJ3lxdiiC+fPoSt673WZ73OB3LFMwv2Raf3HxAE7Ky80k0c7odHdysrWKrLChF7dbTvI8UIbndm+m3W44ihSQRycUbmGXPNOsHCwVFtVSao=,iv:ierfB9hrX57RBCus6BsGsqYPdFUQ4rtg+5usLi3heGU=,tag:5Gq6zkVz6qYn6dU/hsqzrw==,type:str]", + "lastmodified": "2023-03-10T01:09:11Z", + "mac": "ENC[AES256_GCM,data:gG50WFCZlY0947CurN1+fGpGUM3OtzfwrnfgUmKHgOFdwn62DuYeNnm4/WKrA4qo+nwY/WoMSZRWGy+uEPz/DYbCVDjY/vnyt/A9hQ3oThRA3S8vsJiIPZ+5yhmnvsnAoV8arJ7v0bCN4/81CG0UVmfhNsZKc7E8tzyT3xk02O8=,iv:oXy8vFb/ag8U9/ULrkFe0qqqAi9+dXA0B8TZwYhgcbc=,tag:y3LVF5fx4nsqLvJTDXLtcg==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.7.3"