summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2023-06-03 15:29:51 +0200
committermakefu <github@syntax-fehler.de>2023-06-03 15:29:51 +0200
commit715cae5a3a5d4d08e647e006cabb3086eef3c91a (patch)
tree04d59ba0b9acb871b146b4dc2bd4e5caf8ee2456
parentbe3284417942c0164c1b32c9cf34ba44bcfb86c3 (diff)
ma bgt: update template for pad
-rw-r--r--makefu/2configs/audio/jack-on-pulse.nix52
-rw-r--r--makefu/2configs/bgt/template.md2
2 files changed, 1 insertions, 53 deletions
diff --git a/makefu/2configs/audio/jack-on-pulse.nix b/makefu/2configs/audio/jack-on-pulse.nix
deleted file mode 100644
index e18b2192a..000000000
--- a/makefu/2configs/audio/jack-on-pulse.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ config, pkgs, ... }:
-let
- pulse = pkgs.pulseaudioFull;
- user = config.makefu.gui.user;
- wait_time = 30;
-in
-{
- sound.enable = true;
- hardware.pulseaudio = {
- enable = true;
- package = pulse;
- };
-
- environment.systemPackages = with pkgs; [
- jack2Full
- jack_capture
- ];
- # from http://anderspapitto.com/posts/2015-11-26-overtone-on-nixos-with-jack-and-pulseaudio.html
-
- systemd.user.services = {
- jackdbus = {
- description = "Runs jack, and points pulseaudio at it";
- serviceConfig = {
- Type = "oneshot";
- ExecStart = pkgs.writeScript "start_jack.sh" ''
- #! ${pkgs.bash}/bin/bash
- . ${config.system.build.setEnvironment}
-
- # TODO: correctly wait for pulseaudio, cannot use pulseaudio.service
- sleep ${toString wait_time} # wait for the gui to load
-
- ${pkgs.jack2Full}/bin/jack_control start
- sleep 3 # give some time for sources/sinks to be created
-
- ${pulse}/bin/pacmd set-default-sink jack_out
- ${pulse}/bin/pacmd set-default-source jack_in
- '';
- ExecStop = pkgs.writeScript "stop_jack.sh" ''
- #! ${pkgs.bash}/bin/bash
- . ${config.system.build.setEnvironment}
-
- ${pkgs.jack2Full}/bin/jack_control stop
- '';
- RemainAfterExit = true;
- Restart = "always";
- RestartSec = "5";
- };
- after = [ "display-manager.service" "sound.target" ];
- wantedBy = [ "default.target" ];
- };
- };
-}
diff --git a/makefu/2configs/bgt/template.md b/makefu/2configs/bgt/template.md
index 1dfb0b42f..be21d7c0c 100644
--- a/makefu/2configs/bgt/template.md
+++ b/makefu/2configs/bgt/template.md
@@ -2,7 +2,7 @@
0. Sendung twittern und mastodieren (eine Woche + eine Stunde vorher) von Ingo/l33tname (wichtig)
1. `eine` Person anrufen (den Host):
- - markus 162dcbf89f@studio.link
+ - markus madmas@studio.link
- Felix1 makefu@studio.link
- L33tFelix l33tname@studio.link
- Ingo ingo@studio.link