diff --git a/flake.lock b/flake.lock
index bd2b3d4..8f360dd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -552,6 +552,22 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1767983141,
+        "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "440818969ac2cbd77bfe025e884d0aa528991374",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "latest",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -813,6 +829,7 @@
         "lanzaboote": "lanzaboote",
         "models-dev": "models-dev",
         "niri-flake": "niri-flake",
+        "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
diff --git a/flake.nix b/flake.nix
index a1e0521..0085ba0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,6 +82,7 @@
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
   };
   outputs =
     {
diff --git a/home/common/default.nix b/home/common/default.nix
index 632110f..b4e719f 100644
--- a/home/common/default.nix
+++ b/home/common/default.nix
@@ -34,6 +34,7 @@ in
     inputs.voxtype.homeManagerModules.default
     inputs.noctalia.homeModules.default
     inputs.niri-flake.homeModules.niri
+    inputs.nix-flatpak.homeManagerModules.nix-flatpak
   ];
 
   # This value determines the Home Manager release that your configuration is
@@ -112,8 +113,6 @@ in
     (writeShellScriptBin "nr" ''
       ${lib.getExe nix} run "nixpkgs#''${1}" "$@"
     '')
-    pkgs-unstable.tidal-hifi
-    inputs.tonearm.packages.${stdenv.hostPlatform.system}.tonearm
     blueman
     pavucontrol
     (writeShellScriptBin "voxtoggle" ''
@@ -805,6 +804,14 @@ in
     };
   };
 
+  services.flatpak = {
+    update.onActivation = true;
+
+    packages = [
+      "dev.diegovsky.Riff"
+    ];
+  };
+
   services.walker = {
     enable = true;
     package = pkgs.symlinkJoin {
diff --git a/hosts/radish/packages.nix b/hosts/radish/packages.nix
index 9168625..ccf2e19 100644
--- a/hosts/radish/packages.nix
+++ b/hosts/radish/packages.nix
@@ -34,6 +34,7 @@ in
   ];
   services = {
     gnome.evolution-data-server.enable = true;
+    flatpak.enable = true;
     pcscd = {
       enable = true;
       plugins = [ pkgs.ccid ];