From 9472ad810cd05cd1da5882fa495408472555caf7 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 15 Nov 2017 12:43:09 +0100 Subject: ma cake.r: sound.enable = false --- makefu/1systems/cake/config.nix | 4 +--- 1 file changed, 1 insertion(+), 3 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: # ]; - 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 = [ -- cgit v1.2.3 From 379ef615059bdda14c751bad9352504cac37f96d Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 15 Nov 2017 16:43:32 +0100 Subject: ma temp: move elkstack to scrape --- makefu/2configs/deployment/scrape/elkstack.nix | 5 +++++ makefu/2configs/temp/elkstack.nix | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 makefu/2configs/deployment/scrape/elkstack.nix delete mode 100644 makefu/2configs/temp/elkstack.nix diff --git a/makefu/2configs/deployment/scrape/elkstack.nix b/makefu/2configs/deployment/scrape/elkstack.nix new file mode 100644 index 000000000..c6bf1c6d8 --- /dev/null +++ b/makefu/2configs/deployment/scrape/elkstack.nix @@ -0,0 +1,5 @@ +_: +{ + services.elasticsearch.enable = true; + services.kibana.enable = true; +} diff --git a/makefu/2configs/temp/elkstack.nix b/makefu/2configs/temp/elkstack.nix deleted file mode 100644 index c6bf1c6d8..000000000 --- a/makefu/2configs/temp/elkstack.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: -{ - services.elasticsearch.enable = true; - services.kibana.enable = true; -} -- cgit v1.2.3 From f2160466d1482df3518a0c9abb06b746745bc0c0 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Nov 2017 19:12:12 +0100 Subject: krebszones: make OVH_ZONE_CONFIG configurable --- krebs/5pkgs/simple/krebszones/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/5pkgs/simple/krebszones/default.nix b/krebs/5pkgs/simple/krebszones/default.nix index b54c95d88..32608e7fa 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 -- cgit v1.2.3 From 536efca9b7a7c300f514ccb3bf0fdb6716280068 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Nov 2017 19:15:09 +0100 Subject: gum.r: add dockerhub.krebsco.de alias --- krebs/3modules/makefu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 29f188bbe..080b8fced 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -540,6 +540,7 @@ with import ; 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. ''; }; -- cgit v1.2.3 From e37ca2ceaf83adfdf93f512dd5e5849ddba4e7fb Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 28 Nov 2017 22:49:25 +0100 Subject: ma tools/studio: remove owncloudclient --- makefu/2configs/tools/studio.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 + '') ]; } -- cgit v1.2.3