.gitignore

@@ -1,5 +1,4 @@
 *.swp
-result*
+result
 *.qcow2
 .Trash*
-

flake.lock

@@ -180,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709204054,
+        "lastModified": 1708806879,
-        "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
+        "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f3367769a93b226c467551315e9e270c3f78b15",
+        "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
         "type": "github"
       },
       "original": {
@@ -296,11 +296,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709150264,
+        "lastModified": 1708807242,
-        "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
+        "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
+        "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
         "type": "github"
       },
       "original": {

hosts/nuc/default.nix

@@ -11,7 +11,6 @@
       ./modules/hydra
       # ./modules/prometheus
       ./modules/matrix
-      ./modules/mautrix-telegram
       ./modules/seafile
       ./modules/uptime-kuma
       ./modules/vaultwarden

hosts/nuc/modules/mautrix-telegram/default.nix

@@ -1,74 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  homeserverDomain = config.services.matrix-synapse.settings.server_name;
-  registrationFileSynapse = "/var/lib/matrix-synapse/telegram-registration.yaml";
-  registrationFileMautrix = "/var/lib/mautrix-telegram/telegram-registration.yaml";
-  settingsFile = builtins.head (builtins.match ".*--config='(.*)' \\\\.*" config.systemd.services.mautrix-telegram.preStart);
-in
-{
-  services.postgresql = {
-    enable = true;
-    ensureUsers = [{
-      name = "mautrix-telegram";
-      ensureDBOwnership = true;
-    }];
-    ensureDatabases = [ "mautrix-telegram" ];
-  };
-
-  age.secrets.mautrix-telegram = {
-    file = ../../../../secrets/nuc/mautrix-telegram/env.age;
-    owner = config.systemd.services.matrix-synapse.serviceConfig.User;
-  };
-
-
-  services.matrix-synapse.settings.app_service_config_files = [
-    # The registration file is automatically generated after starting the
-    # appservice for the first time.
-    registrationFileSynapse
-  ];
-
-  systemd.tmpfiles.rules = [
-    # copy registration file over to synapse
-    "C ${registrationFileSynapse} - - - - ${registrationFileMautrix}"
-    "Z /var/lib/matrix-synapse/ - matrix-synapse matrix-synapse - -"
-  ];
-
-  services.mautrix-telegram = {
-    enable = true;
-
-    environmentFile = config.age.secrets.mautrix-telegram.path;
-
-    settings = {
-      homeserver = {
-        address = "http://[::1]:8008";
-        domain = homeserverDomain;
-      };
-
-      appservice = rec {
-        # Use postgresql instead of sqlite
-        database = "postgresql:///mautrix-telegram?host=/run/postgresql";
-        port = 8082;
-        address = "http://localhost:${toString port}";
-      };
-
-      bridge = {
-        relaybot.authless_portals = false;
-        permissions = {
-          "@rouven:${homeserverDomain}" = "admin";
-        };
-        relay_user_distinguishers = [ ];
-      };
-    };
-  };
-
-  # If we don't explicitly set {a,h}s_token, mautrix-telegram will try to read them from the registrationFile
-  # and write them to the settingsFile in /nix/store, which obviously fails.
-  systemd.services.mautrix-telegram.serviceConfig.ExecStart =
-    lib.mkForce (pkgs.writeShellScript "start" ''
-      export MAUTRIX_TELEGRAM_APPSERVICE_AS_TOKEN=$(grep as_token ${registrationFileMautrix} | cut -d' ' -f2-)
-      export MAUTRIX_TELEGRAM_APPSERVICE_HS_TOKEN=$(grep hs_token ${registrationFileMautrix} | cut -d' ' -f2-)
-
-      ${pkgs.mautrix-telegram}/bin/mautrix-telegram --config='${settingsFile}'
-    '');
-}
-

hosts/nuc/modules/seafile/default.nix

@@ -9,7 +9,6 @@ in
     initialAdminPassword = "unused garbage";
     ccnetSettings.General.SERVICE_URL = "https://${domain}";
     ccnetSettings.General.FILE_SERVER_ROOT = "https://${domain}/seafhttp";
-    seafileSettings.fileserver.port = 8083;
   };
   services.nginx.virtualHosts."${domain}" = {
     enableACME = true;

secrets.nix

@@ -18,7 +18,6 @@ in
   # nuc
   "secrets/nuc/matrix/shared.age".publicKeys = [ rouven nuc ];
   "secrets/nuc/matrix/sync.age".publicKeys = [ rouven nuc ];
-  "secrets/nuc/mautrix-telegram/env.age".publicKeys = [ rouven nuc ];
   "secrets/nuc/vaultwarden.age".publicKeys = [ rouven nuc ];
   "secrets/nuc/cache.age".publicKeys = [ rouven nuc ];
   "secrets/nuc/borg/passphrase.age".publicKeys = [ rouven nuc ];

users/rouven/modules/packages.nix

@@ -64,7 +64,7 @@
 
     # fancy tools
     just
-    himalaya
+    (himalaya.override { buildFeatures = [ "pgp-commands" ]; })
     # strace but with colors
     (strace.overrideAttrs (_: {
       patches = [