diff options
| -rw-r--r-- | hm/conf/git.nix | 2 | ||||
| -rw-r--r-- | hm/soft/obs.nix | 7 | ||||
| -rw-r--r-- | os/srv/sops.nix | 3 | ||||
| -rw-r--r-- | secrets.yaml | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/hm/conf/git.nix b/hm/conf/git.nix index b297153..09bd9e1 100644 --- a/hm/conf/git.nix +++ b/hm/conf/git.nix @@ -10,7 +10,7 @@ in lfs.enable = true; settings = { user.name = "adikro"; - user.email = "adikro@disroot.org"; + user.email = "/run/secrets/git/email"; init.defaultBranch = "main"; }; }; diff --git a/hm/soft/obs.nix b/hm/soft/obs.nix index 8d968e4..235187c 100644 --- a/hm/soft/obs.nix +++ b/hm/soft/obs.nix @@ -2,13 +2,10 @@ config, lib, pkgs, - osConfig, ... }: let cfg = config.hm.soft.obs; - - obsPass = osConfig.sops.placeholdder."obs/websocket_password" or null; in { options.hm.soft.obs.enable = lib.mkEnableOption "enables obs video recording and clipping"; @@ -22,8 +19,8 @@ in home.packages = [ pkgs.obs-cmd ]; - home.sessionVariables = lib.mkIf (obsPass != null) { - OBS_WEBSOCKET_URL = obsPass; + home.sessionVariables = { + OBS_WEBSOCKET_URL = "/run/secrets/obs/password"; }; }; } diff --git a/os/srv/sops.nix b/os/srv/sops.nix index 85a5123..b11dee0 100644 --- a/os/srv/sops.nix +++ b/os/srv/sops.nix @@ -22,6 +22,9 @@ in "obs/websocket_password" = { owner = username; }; + "git/email" = { + owner = username; + }; }; }; }; diff --git a/secrets.yaml b/secrets.yaml index da1b6a6..64cba76 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -2,6 +2,8 @@ syncthing: gui_password: ENC[AES256_GCM,data:9sivtxELQRCD+q1OFMmL9OwMnem22VxFRN9twVdnMlTMmtxplO/KmezuLt+SUpfhDne0i9cTliiqCm16bQb3fFQWplJIyQDRgIGr1Y7r4boGtvJ95oSIW3bmwJW+IkYyYysKbcNrTGfdWVS6lJWYfenhonNfWESxqo1CW81BxBY=,iv:tYxoE/pxBBFrbiuc3ZVJe9rZfnVo9QSJOtl1NlPHyNg=,tag:eUwgow5ZkkuMoXrUAZughg==,type:str] obs: websocket_password: ENC[AES256_GCM,data:eska/qJsOAiQpq3uHNIIHKobsdN2rnkfLznOMkVHWEmOiynBM5tl,iv:y6cwkZUPiBU671QFq/xEKQATWI9BYAvNRbgiGTF/550=,tag:b5G4PNFl1bmVmHjC7cwvHw==,type:str] +git: + email: ENC[AES256_GCM,data:yvu1D9hNQHzQrTVmZmzZ500i,iv:6DbURT2HW5CT+fmsxZU0NWHRnqdOogHNL8ewD0UtfPA=,tag:VTi/8YyC+3zefI8UnRFoAw==,type:str] sops: age: - recipient: age1s39d4mdrjhkf8cy8eea02p836r7s875fj8f7w3z4ld2stmaac49qd075ww @@ -13,8 +15,8 @@ sops: SDlaeG9YRWw4UVRLeWh1ZzlnUlBVc3cKeXyBZ7UA+6iHiXElOdht0obhY8REdxc5 RX0HCXbn+wCEopmL9q/wRb4ClY2V1fExWGlwPz9teas1C5w6dQyYfQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-02-08T16:52:28Z" - mac: ENC[AES256_GCM,data:g+wLh8XKiQkXQ+gv544j7avOduUpdtcGqxMPcHAFMKyoL/2T8NqZftzjuGkJ5b9kSmDCs/LsQDeFmbn/dbhxL3TSf/VhYB/oL6YkvtEglYuYp1h33OWnT25PUq1xch/7xmFHGdy8y0vQM6rrUxBKoHiCpZJmI1hi9QgS/2IMX5U=,iv:g50gGCHNgsIrkMH392ODYaDmvUBqtnxOlfrT0Ft6Vwo=,tag:1oW5vXAQkwYp70mtDtLuZA==,type:str] + lastmodified: "2026-02-08T17:12:36Z" + mac: ENC[AES256_GCM,data:h/XWYq9wZeaFbulD1y/SUTqSSu8RnOJ0vrlXMq4d0FzdEElsddZGF4+tL2ZDWMh1u69vUU/yKbVOf02NqA5zhbWwuMB4IJfP7x42iakuvG1o5yQAXJYSI/hhwGHIw00U7ek6UcxY+j5U/52PANMA499zGJjU5u+HP89q71bL7NQ=,iv:LtRc1zIu+5iZhXvjLuuOpoE0seEGaPe1n+hYpxeZfyg=,tag:V3Chh4howYQ6FSPWlPVLsQ==,type:str] pgp: - created_at: "2026-02-08T16:13:33Z" enc: |- |