From 9b6605707b6e415d7d560d8a127537f81e81cb81 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 12 Nov 2020 14:09:28 +0100
Subject: [PATCH 1/6] pulseaudio: enable hsphfpd

---
 pulseaudio.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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;
   };

From 400ecb94891cc0fbb1de699b132e342a03b742e4 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 12 Nov 2020 14:09:44 +0100
Subject: [PATCH 2/6] add d-feet

---
 common-sw.nix | 2 ++
 1 file changed, 2 insertions(+)

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

From 47c12d1d0fae9e6a16d25e8558b091dec898f994 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 12 Nov 2020 14:16:43 +0100
Subject: [PATCH 3/6] add xournal

---
 large-sw.nix | 1 +
 1 file changed, 1 insertion(+)

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

From 0379f7e4e35f2f25449685445c96b76149a88858 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 12 Nov 2020 14:19:09 +0100
Subject: [PATCH 4/6] add v4l2loopback

---
 archachatina.nix |  1 +
 decoysnail.nix   |  1 +
 petalius.nix     |  1 +
 v4l2loopback.nix | 10 ++++++++++
 4 files changed, 13 insertions(+)
 create mode 100644 v4l2loopback.nix

diff --git a/archachatina.nix b/archachatina.nix
index 10da42f..f06561b 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 = ''
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/petalius.nix b/petalius.nix
index ae4bbb2..629f90b 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/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 ];
+  };
+
+}

From fd5f32dd18270bbd8ba947459aaff52d3c3768e2 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 12 Nov 2020 14:19:33 +0100
Subject: [PATCH 5/6] archachatina: add commented-out support for non-free
 virtualbox

---
 archachatina.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/archachatina.nix b/archachatina.nix
index f06561b..71723ff 100644
--- a/archachatina.nix
+++ b/archachatina.nix
@@ -58,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;

From 2c58227d53aec303c1fab6a733ce0224d0f24034 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 12 Nov 2020 14:20:39 +0100
Subject: [PATCH 6/6] Remove waybar patch as it doesn't work with winter-time.

---
 fix-waybar.patch | 13 -------------
 sway.nix         |  6 +-----
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 fix-waybar.patch

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/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