firelink updates

1 files changed, 27 insertions, 10 deletions

diff --git a/machines/firelink.nix b/machines/firelink.nix
index 013bf92..34a6016 100644
--- a/machines/firelink.nix
+++ b/machines/firelink.nix
@@ -47,11 +47,6 @@ in
   };
 
   nixpkgs.overlays = [ my-overlay ];
-  hardware.bluetooth.config = {
-    General = {
-      Privacy = "device";
-    };
-  };
   # hardware.xpadneo.enable = true;
   systemd.services.xow.wantedBy = ["multi-user.target"];
   systemd.services.xow.serviceConfig.Group = "input";
@@ -64,6 +59,11 @@ in
     enable = true;
     extraModules = [ pkgs.pulseaudio-modules-bt ];
     package = lib.mkForce pkgs.pulseaudioFull;
+    extraConfig = ''
+      load-module module-dbus-protocol
+      load-module module-jack-sink channels=2
+      load-module module-jack-source channels=1
+    '';
     systemWide = true;
     # configFile = pkgs.writeText "default.pa" ''
     #   load-module module-bluetooth-policy
@@ -75,7 +75,15 @@ in
     #   # load-module module-bluez5-discover
     # '';
   };
+  systemd.services.pulseaudio = {
+    environment."JACK_PROMISCUOUS_SERVER" = "jackaudio";
+    serviceConfig = {
+      LimitMEMLOCK = "infinity";
+    };
+  };
+  users.extraUsers.pulse.extraGroups = [ "jackaudio" ];
 
+  networking.firewall.allowedTCPPorts = [ 22 4713 ];
   networking.networkmanager.enable = true;
   networking.networkmanager.wifi.powersave = false;
   networking.vlans = {
@@ -101,6 +109,15 @@ in
   # virtualisation.virtualbox.host.enable = true;
   virtualisation.virtualbox.host.enableExtensionPack = true;
 
+  services.jack = {
+    jackd.enable = true;
+    jackd.extraOptions = [ "-dalsa" "-dhw:M2" ];
+    alsa.enable = false;
+    loopback.enable = true;
+  };
+  users.extraUsers.guest.extraGroups = [ "jackaudio" ];
+  users.extraUsers.orbekk.extraGroups = [ "jackaudio" ];
+
   # Streaming test
   # services.nginx.enable = true;
   # services.nginx.appendConfig = ''
@@ -156,11 +173,11 @@ in
 
   # https://bugzilla.kernel.org/show_bug.cgi?id=203709
   boot.extraModprobeConfig = ''
-    # options iwlwifi power_save=0
-    # options iwlwifi swcrypto=1
-    # options iwlwifi disable_11ax=1
-    # options iwlwifi bt_coex_active=0
-    # options iwlmvm power_scheme=1
+    options iwlwifi power_save=0
+    options iwlwifi swcrypto=1
+    options iwlwifi disable_11ax=1
+    options iwlwifi bt_coex_active=0
+    options iwlmvm power_scheme=1
     # options bluetooth disable_ertm=1
 
     # For xpadneo