From be63c847f9317b97d86f993f34da35cbd7d213db Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sat, 5 Jun 2021 17:48:06 +0000
Subject: [PATCH] Use python weechat-matrix, make sure I'm in users

---
 configuration.nix            | 2 +-
 private                      | 2 +-
 system/starlight/default.nix | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index e787bdd..11f5b79 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -41,7 +41,7 @@
       isNormalUser = true;
       description = "Artemis Tosini";
       uid = 1000;
-      extraGroups = [ "wheel" ];
+      extraGroups = [ "wheel" "users" ];
       group = "artemis";
       # hashedPassword set in private
     };
diff --git a/private b/private
index c867a0a..013e52d 160000
--- a/private
+++ b/private
@@ -1 +1 @@
-Subproject commit c867a0a61269868b9a295226e4d5fea2ca889708
+Subproject commit 013e52ddbce9bd7cf2c16fe7f375a89903e32a65
diff --git a/system/starlight/default.nix b/system/starlight/default.nix
index 232d309..617dc7c 100644
--- a/system/starlight/default.nix
+++ b/system/starlight/default.nix
@@ -57,7 +57,6 @@
   users.users.skye = {
     isSystemUser = true;
     uid = 1001;
-    extraGroups = [ "users" ];
   };
 
   # Packages
@@ -69,9 +68,8 @@
   environment.systemPackages = with pkgs; [
     (weechat.override {
       configure = { availablePlugins, ... }: {
-        plugins = (builtins.attrValues availablePlugins) ++ [ {
-          pluginFile = "${(callPackage ../../externals/packages/weechat-matrix-rs { })}/lib/weechat/plugins/matrix.so";
-        } ];
+        plugins = (builtins.attrValues availablePlugins);
+        scripts = [ weechatScripts.weechat-matrix ];
       };
     })
   ];