From dc0deeb9bce21b08833da55d172f335183ddb34b Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 28 Apr 2024 16:38:54 +0900 Subject: [PATCH] Update atuin --- home-manager/common/software/cli/atuin.nix | 3 ++- nixos/users/albert/default.nix | 6 +++++- secrets/secrets.yaml | 8 +++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/home-manager/common/software/cli/atuin.nix b/home-manager/common/software/cli/atuin.nix index dca51b34..e8eb38dc 100644 --- a/home-manager/common/software/cli/atuin.nix +++ b/home-manager/common/software/cli/atuin.nix @@ -11,7 +11,8 @@ sync_address = "https://atuin.sysctl.io"; search_mode = "prefix"; secrets_filter = true; - session_path = "/run/secrets/services/atuin_session"; + session_path = "/run/secrets/atuin/session"; + key_path = "/run/secrets/atuin/key"; }; }; } diff --git a/nixos/users/albert/default.nix b/nixos/users/albert/default.nix index 0e93bb55..c039bb97 100644 --- a/nixos/users/albert/default.nix +++ b/nixos/users/albert/default.nix @@ -32,7 +32,11 @@ in { # Make this user trusted nix.settings.trusted-users = [ "albert" ]; - sops.secrets."services/atuin_session" = { + sops.secrets."atuin/key" = { + owner = "albert"; + sopsFile = ../../../secrets/secrets.yaml; + }; + sops.secrets."atuin/session" = { owner = "albert"; sopsFile = ../../../secrets/secrets.yaml; }; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 2e52289d..1399ee53 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -2,15 +2,17 @@ services: promtail: ENC[AES256_GCM,data:NULM4o3ujFnx+/NKjMRQ5bi/nFViSNPjg0bmVlBDSt/1GWwxozHqeFwbbqC+cAOGRZvd3J5daqlB95nsPaBxrw==,iv:o2hvumFBQlkBrBV6qJrt9t3TF8oLiF3dByuILCandwE=,tag:CZbx+Ls5R8yrbBQMs1uewg==,type:str] telegraf: ENC[AES256_GCM,data:o8zXVQ42vV4dDg3rljBE5xmSRQDorj6/CCtzbo6gr+fxnF37MPpH+0MJfQrZEzY=,iv:z2gotp149hfl0mWBhiWWbNtU8v+L6gdv5EqkqgwF9s8=,tag:hkmtMds+iQ97pYwU9QubpQ==,type:str] forgejo_token: ENC[AES256_GCM,data:vAH8v82+WI/P0HhtLDfrK66B3u2H49XA1AglfL1LthM6Dm+znBlx4QaFmNk3ag==,iv:/jqtUejqNC9f9kXdUqxl1+LaxKsjXSZdU+I0u+ssmdQ=,tag:+2oWh6sgc7R1PXYxIz3oVQ==,type:str] - atuin_session: ENC[AES256_GCM,data:cwN9Ar4yO/d4Asz2RZ1ywCEVxpN5vJp1Blq+6txNGEo=,iv:Sa7X3rsvUzbgf59A0hvrxx/CFM12XhNNUJEj5thXb4s=,tag:ynFnJdnSLei/gON92lDscQ==,type:str] +atuin: + session: ENC[AES256_GCM,data:CLsn+XQUurOOB1dWsfrRHeywXA13A59itrBlrJEiWZ0=,iv:33W2RBNk9iV+qvm6+mUE8TBrhxSWswAr8QhTJ0QXgFk=,tag:Sco2pCpo3Wu9/2WdNPVD6A==,type:str] + key: ENC[AES256_GCM,data:dJZ98dZC+IrwAU3QXVqtGpph3SJOxsNDiWgXD561zDGLT+MD2a7eoKUSq24IS25eFdPa5Sa2de+VBWNta5uplR2k3LqmUFJ/WJpcylM=,iv:VWZqKInzxjruJWfM9hqeM+b3FgKRGjIpW+U80+bonPY=,tag:9qchueu5qR+Z+Rxb1WQvjw==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] age: [] - lastmodified: "2024-04-28T05:40:57Z" - mac: ENC[AES256_GCM,data:qfUMb68h30Zvvenp9/KeWPFkk2FIjulioQ+GJLK8Ya+wOH1xuCqWCeywwHx3/AuBYQnQEXgD2bN0XmgfXJMV3zxQIGZ0XjdCrwAvMdLGwsFdGwf/tkRkzzqrtRaoeb2Md2QpUvVmNDxbdMjYcQFKL9ZbZwMyrVV6/a8OJIsKodQ=,iv:4WEaNMME4c+jOTT+DxT1Vu9m02/ig5we4pBfT2CxR2M=,tag:RPmjtmTXo4g9Yt8BJo7oIQ==,type:str] + lastmodified: "2024-04-28T07:38:39Z" + mac: ENC[AES256_GCM,data:MrnkhcMmC/h7Wtg77BKgRAkF0Nl73L1PJ71YZBoS4fNNUc1OlBzod9+4rA9m7DCVjZremH6YWcKQkltU5iNBt1Yf3UtOsnf0RLgmKdG3rdlPveMHEwUEiHCLj1VTEBzB9JA226XUk8Xe9rg5P0pzbkY6C0oAkEIp9JqRORnYez0=,iv:xqcM1kMFjb/1tG1S7G/YtGvVz1tURe7FJdQsSicFH1c=,tag:MyaETHjGk/I4u4ObTNA3/w==,type:str] pgp: - created_at: "2024-04-28T00:33:16Z" enc: |-