From 140a666c38ed7733bbb44dc7c7f5fb5fd0a9f5d3 Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@gladtherescake.eu>
Date: Mon, 20 Nov 2023 16:19:15 +0100
Subject: [PATCH] Or this?

---
 nixos/queen/configuration.nix | 6 +++---
 nixos/queen/nextcloud.nix     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/queen/configuration.nix b/nixos/queen/configuration.nix
index 2275d63..a4e651f 100644
--- a/nixos/queen/configuration.nix
+++ b/nixos/queen/configuration.nix
@@ -44,8 +44,8 @@
     };
   };
 
-  sops.secrets.queen-Lillian."nextcloudadmin".mode = "0400";
-  sops.secrets.queen-Lillian."nextclouddb".mode = "0400";
+  sops.secrets."nextcloudadmin".mode = "0400";
+  sops.secrets."nextclouddb".mode = "0400";
 
   nix = {
     gc = {
@@ -125,7 +125,7 @@
       extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf"];
       shell = pkgs.zsh;
     };
-    nextcloud.extraGroups = [config.sops.secrets.queen-Lillian."nextcloudadmin" config.sops.secrets.queen-Lillian."nextclouddb"];
+    nextcloud.extraGroups = [config.sops.secrets."nextcloudadmin" config.sops.secrets."nextclouddb"];
   };
 
   # Enable completion of system packages by zsh
diff --git a/nixos/queen/nextcloud.nix b/nixos/queen/nextcloud.nix
index d1fcf28..f3c2673 100644
--- a/nixos/queen/nextcloud.nix
+++ b/nixos/queen/nextcloud.nix
@@ -53,10 +53,10 @@
       dbuser = "nextcloud";
       dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
       dbname = "nextcloud";
-      dbpassFile = config.sops.secrets.queen-Lillian."nextclouddb".path;
+      dbpassFile = config.sops.secrets"nextclouddb".path;
 
       #TODO: work with sops to set this instead of a file & make sure the db setup is the same as on the previous server for easy migration
-      adminpassFile = config.sops.secrets.queen-Lillian."nextcloudadmin".path;
+      adminpassFile = config.sops.secrets.nextcloudadmin".path;
       adminuser = "admin";
     };
   };