From b91011c9ec595bde7de1b9766cfff3edf03fcdce Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Apr 2023 17:40:14 +0200 Subject: l aergia.r: disable vbox --- lass/1systems/aergia/config.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lass') diff --git a/lass/1systems/aergia/config.nix b/lass/1systems/aergia/config.nix index 6992db4a5..d49040a7a 100644 --- a/lass/1systems/aergia/config.nix +++ b/lass/1systems/aergia/config.nix @@ -65,8 +65,4 @@ ]; boot.cleanTmpDir = true; - - # vbox - virtualisation.virtualbox.host.enable = true; - users.users.mainUser.extraGroups = [ "vboxusers" ]; } -- cgit v1.2.3 From d3b150416989aae2fa4aebf097dac96d53cd2164 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Apr 2023 23:11:21 +0200 Subject: vendor htgen-paste --- lass/2configs/paste.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'lass') diff --git a/lass/2configs/paste.nix b/lass/2configs/paste.nix index cfd7f5576..87768a452 100644 --- a/lass/2configs/paste.nix +++ b/lass/2configs/paste.nix @@ -82,14 +82,9 @@ with import ; krebs.htgen.paste = { port = 9081; - script = toString [ - "PATH=${makeBinPath [ - pkgs.nix - pkgs.file - ]}:$PATH" - "STATEDIR=$HOME" - ". ${pkgs.htgen}/examples/paste" - ]; + script = /* sh */ '' + (. ${pkgs.htgen-paste}/bin/htgen-paste) + ''; }; systemd.services.paste-gc = { -- cgit v1.2.3 From 2ba6c3c602753f27bec5d5f45107aed26f8d0ab4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 21 May 2023 14:12:33 +0200 Subject: l mail: remove broken gpg config --- lass/2configs/mail.nix | 9 --------- 1 file changed, 9 deletions(-) (limited to 'lass') diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index 0adef8f8c..fe7de15b7 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -124,15 +124,6 @@ let ''; muttrc = pkgs.writeText "muttrc" '' - # gpg - source ${pkgs.neomutt}/share/doc/neomutt/samples/gpg.rc - set pgp_use_gpg_agent = yes - set pgp_sign_as = 0xDC2A43EF4F11E854B44D599A89E82952976A7E4D - set crypt_autosign = no - set crypt_replyencrypt = yes - set crypt_verify_sig = yes - set pgp_verify_command = "gpg --no-verbose --batch --output - --verify %s %f" - # read html mails auto_view text/html -- cgit v1.2.3 From 7b42561a70af6831da729f36207004a03fba804c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 21 May 2023 14:12:47 +0200 Subject: l mail: fix muchsync macro --- lass/2configs/mail.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lass') diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index fe7de15b7..bf8904b89 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -178,8 +178,7 @@ let until ${pkgs.muchsync}/bin/muchsync -F lass@green.r; do sleep 1 done - ''} \ - 'run muchsync to green.r' + ''} #killed bind index d noop -- cgit v1.2.3 From aade31e65bad45c567b64591b06be806a74fc31a Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 25 May 2023 00:06:33 +0200 Subject: l radio: use larynx tts --- lass/2configs/services/radio/news.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lass') diff --git a/lass/2configs/services/radio/news.nix b/lass/2configs/services/radio/news.nix index 0dc711e6c..d726692d8 100644 --- a/lass/2configs/services/radio/news.nix +++ b/lass/2configs/services/radio/news.nix @@ -44,13 +44,17 @@ in send_to_radio gc_news get_current_news - pkgs.curl pkgs.retry + pkgs.larynx ]; script = '' set -efu - retry -t 5 -d 10 -- newsshow | - retry -t 5 -d 10 -- curl -fSsG http://tts.r/api/tts --data-urlencode 'text@-' | + retry -t 5 -d 10 -- newsshow | tr '\n' ' ' | + retry -t 5 -d 10 -- larynx --model ${pkgs.fetchzip { + url = "https://github.com/rhasspy/piper/releases/download/v0.0.2/voice-en-us-libritts-high.tar.gz"; + hash = "sha256-jCoK4p0O7BuF0nr6Sfj40tpivCvU5M3GHKQRg1tfIO8="; + stripRoot = false; + }}/en-us-libritts-high.onnx -s $[ $RANDOM % 900 ] -f - | retry -t 5 -d 10 -- send_to_radio ''; startAt = "*:00:00"; -- cgit v1.2.3 From b99a78b18e37ad38d9bdd63b44ade091ab8c7919 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 25 May 2023 00:06:58 +0200 Subject: l radio.r: run nixos-unstable --- lass/1systems/radio/source.nix | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 lass/1systems/radio/source.nix (limited to 'lass') diff --git a/lass/1systems/radio/source.nix b/lass/1systems/radio/source.nix new file mode 100644 index 000000000..4acdb0c26 --- /dev/null +++ b/lass/1systems/radio/source.nix @@ -0,0 +1,6 @@ +{ lib, pkgs, test, ... }: let + npkgs = lib.importJSON ../../../krebs/nixpkgs-unstable.json; +in if test then {} else { + nixpkgs.git.ref = lib.mkForce npkgs.rev; + nixpkgs-unstable = lib.mkForce { file = "/var/empty"; }; +} -- cgit v1.2.3 From 63573a5fa0807a334d35e900d9df8db7c1539acf Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 25 May 2023 11:19:04 +0200 Subject: l radio: createHome of user --- lass/2configs/services/radio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/services/radio/default.nix b/lass/2configs/services/radio/default.nix index a511196fd..16ef31b6f 100644 --- a/lass/2configs/services/radio/default.nix +++ b/lass/2configs/services/radio/default.nix @@ -82,7 +82,7 @@ in { users.users = { "${name}" = rec { inherit name; - createHome = lib.mkForce false; + createHome = true; group = name; uid = pkgs.stockholm.lib.genid_uint31 name; description = "radio manager"; -- cgit v1.2.3 From 6ebc5693d6a57233115d968723dd20961857920d Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 25 May 2023 11:19:37 +0200 Subject: l radio: fix tts for long texts --- lass/2configs/services/radio/news.nix | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'lass') diff --git a/lass/2configs/services/radio/news.nix b/lass/2configs/services/radio/news.nix index d726692d8..62f7f548c 100644 --- a/lass/2configs/services/radio/news.nix +++ b/lass/2configs/services/radio/news.nix @@ -1,6 +1,31 @@ { config, lib, pkgs, ... }: let + tts = pkgs.writers.writeBashBin "tts" '' + set -efu + + offset=0 + OUTPUT=$(mktemp -d) + trap 'rm -rf "$OUTPUT"' EXIT + SPEAKER=$[ $RANDOM % 900 ] + while read line; do + echo "$line" | + ${pkgs.larynx}/bin/larynx \ + --model ${pkgs.fetchzip { + url = "https://github.com/rhasspy/piper/releases/download/v0.0.2/voice-en-us-libritts-high.tar.gz"; + hash = "sha256-jCoK4p0O7BuF0nr6Sfj40tpivCvU5M3GHKQRg1tfIO8="; + stripRoot = false; + }}/en-us-libritts-high.onnx \ + -s "$SPEAKER" \ + -f "$OUTPUT"/"$offset".wav + + ((offset+=1)) + done + + ${pkgs.sox}/bin/sox "$OUTPUT"/*.wav "$OUTPUT"/all.wav + cat "$OUTPUT"/all.wav + ''; + send_to_radio = pkgs.writers.writeDashBin "send_to_radio" '' ${pkgs.vorbis-tools}/bin/oggenc - | ${pkgs.cyberlocker-tools}/bin/cput news.ogg @@ -41,20 +66,16 @@ in systemd.services.newsshow = { path = [ newsshow + tts send_to_radio gc_news get_current_news pkgs.retry - pkgs.larynx ]; script = '' set -efu - retry -t 5 -d 10 -- newsshow | tr '\n' ' ' | - retry -t 5 -d 10 -- larynx --model ${pkgs.fetchzip { - url = "https://github.com/rhasspy/piper/releases/download/v0.0.2/voice-en-us-libritts-high.tar.gz"; - hash = "sha256-jCoK4p0O7BuF0nr6Sfj40tpivCvU5M3GHKQRg1tfIO8="; - stripRoot = false; - }}/en-us-libritts-high.onnx -s $[ $RANDOM % 900 ] -f - | + retry -t 5 -d 10 -- newsshow | + retry -t 5 -d 10 -- tts | retry -t 5 -d 10 -- send_to_radio ''; startAt = "*:00:00"; -- cgit v1.2.3 From 7c3b3400b71678617ac042b522c26e747b8312c2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 29 May 2023 20:03:26 +0200 Subject: l pipewire: skip configuring wireplumber, add bluetooth config --- lass/2configs/pipewire.nix | 19 +++++++++---------- lass/2configs/weron/client.nix | 20 ++++++++++++++++++++ lass/2configs/weron/signaler.nix | 13 +++++++++++++ 3 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 lass/2configs/weron/client.nix create mode 100644 lass/2configs/weron/signaler.nix (limited to 'lass') diff --git a/lass/2configs/pipewire.nix b/lass/2configs/pipewire.nix index ec5a67b6e..da9408669 100644 --- a/lass/2configs/pipewire.nix +++ b/lass/2configs/pipewire.nix @@ -22,15 +22,14 @@ pulse.enable = true; jack.enable = true; }; - - systemd.services.wireplumber = { - environment = { - HOME = "/var/lib/wireplumber"; - DISPLAY = ":0"; - }; - path = [ - pkgs.dbus - ]; - serviceConfig.StateDirectory = "wireplumber"; + environment.etc = { + "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' + bluez_monitor.properties = { + ["bluez5.enable-sbc-xq"] = true, + ["bluez5.enable-msbc"] = true, + ["bluez5.enable-hw-volume"] = true, + ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" + } + ''; }; } diff --git a/lass/2configs/weron/client.nix b/lass/2configs/weron/client.nix new file mode 100644 index 000000000..55bc8a0da --- /dev/null +++ b/lass/2configs/weron/client.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: +{ + systemd.services.weron = { + wantedBy = [ "multi-user.target" ]; + environment = { + WERON_RADDR = "ws://lassul.us:23420/"; + }; + serviceConfig = { + ExecStart = pkgs.writers.writeDash "weron" '' + ${pkgs.weron}/bin/weron vpn ip \ + --community krebs \ + --password aidsballs \ + --key aidsballs \ + --ips 10.249.1.0/24 \ + --verbose 7 \ + --dev weron + ''; + }; + }; +} diff --git a/lass/2configs/weron/signaler.nix b/lass/2configs/weron/signaler.nix new file mode 100644 index 000000000..9e817583b --- /dev/null +++ b/lass/2configs/weron/signaler.nix @@ -0,0 +1,13 @@ +{ config, lib, pkgs, ... }: +{ + systemd.services.weron-signaler = { + wantedBy = [ "multi-user.target" ]; + environment = { + }; + serviceConfig = { + ExecStart = ''${pkgs.weron}/bin/weron signaler --verbose=7 --laddr ":23420"''; + }; + }; + + networking.firewall.allowedTCPPorts = [ 23420 ]; +} -- cgit v1.2.3