From 574fc1dfaefeb1684a8b6cce368dbeae397cfa34 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Mon, 4 Jan 2021 00:41:24 +0000
Subject: [PATCH] avahi publish on all devices, add various packages

---
 configuration.nix                | 1 +
 private                          | 2 +-
 sets/hacking.nix                 | 1 -
 sets/pipewire.nix                | 4 ++++
 system/spike/default.nix         | 1 -
 system/starlight/boot-config.nix | 1 +
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index d46bed5..6ae8dca 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -40,6 +40,7 @@
     avahi = {
       enable = true;
       nssmdns = true;
+      publish.enable = true;
     };
     flatpak.enable = true;
     fwupd.enable = true;
diff --git a/private b/private
index 8827ad7..9b96cbf 160000
--- a/private
+++ b/private
@@ -1 +1 @@
-Subproject commit 8827ad737f563846cb57c89a6a3031aec6fa4697
+Subproject commit 9b96cbfe57bdfd8a090571173cac06b948b1e680
diff --git a/sets/hacking.nix b/sets/hacking.nix
index 162187d..e9ad2d0 100644
--- a/sets/hacking.nix
+++ b/sets/hacking.nix
@@ -12,7 +12,6 @@
     aircrack-ng
     fusee-launcher
     ncat
-    pcsctools
     pwndbg
     python37Packages.binwalk-full
     python37Packages.shodan
diff --git a/sets/pipewire.nix b/sets/pipewire.nix
index b59d66a..8c4fe8e 100644
--- a/sets/pipewire.nix
+++ b/sets/pipewire.nix
@@ -11,4 +11,8 @@
     jack.enable = true;
   };
   hardware.pulseaudio.enable = lib.mkForce false;
+  environment.systemPackages = with pkgs; [
+    qjackctl
+    pulseaudioLight
+  ];
 }
diff --git a/system/spike/default.nix b/system/spike/default.nix
index a0d259e..d6093ff 100644
--- a/system/spike/default.nix
+++ b/system/spike/default.nix
@@ -14,6 +14,5 @@
   ];
 
   networking.hostName = "spike";
-  services.avahi.publish.enable = true;
   system.stateVersion = "20.03";
 }
diff --git a/system/starlight/boot-config.nix b/system/starlight/boot-config.nix
index dac8f90..7366a1d 100644
--- a/system/starlight/boot-config.nix
+++ b/system/starlight/boot-config.nix
@@ -4,6 +4,7 @@
   imports = [ ../../externals/systemd-boot-secure ];
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
+    extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
     kernel.sysctl."vm.swappiness" = 5;
     cleanTmpDir = true;
     loader.systemd-boot-secure = {