diff options
| author | tv <tv@krebsco.de> | 2017-12-05 18:42:27 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-12-05 18:42:27 +0100 |
| commit | 18fad9c618be468d3a8e902ee2e23143e598163c (patch) | |
| tree | 06de87b60aa8a783b27477e9d472b1193dbec50d | |
| parent | e5ab9b686ad7337d54e5d2b2ff6e8f88ac7a68f1 (diff) | |
| parent | e37ca2ceaf83adfdf93f512dd5e5849ddba4e7fb (diff) | |
Merge remote-tracking branch 'gum/master'
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 1 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/krebszones/default.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/cake/config.nix | 4 | ||||
| -rw-r--r-- | makefu/2configs/deployment/scrape/elkstack.nix (renamed from makefu/2configs/temp/elkstack.nix) | 0 | ||||
| -rw-r--r-- | makefu/2configs/tools/studio.nix | 9 |
5 files changed, 11 insertions, 5 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 29f188bb..080b8fce 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -540,6 +540,7 @@ with import <stockholm/lib>; wiki.euer IN A ${nets.internet.ip4.addr} graph IN A ${nets.internet.ip4.addr} ghook IN A ${nets.internet.ip4.addr} + dockerhub IN A ${nets.internet.ip4.addr} io IN NS gum.krebsco.de. ''; }; diff --git a/krebs/5pkgs/simple/krebszones/default.nix b/krebs/5pkgs/simple/krebszones/default.nix index b54c95d8..32608e7f 100644 --- a/krebs/5pkgs/simple/krebszones/default.nix +++ b/krebs/5pkgs/simple/krebszones/default.nix @@ -2,7 +2,7 @@ pkgs.writeDashBin "krebszones" '' set -efu - export OVH_ZONE_CONFIG=$HOME/.secrets/krebs/ovh-zone.conf + export OVH_ZONE_CONFIG=''${OVH_ZONE_CONFIG:-$HOME/.secrets/krebs/ovh-zone.conf} case $* in import) set -- import /etc/zones/krebsco.de krebsco.de diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix index c287c28d..1a617e52 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 c6bf1c6d..c6bf1c6d 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 add021ac..0356ba39 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 + '') ]; } |