diff --git a/application-configuration.nix b/application-configuration.nix
index 5fc965a..29d96bb 100644
--- a/application-configuration.nix
+++ b/application-configuration.nix
@@ -19,9 +19,9 @@
         gparted
         hashcat
 
-        # FAF
-        jq
-        cabextract
+        ##flatpak
+        flatpak
+        gnome.gnome-software
       ];
   };
 
@@ -45,4 +45,7 @@
 
   # yubikey
   services.pcscd.enable = true;
+
+  # flatpak for bluebubbles client
+  services.flatpak.enable = true;
 }
diff --git a/faf-linux.nix b/faf-linux.nix
new file mode 100644
index 0000000..7af29e0
--- /dev/null
+++ b/faf-linux.nix
@@ -0,0 +1,17 @@
+{ lib, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    git
+    wget
+    jq
+    cabextract
+    gnupatch
+    libpulseaudio
+    haskellPackages.freetype2
+    xorg.libXcomposite
+    xorg.libXrandr
+    xorg.libXfixes
+    xorg.libXcursor
+    xorg.libXi
+  ];
+}