4 files changed, 24 insertions, 24 deletions
diff --git a/lass/2configs/binary-cache/server.nix b/lass/2configs/binary-cache/server.nix
index baa891821..1abf51ae6 100644
--- a/lass/2configs/binary-cache/server.nix
+++ b/lass/2configs/binary-cache/server.nix
@@ -1,27 +1,14 @@
-{ config, lib, pkgs, ...}:
+{ config, lib, pkgs, stockholm, ...}:
 
 {
   # generate private key with:
   # nix-store --generate-binary-cache-key my-secret-key my-public-key
   services.nix-serve = {
     enable = true;
-    secretKeyFile = config.krebs.secret.files.nix-serve-key.path;
+    secretKeyFile = toString <secrets> + "/nix-serve.key";
     port = 5005;
   };
 
-  systemd.services.nix-serve = {
-    after = [
-      config.krebs.secret.files.nix-serve-key.service
-    ];
-    partOf = [
-      config.krebs.secret.files.nix-serve-key.service
-    ];
-  };
-  krebs.secret.files.nix-serve-key = {
-    path = "/run/secret/nix-serve.key";
-    owner.name = "nix-serve";
-    source-path = toString <secrets> + "/nix-serve.key";
-  };
   services.nginx = {
     enable = true;
     virtualHosts.nix-serve = {
diff --git a/lass/2configs/bitlbee.nix b/lass/2configs/bitlbee.nix
index d8f1ae888..b84221155 100644
--- a/lass/2configs/bitlbee.nix
+++ b/lass/2configs/bitlbee.nix
@@ -11,9 +11,22 @@ with (import <stockholm/lib>);
       pkgs.bitlbee-discord
     ];
     libpurple_plugins = [
-      # pkgs.telegram-purple
-      pkgs.tdlib-purple
+      pkgs.telegram-purple
+      # pkgs.tdlib-purple
       # pkgs.purple-gowhatsapp
     ];
   };
+
+  users.users.bitlbee = {
+    uid = genid_uint31 "bitlbee";
+    isSystemUser = true;
+    group = "bitlbee";
+  };
+  users.groups.bitlbee = {};
+
+  systemd.services.bitlbee.serviceConfig = {
+    DynamicUser = lib.mkForce false;
+    User = "bitlbee";
+    StateDirectory = lib.mkForce null;
+  };
 }
diff --git a/lass/2configs/hass/default.nix b/lass/2configs/hass/default.nix
index be9c32809..b303df938 100644
--- a/lass/2configs/hass/default.nix
+++ b/lass/2configs/hass/default.nix
@@ -119,13 +119,10 @@ in {
 
   services.mosquitto = {
     enable = true;
-    host = "0.0.0.0";
-    allowAnonymous = false;
-    checkPasswords = true;
-    users.gg23 = {
-      password = "gg23-mqtt";
-      acl = [ "topic readwrite #" ];
-    };
+    listeners = [{
+      acl = [ "topic pattern readwrite #" ];
+      users.gg23 = { acl = [ "topic readwrite #" ]; password = "gg23-mqtt"; };
+    }];
   };
 
   environment.systemPackages = [ pkgs.mosquitto ];
diff --git a/lass/2configs/prism-share.nix b/lass/2configs/prism-share.nix
index aa3eb541d..fb803dd77 100644
--- a/lass/2configs/prism-share.nix
+++ b/lass/2configs/prism-share.nix
@@ -14,7 +14,10 @@ with import <stockholm/lib>;
     description = "smb guest user";
     home = "/home/share";
     createHome = true;
+    group = "share";
   };
+  users.groups.share = {};
+
   services.samba = {
     enable = true;
     enableNmbd = true;