diff --git a/archachatina.nix b/archachatina.nix
index 10da42f..71723ff 100644
--- a/archachatina.nix
+++ b/archachatina.nix
@@ -11,6 +11,7 @@
       ./fstrim.nix
       ./qemu-user.nix
       ./atmega.nix
+      ./v4l2loopback.nix
     ];
 
   environment.etc."lvm/lvm.conf".text = ''
@@ -57,9 +58,13 @@
 
   services.thermald.enable = true;
 
-  users.extraUsers.gebner.extraGroups = [ "libvirtd" ];
+  users.extraUsers.gebner.extraGroups = [ "libvirtd" "vboxusers" ];
 
-  virtualisation.virtualbox.host.enable = true;
+  virtualisation.virtualbox.host = {
+    enable = true;
+    # enableExtensionPack = true;
+  };
+  # nixpkgs.config.allowUnfree = true;
 
   virtualisation.libvirtd = {
     enable = true;
diff --git a/common-sw.nix b/common-sw.nix
index a30ec40..ef97797 100644
--- a/common-sw.nix
+++ b/common-sw.nix
@@ -33,6 +33,8 @@
     mercurial
     manpages
 
+    dfeet
+
     geoipWithDatabase
 
     nix-index
diff --git a/decoysnail.nix b/decoysnail.nix
index 295e061..e7457ea 100644
--- a/decoysnail.nix
+++ b/decoysnail.nix
@@ -9,6 +9,7 @@
       ./uefi.nix
       ./fstrim.nix
       ./atmega.nix
+      ./v4l2loopack.nix
     ];
 
   environment.etc."lvm/lvm.conf".text = ''
diff --git a/fix-waybar.patch b/fix-waybar.patch
deleted file mode 100644
index dbbee95..0000000
--- a/fix-waybar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index f313606..daa0f6a 100644
---- a/src/modules/clock.cpp
-+++ b/src/modules/clock.cpp
-@@ -46,7 +46,7 @@ auto waybar::modules::Clock::update() -> void {
-                        date::make_zoned(time_zone_, date::floor<std::chrono::seconds>(now))};
- 
-   std::string text;
--  if (!fixed_time_zone_) {
-+  if (false && !fixed_time_zone_) {
-     // As date dep is not fully compatible, prefer fmt
-     tzset();
-     auto localtime = fmt::localtime(std::chrono::system_clock::to_time_t(now));
diff --git a/large-sw.nix b/large-sw.nix
index 706fb55..c8a564c 100644
--- a/large-sw.nix
+++ b/large-sw.nix
@@ -13,6 +13,7 @@
     # calibre
     goldendict
 
+    xournal
     (xournalpp.overrideDerivation (_: {
       patches = [
         ./xournalpp-cursor-blink.patch
diff --git a/petalius.nix b/petalius.nix
index 9957415..30e170b 100644
--- a/petalius.nix
+++ b/petalius.nix
@@ -9,6 +9,7 @@
       ./uefi.nix
       ./fstrim.nix
       ./atmega.nix
+      ./v4l2loopback.nix
     ];
 
   environment.etc."lvm/lvm.conf".text = ''
diff --git a/pulseaudio.nix b/pulseaudio.nix
index a1324b9..b8a5158 100644
--- a/pulseaudio.nix
+++ b/pulseaudio.nix
@@ -12,10 +12,15 @@
       default-sample-format = "s32le";
       default-sample-rate = "96000";
     };
-    package = pkgs.pulseaudioFull;
-    extraModules = [ pkgs.pulseaudio-modules-bt ];
+    # package = pkgs.pulseaudioFull;
+    package = pkgs.pulseaudio-hsphfpd;
+    # extraModules = [ pkgs.pulseaudio-modules-bt ];
   };
 
+  hardware.bluetooth.hsphfpd.enable = true;
+
+  users.extraUsers.gebner.extraGroups = [ "bluetooth" ];
+
   services.pipewire = {
     enable = true;
   };
diff --git a/sway.nix b/sway.nix
index 48260d2..a420820 100644
--- a/sway.nix
+++ b/sway.nix
@@ -7,11 +7,7 @@
 
   environment.systemPackages = with pkgs; with gnome3; [
     i3status
-    ((waybar.override { pulseSupport = true; }).overrideDerivation (_: {
-      patches = [
-        ./fix-waybar.patch
-      ];
-    }))
+    (waybar.override { pulseSupport = true; })
     wofi
     ydotool
     wl-clipboard
diff --git a/v4l2loopback.nix b/v4l2loopback.nix
new file mode 100644
index 0000000..bd758d6
--- /dev/null
+++ b/v4l2loopback.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+
+  boot = {
+    kernelModules = [ "v4l2loopback" ];
+    extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
+  };
+
+}