Compare commits

..

No commits in common. "883760cc1aff5d43ef7020ced03235aeb0d82a8f" and "de6da760b6530a93249df34e1e2fce7e7bb5eb82" have entirely different histories.

3 changed files with 16 additions and 70 deletions

View File

@ -1,54 +0,0 @@
{
config,
pkgs,
...
}: let
_wellKnownFileClient = pkgs.writeText "client" (
builtins.toJSON
{"m.homeserver"."base_url" = "https://matrix.gaze.systems";}
);
_wellKnownFileServer =
pkgs.writeText "server"
(builtins.toJSON {"m.server" = "matrix.gaze.systems:443";});
wellKnownFiles = pkgs.runCommand "well-known" {} ''
mkdir -p $out
cp ${_wellKnownFileServer} $out/server
cp ${_wellKnownFileClient} $out/client
'';
in {
services.matrix-conduit = {
enable = true;
package = pkgs.matrix-conduit.overrideAttrs (old: rec {
name = "${old.pname}-${version}";
version = "147f2752";
src = pkgs.fetchFromGitLab {
owner = "famedly";
repo = "conduit";
rev = "147f27521c0d7dbc32d39ec1d8da6cd00008f23c";
sha256 = "sha256-j469Zh8zyqJNWz7q6gjRu1Khk9y6Xbb52SpxzNjADW8=";
};
});
settings.global = {
server_name = "gaze.systems";
max_request_size = 1000 * 1000 * 20;
allow_registration = false;
allow_federation = true;
trusted_servers = ["matrix.org" "nixos.dev" "conduit.rs"];
address = "::1";
port = 6167;
};
};
services.nginx.virtualHosts."matrix.gaze.systems" = {
enableACME = true;
forceSSL = true;
locations."/".proxyPass = "http://localhost:${toString config.services.matrix-conduit.settings.global.port}";
};
services.nginx.virtualHosts."gaze.systems" = {
locations."/.well-known/matrix/".extraConfig = ''
add_header content-type application/json;
add_header access-control-allow-origin *;
alias ${wellKnownFiles}/;
'';
};
}

View File

@ -3,8 +3,8 @@
networking.wireless.iwd = { networking.wireless.iwd = {
enable = true; enable = true;
settings = { settings = {
Network = {EnableIPv6 = true;}; Network = { EnableIPv6 = true; };
Settings = {AutoConnect = true;}; Settings = { AutoConnect = true; };
}; };
}; };
networking.networkmanager.wifi.backend = "iwd"; networking.networkmanager.wifi.backend = "iwd";

View File

@ -17,19 +17,19 @@
home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [ home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [
".config/WebCord" ".config/WebCord"
]; ];
home.packages = let home.packages =
let
pkg = inputs.webcord.packages.${pkgs.system}.webcord; pkg = inputs.webcord.packages.${pkgs.system}.webcord;
in [ in
( [(
pkgs.runCommand pkg.name {nativeBuildInputs = [pkgs.makeWrapper];} '' pkgs.runCommand pkg.name {nativeBuildInputs = [pkgs.makeWrapper];} ''
mkdir -p $out mkdir -p $out
ln -sf ${pkg}/* $out/ ln -sf ${pkg}/* $out/
rm $out/bin rm $out/bin
mkdir $out/bin mkdir $out/bin
ln -s ${pkg}/bin/webcord $out/bin/webcord ln -s ${pkg}/bin/webcord $out/bin/webcord
wrapProgram $out/bin/webcord \ wrapProgram $out/bin/webcord \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [pkgs.pipewire]}" --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [pkgs.pipewire]}"
'' ''
) )];
];
} }