final changes before sleep

diff --git a/config/nix.org b/config/nix.org
index 9111d2df21db6de072910861cdb26a62a64e7008..eb37f90b49a387c21f9844eefeab458b3e581b8e 100644 (file)
--- a/config/nix.org
+++ b/config/nix.org
@@ -1149,10 +1149,12 @@ because they enhance security.
     users.groups.nginx = lib.mkDefault {};
     users.groups.git = lib.mkDefault {};
     users.groups.ircd = lib.mkDefault {};
+    users.groups.ngircd = lib.mkDefault {};
 
     users.users = {
       ngircd = {
         isSystemUser = lib.mkDefault true;
+        group = "ngircd";
         extraGroups = [ "acme" "nginx" ];
       };
 
@@ -2356,8 +2358,15 @@ the yaml file specified. Yes, this is safe to include in the repo.
           format = "yaml";
           path = "${config.sops.defaultSymlinkPath}/dn42";
         };
+        znc = {
+          format = "yaml";
+          path = "${config.sops.defaultSymlinkPath}/znc";
+        };
+        matrix_bridge = {
+          format = "yaml";
+          path = "${config.sops.defaultSymlinkPath}/matrix_bridge";
+        };
       };
-
       defaultSymlinkPath = "/run/user/1000/secrets";
       defaultSecretsMountPoint = "/run/user/1000/secrets.d";
     };

diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix
index ad244b8dd5163a65b25b659295d9d8e6bbc8be46..4bbe1bbe3287fb8de4181553a0c768cbc7426d7b 100644 (file)
--- a/nix/modules/configuration.nix
+++ b/nix/modules/configuration.nix
@@ -317,10 +317,12 @@
   users.groups.nginx = lib.mkDefault {};
   users.groups.git = lib.mkDefault {};
   users.groups.ircd = lib.mkDefault {};
+  users.groups.ngircd = lib.mkDefault {};
 
   users.users = {
     ngircd = {
       isSystemUser = lib.mkDefault true;
+      group = "ngircd";
       extraGroups = [ "acme" "nginx" ];
     };
 

diff --git a/nix/modules/secrets.nix b/nix/modules/secrets.nix
index 2f8defcf8fad4dd3010e698fecb3d223b6bab1cc..943f41fee92045db68059bdaf7e849ba56068536 100644 (file)
--- a/nix/modules/secrets.nix
+++ b/nix/modules/secrets.nix
@@ -22,8 +22,15 @@
         format = "yaml";
         path = "${config.sops.defaultSymlinkPath}/dn42";
       };
+      znc = {
+        format = "yaml";
+        path = "${config.sops.defaultSymlinkPath}/znc";
+      };
+      matrix_bridge = {
+        format = "yaml";
+        path = "${config.sops.defaultSymlinkPath}/matrix_bridge";
+      };
     };
-
     defaultSymlinkPath = "/run/user/1000/secrets";
     defaultSecretsMountPoint = "/run/user/1000/secrets.d";
   };

diff --git a/nix/systems/spontaneity/default.nix b/nix/systems/spontaneity/default.nix
index b0234142e35708cea2a2e9b9aae9b9616ca13757..776149d894adc38fe6c6c43d48e095eff5b72b7a 100644 (file)
--- a/nix/systems/spontaneity/default.nix
+++ b/nix/systems/spontaneity/default.nix
@@ -44,7 +44,9 @@
           "mail.${config.monorepo.vars.remoteHost}" = {};
 
           "nullring.xyz" = {};
+          "matrix.nullring.xyz" = {};
           "talk.nullring.xyz" = {};
+          "mail.nullring.xyz" = {};
           "ret2pop.nullring.xyz" = {};
         };
       };