updated, revised some modules, cleaned up secrets management

1 files changed, 1 insertions, 10 deletions

diff --git a/os/srv/sops.nix b/os/srv/sops.nix
index 20e1891..1b27042 100644
--- a/os/srv/sops.nix
+++ b/os/srv/sops.nix
@@ -12,10 +12,7 @@ in
 {
   imports = [ inputs.sops-nix.nixosModules.sops ];
 
-  options.os.srv.sops = {
-    enable = lib.mkEnableOption "enables sops-nix";
-    diskEncryption = lib.mkEnableOption "enables initrd decryption key (LUKS)";
-  };
+  options.os.srv.sops.enable = lib.mkEnableOption "enables sops-nix";
   config = lib.mkIf cfg.enable {
     sops = {
       defaultSopsFile = ../../secrets.yaml;
@@ -24,20 +21,14 @@ in
 
       secrets = {
         "syncthing/gui_password".owner = username;
-        "syncthing/encryption/openmw-config".owner = username;
-        "syncthing/encryption/openmw-mods".owner = username;
-        "syncthing/encryption/game-saves".owner = username;
         "syncthing/encryption/keepass".owner = username;
         "syncthing/encryption/sync".owner = username;
-        "vpn/warp_private_key".owner = "root";
         "obs/websocket_password".owner = username;
         "yggdrasil-private-key" = {
           owner = "root";
           group = "wheel";
           mode = "0440";
         };
-        root_password.neededForUsers = true;
-        user_password.neededForUsers = true;
       };
     };