commit 4fd747f18d8e375fd4512c59eba4386a9f4fb1f3 · ryan.freumh.org/nixos

+3 -3

flake.lock

···

       711
       711
        
           },

     

       712
       712
        
           "nixpkgs_3": {

     

       713
       713
        
             "locked": {

     

       714
       714
       -
               "lastModified": 1709309926,

     

       715
       715
       -
               "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",

     

       714
       714
       +
               "lastModified": 1710162809,

     

       715
       715
       +
               "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=",

     

       716
       716
        
               "owner": "nixos",

     

       717
       717
        
               "repo": "nixpkgs",

     

       718
       718
       -
               "rev": "79baff8812a0d68e24a836df0a364c678089e2c7",

     

       718
       718
       +
               "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2",

     

       719
       719
        
               "type": "github"

     

       720
       720
        
             },

     

       721
       721
        
             "original": {

+1 -4

flake.nix

···

       72
       72
        
                     eeww = eeww.defaultPackage.${system};

     

       73
       73
        
                     eon = eon.defaultPackage.${system};

     

       74
       74
        
                     mautrix-whatsapp = prev.callPackage ./pkgs/mautrix-whatsapp.nix { };

     

       75
       75
       -
                     mautrix-facebook = prev.mautrix-facebook.overrideAttrs (_: {

     

       76
       76
       -
                       buildInputs = [ prev.python3.pkgs.aiosqlite ];

     

       77
       77
       -
                     });

     

       78
       78
       -
                     mautrix-instagram = final.callPackage ./pkgs/mautrix-instagram.nix { };

     

       75
       75
       +
                     mautrix-meta = prev.callPackage ./pkgs/mautrix-meta.nix { };

     

       79
       76
        
                     i3-workspace-history = i3-workspace-history.packages.${system}.default;

     

       80
       77
        
                     maildir-rank-addr = final.callPackage ./pkgs/maildir-rank-addr.nix { };

     

       81
       78
        
                     # https://github.com/NixOS/nixpkgs/issues/86349#issuecomment-624489806

+29 -10

hosts/owl/default.nix

···

       188
       188
        
           # voice messages need `ffmpeg`

     

       189
       189
        
           path = [ pkgs.ffmpeg ];

     

       190
       190
        
         };

     

       191
       191
       -
         systemd.services.matrix-as-facebook = {

     

       191
       191
       +
         systemd.services.matrix-as-meta = {

     

       192
       192
        
           # voice messages need `ffmpeg`

     

       193
       193
        
           path = [ pkgs.ffmpeg ];

     

       194
       194
        
         };

     
···

       203
       203
        
               package = pkgs.mautrix-whatsapp;

     

       204
       204
        
               settings.bridge.personal_filtering_spaces = true;

     

       205
       205
        
               settings.bridge.displayname_template = "{{or .BusinessName .PushName .FullName .JID}} (WA)";

     

       206
       206
       +
               settings.bridge.permissions."@ryan:freumh.org" = "admin";

     

       207
       207
       +
               settings.bridge.history_sync.backfill.enable = false;

     

       206
       208
        
             };

     

       207
       209
        
             signal = {

     

       208
       210
        
               port = 29184;

     
···

       216
       218
        
                 socket_path = config.services.signald.socketPath;

     

       217
       219
        
                 outgoing_attachment_dir = "/var/lib/signald/tmp";

     

       218
       220
        
               };

     

       221
       221
       +
               settings.bridge.permissions."@ryan:freumh.org" = "admin";

     

       219
       222
        
             };

     

       220
       220
       -
             facebook = {

     

       223
       223
       +
             instagram = {

     

       221
       224
        
               port = 29185;

     

       222
       222
       -
               format = "mautrix-python";

     

       223
       223
       -
               package = pkgs.mautrix-facebook;

     

       224
       224
       -
               settings.bridge.space_support.enable = true;

     

       225
       225
       -
               settings.bridge.backfill.enable = false;

     

       225
       225
       +
               format = "mautrix-go";

     

       226
       226
       +
               package = pkgs.mautrix-meta;

     

       227
       227
       +
               settings.meta.mode = "instagram";

     

       228
       228
       +
               settings.appservice.bot.username = "instagrambot";

     

       229
       229
       +
               settings.appservice.bot.displayname = "Instagram bridge bot";

     

       230
       230
       +
               settings.appservice.id = "instagram";

     

       231
       231
       +
               settings.appservice.avatar = "mxc://maunium.net/JxjlbZUlCPULEeHZSwleUXQv";

     

       232
       232
       +
               settings.bridge.username_template = "instagram_{{.}}";

     

       233
       233
       +
               settings.bridge.personal_filtering_spaces = true;

     

       234
       234
       +
               settings.bridge.backfill.enabled = false;

     

       235
       235
       +
               settings.bridge.permissions."@ryan:freumh.org" = "admin";

     

       226
       236
        
             };

     

       227
       227
       -
             instagram = {

     

       228
       228
       -
               port = 29187;

     

       229
       229
       -
               format = "mautrix-python";

     

       230
       230
       -
               package = pkgs.mautrix-instagram;

     

       237
       237
       +
             messenger = {

     

       238
       238
       +
               port = 29186;

     

       239
       239
       +
               format = "mautrix-go";

     

       240
       240
       +
               package = pkgs.mautrix-meta;

     

       241
       241
       +
               settings.meta.mode = "messenger";

     

       242
       242
       +
               settings.appservice.bot.username = "messengerbot";

     

       243
       243
       +
               settings.appservice.bot.displayname = "Messenger bridge bot";

     

       244
       244
       +
               settings.appservice.id = "messenger";

     

       245
       245
       +
               settings.appservice.avatar = "mxc://maunium.net/ygtkteZsXnGJLJHRchUwYWak";

     

       246
       246
       +
               settings.bridge.username_template = "messenger_{{.}}";

     

       247
       247
       +
               settings.bridge.personal_filtering_spaces = true;

     

       248
       248
       +
               settings.bridge.backfill.enabled = false;

     

       249
       249
       +
               settings.bridge.permissions."@ryan:freumh.org" = "admin";

     

       231
       250
        
             };

     

       232
       251
        
           };

     

       233
       252
        
         };

+28

pkgs/mautrix-meta.nix

···

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub, olm }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         name = "mautrix-meta";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchFromGitHub {

     

       7
       7
       +
           owner = "mautrix";

     

       8
       8
       +
           repo = "meta";

     

       9
       9
       +
           rev = "7941e937055b792d2cbfde5d9c8c4df75e68ff0a";

     

       10
       10
       +
           hash = "sha256-QDqN6AAaEngWo4UxKAyIXB7BwCEJqsMTeuMb2fKu/9o=";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         buildInputs = [ olm ];

     

       14
       14
       +
       

     

       15
       15
       +
         vendorHash = "sha256-ClHg3OEKgXYsmBm/aFKWZXbaLOmKdNyvw42QGhtTRik=";

     

       16
       16
       +
       

     

       17
       17
       +
         doCheck = false;

     

       18
       18
       +
       

     

       19
       19
       +
         excludedPackages = "cmd/lscli";

     

       20
       20
       +
       

     

       21
       21
       +
         meta = with lib; {

     

       22
       22
       +
           homepage = "https://github.com/mautrix/meta";

     

       23
       23
       +
           description = " A Matrix-Facebook Messenger and Instagram DM puppeting bridge.";

     

       24
       24
       +
           license = licenses.agpl3Plus;

     

       25
       25
       +
           mainProgram = "mautrix-meta";

     

       26
       26
       +
         };

     

       27
       27
       +
       }

     

       28
       28
       +

+4 -3

pkgs/mautrix-whatsapp.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "mautrix-whatsapp";

     

       5
       5
       -
         version = "0.8.6";

     

       5
       5
       +
         version = "0.10.05";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "mautrix";

     

       9
       9
        
           repo = "whatsapp";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           hash = "sha256-+uMpAsIadkdUrKkAr6ejOc1NfRIISA2R0AOjIXGXVpY=";

     

       11
       11
       +
           hash = "sha256-bn9nUTtpaEkzF2SEdCcKG27WQDL7xsgfgA/72wElQqA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ olm ];

     

       15
       15
        
       

     

       16
       16
       -
         vendorSha256 = "sha256-emUCf6ZKFjBDr5WEKzYfbBNR44FDbjedmCgHfkjHQtw=";

     

       16
       16
       +
         vendorHash = "sha256-PDUSjza+0SDanQwKYQRuLzsiA/sHjRnG0xpzlzhkm+U=";

     

       17
       17
        
       

     

       18
       18
        
         doCheck = false;

     

       19
       19
        
       

     
···

       22
       22
        
           description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";

     

       23
       23
        
           license = licenses.agpl3Plus;

     

       24
       24
        
           maintainers = with maintainers; [ vskilet ma27 chvp ];

     

       25
       25
       +
           mainProgram = "mautrix-whatsapp";

     

       25
       26
        
         };

     

       26
       27
        
       }