From 89ac6a39e8b5357fbeb8e86957620422618cf5f0 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Mon, 11 Sep 2023 13:05:48 +0200
Subject: [PATCH] Fixefox X11 touchscreen

---
 hosts/yodaTab/configuration.nix |  1 +
 hosts/yodaTux/configuration.nix |  1 +
 modules/firefox.nix             | 14 ++++++++++++++
 modules/programs.nix            | 15 ++++++++++++++-
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 modules/firefox.nix

diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index c7089f2..f548c2a 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -33,6 +33,7 @@ in
       ../../modules/git.nix
       ../../modules/zsh.nix
       ../../modules/nitrokey-ssh-gpg.nix
+      ../../modules/firefox.nix
       ../../modules/thunderbird.nix
     ];
 
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index d13eee7..c86e79b 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -33,6 +33,7 @@ in
       ../../modules/git.nix
       ../../modules/zsh.nix
       ../../modules/nitrokey-ssh-gpg.nix
+      ../../modules/firefox.nix
       ../../modules/thunderbird.nix
     ];
 
diff --git a/modules/firefox.nix b/modules/firefox.nix
new file mode 100644
index 0000000..c0008cd
--- /dev/null
+++ b/modules/firefox.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, ... }:
+
+{
+  users.users.yoda = {
+    packages = with pkgs; [
+      firefox # Web browser
+    ];
+  };
+
+  # Touch input with Firefox under X11.
+  environment.sessionVariables = {
+    MOZ_USE_XINPUT2 = "1";
+  };
+}
diff --git a/modules/programs.nix b/modules/programs.nix
index de7b328..cd78edb 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -37,7 +37,6 @@
         # Graphical Apps
         gnome.gnome-tweaks
         gnome.dconf-editor
-        firefox # Web browser
         tor-browser-bundle-bin # Tor web browser
         keepassxc # Password manager
         freetube # YouTube client
@@ -54,6 +53,7 @@
         transmission-gtk # BitTorrent client
         meld # Diff and merge tool
         digikam # Photo organization
+        handbrake # Rip DVD and Blu-ray; rotate and export videos
 
         # Matrix clients
         element-desktop
@@ -65,4 +65,17 @@
         #nheko
       ];
   };
+
+  # There is a community project providing declarative Flatpak app installations:
+  #   https://github.com/GermanBread/declarative-flatpak
+  # This is probably a bit overkill for the few Flatpak apps I use.
+  # Let's just use the default way:
+  #   https://nixos.wiki/wiki/Flatpak
+  services.flatpak.enable = true;
+  #
+  # TODO: These commands have to be executed manually.
+  #   flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+  #   flatpak update
+  #   # Trim, flip, rotate, crop and export individual clips.
+  #   flatpak install io.gitlab.adhami3310.Footage
 }