Merge remote-tracking branch 'gum/master'

3 files changed, 9 insertions, 4 deletions

diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
index c287c28df..1a617e52d 100644
--- a/makefu/1systems/cake/config.nix
+++ b/makefu/1systems/cake/config.nix
@@ -6,9 +6,6 @@
 # configure your hw:
 # <stockholm/makefu/2configs/save-diskspace.nix>
   ];
-  users.extraUsers.root.openssh.authorizedKeys.keys = [
-    config.krebs.users.tv.pubkey
-  ];
   krebs = {
     enable = true;
     tinc.retiolum.enable = true;
@@ -23,6 +20,7 @@
   programs.man.enable = false;
   services.nixosManual.enable = false;
   boot.tmpOnTmpfs = lib.mkForce false;
+  sound.enable = false;
 
   hardware.enableRedistributableFirmware = true;
   hardware.firmware = [
diff --git a/makefu/2configs/temp/elkstack.nix b/makefu/2configs/deployment/scrape/elkstack.nix
index c6bf1c6d8..c6bf1c6d8 100644
--- a/makefu/2configs/temp/elkstack.nix
+++ b/makefu/2configs/deployment/scrape/elkstack.nix
diff --git a/makefu/2configs/tools/studio.nix b/makefu/2configs/tools/studio.nix
index add021acd..0356ba391 100644
--- a/makefu/2configs/tools/studio.nix
+++ b/makefu/2configs/tools/studio.nix
@@ -5,6 +5,13 @@
     obs-studio
     studio-link
     audacity
-    owncloudclient
+    darkice
+    # owncloudclient
+    (pkgs.writeScriptBin "prepare-pulseaudio" ''
+      pactl load-module module-null-sink sink_name=stream sink_properties=device.description="Streaming"
+      pactl load-module module-loopback source=alsa_output.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo.monitor sink=stream latency_msec=1
+      pactl load-module module-loopback source=alsa_input.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo sink=stream latency_msec=1
+      darkice -c ~/lol.conf
+    '')
   ];
 }