summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <git@lassul.us>2023-05-29 20:03:26 +0200
committerlassulus <git@lassul.us>2023-05-29 20:03:26 +0200
commit7c3b3400b71678617ac042b522c26e747b8312c2 (patch)
tree587958b742590bf15f8d226789d24b1267a1882b
parente629da17d5e22444549e4ed3c07e64158111214d (diff)
l pipewire: skip configuring wireplumber, add bluetooth config
-rw-r--r--lass/2configs/pipewire.nix19
-rw-r--r--lass/2configs/weron/client.nix20
-rw-r--r--lass/2configs/weron/signaler.nix13
3 files changed, 42 insertions, 10 deletions
diff --git a/lass/2configs/pipewire.nix b/lass/2configs/pipewire.nix
index ec5a67b6..da940866 100644
--- a/lass/2configs/pipewire.nix
+++ b/lass/2configs/pipewire.nix
@@ -22,15 +22,14 @@
pulse.enable = true;
jack.enable = true;
};
-
- systemd.services.wireplumber = {
- environment = {
- HOME = "/var/lib/wireplumber";
- DISPLAY = ":0";
- };
- path = [
- pkgs.dbus
- ];
- serviceConfig.StateDirectory = "wireplumber";
+ environment.etc = {
+ "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
+ bluez_monitor.properties = {
+ ["bluez5.enable-sbc-xq"] = true,
+ ["bluez5.enable-msbc"] = true,
+ ["bluez5.enable-hw-volume"] = true,
+ ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
+ }
+ '';
};
}
diff --git a/lass/2configs/weron/client.nix b/lass/2configs/weron/client.nix
new file mode 100644
index 00000000..55bc8a0d
--- /dev/null
+++ b/lass/2configs/weron/client.nix
@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+{
+ systemd.services.weron = {
+ wantedBy = [ "multi-user.target" ];
+ environment = {
+ WERON_RADDR = "ws://lassul.us:23420/";
+ };
+ serviceConfig = {
+ ExecStart = pkgs.writers.writeDash "weron" ''
+ ${pkgs.weron}/bin/weron vpn ip \
+ --community krebs \
+ --password aidsballs \
+ --key aidsballs \
+ --ips 10.249.1.0/24 \
+ --verbose 7 \
+ --dev weron
+ '';
+ };
+ };
+}
diff --git a/lass/2configs/weron/signaler.nix b/lass/2configs/weron/signaler.nix
new file mode 100644
index 00000000..9e817583
--- /dev/null
+++ b/lass/2configs/weron/signaler.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+{
+ systemd.services.weron-signaler = {
+ wantedBy = [ "multi-user.target" ];
+ environment = {
+ };
+ serviceConfig = {
+ ExecStart = ''${pkgs.weron}/bin/weron signaler --verbose=7 --laddr ":23420"'';
+ };
+ };
+
+ networking.firewall.allowedTCPPorts = [ 23420 ];
+}