services.synapse: fix

flake.nix

@@ -116,7 +116,7 @@
                 };
                 nixpkgs =
                   { march = "alderlake"; cuda = { enable = true; capabilities = [ "8.6" ]; forwardCompat = false; }; };
-                kernel.patches = [ "cjktty" ];
+                kernel.patches = [ "cjktty" "lantian" ];
                 impermanence.enable = true;
                 networking.hostname = "pc";
                 sysctl.laptop-mode = 5;

modules/services/postgresql.nix

@@ -10,7 +10,7 @@ inputs:
         database = mkOption { type = types.nonEmptyStr; default = submoduleInputs.config._module.args.name; };
         user = mkOption { type = types.nonEmptyStr; default = submoduleInputs.config._module.args.name; };
         passwordFile = mkOption { type = types.nullOr types.nonEmptyStr; default = null; };
-        locale = mkOption { type = types.nullOr types.nonEmptyStr; default = null; };
+        initializeFlags = mkOption { type = types.attrsOf types.nonEmptyStr; default = {}; };
       };}));
       default = {};
     };
@@ -52,7 +52,6 @@ inputs:
           # chattr +C /path/to/dir
           # cp -a --reflink=never /path/to/dir_old/. /path/to/dir
           # rm -rf /path/to/dir_old
-          ensureDatabases = map (db: db.value.database) (attrsToList postgresql.instances);
           ensureUsers = map (db: { name = db.value.user; }) (attrsToList postgresql.instances);
         };
         postgresqlBackup =
@@ -69,11 +68,17 @@ inputs:
             passwordFile =
               if db.value.passwordFile or null != null then db.value.passwordFile
               else inputs.config.sops.secrets."postgresql/${db.value.user}".path;
-            locale = if db.value.locale != null then " LOCALE ${db.value.locale}" else "";
+            initializeFlag =
+              if db.value.initializeFlags != {} then
+                " WITH "
+                + (concatStringsSep " " (map
+                  (flag: ''${flag.name} = "${flag.value}"'')
+                  (attrsToList db.value.initializeFlags)))
+              else "";
           in
           # create database if not exist
           "$PSQL -tAc \"SELECT 1 FROM pg_database WHERE datname = '${db.value.database}'\" | grep -q 1"
-            + " || $PSQL -tAc 'CREATE DATABASE \"${db.value.database}\"${locale}'"
+            + " || $PSQL -tAc 'CREATE DATABASE \"${db.value.database}\"${initializeFlag}'"
           # set user password
             + "\n"
             + "$PSQL -tAc \"ALTER USER ${db.value.user} with encrypted password '$(cat ${passwordFile})'\""

modules/services/synapse.nix

@@ -112,6 +112,7 @@ inputs:
               in builtins.readFile ((inputs.pkgs.formats.yaml {}).generate "${instance.name}.yaml"
               {
                 server_name = instance.value.matrixHostname;
+                public_baseurl = "https://${instance.value.hostname}";
                 listeners =
                 [{
                   bind_addresses = [ "127.0.0.1" ];
@@ -205,7 +206,11 @@ inputs:
         {
           enable = mkIf (synapse.instances != {}) true;
           instances = listToAttrs (map
-            (instance: { name = "synapse_${replaceStrings [ "-" ] [ "_" ] instance.name}"; value.locale = "C"; })
+            (instance:
+            {
+              name = "synapse_${replaceStrings [ "-" ] [ "_" ] instance.name}";
+              value.initializeFlags = { TEMPLATE = "template0"; LC_CTYPE = "C"; LC_COLLATE = "C"; };
+            })
             (attrsToList synapse.instances));
         };
         redis.instances = listToAttrs (map

modules/system/kernel.nix

@@ -2,7 +2,7 @@ inputs:
 {
   options.nixos.system.kernel = let inherit (inputs.lib) mkOption types; in
   {
-    patches = mkOption { type = types.listOf (types.enum [ "cjktty" ]); default = []; };
+    patches = mkOption { type = types.listOf types.nonEmptyStr; default = []; };
     modules =
     {
       install = mkOption { type = types.listOf types.str; default = []; };
@@ -33,7 +33,7 @@ inputs:
       extraModulePackages = (with inputs.config.boot.kernelPackages; [ v4l2loopback ]) ++ kernel.modules.install;
       extraModprobeConfig = builtins.concatStringsSep "\n" kernel.modules.modprobeConfig;
       kernelParams = [ "delayacct" "acpi_osi=Linux" ];
-      kernelPackages = inputs.pkgs.linuxPackages_zen;
+      kernelPackages = inputs.pkgs.linuxPackages_xanmod_latest;
       kernelPatches =
         let
           patches =
@@ -61,6 +61,19 @@ inputs:
               extraStructuredConfig =
                 { FONT_CJK_16x16 = inputs.lib.kernel.yes; FONT_CJK_32x32 = inputs.lib.kernel.yes; };
             };
+            lantian =
+            {
+              patch = null;
+              # pick from xddxdd/nur-packages dce93a
+              extraStructuredConfig = with inputs.lib.kernel;
+              {
+                ACPI_PCI_SLOT = yes;
+                ENERGY_MODEL = yes;
+                PARAVIRT_TIME_ACCOUNTING = yes;
+                PM_AUTOSLEEP = yes;
+                WQ_POWER_EFFICIENT_DEFAULT = yes;
+              };
+            };
           };
         in
           builtins.map (name: { inherit name; } // patches.${name}) kernel.patches;