diff --git a/flake.nix b/flake.nix
index 171e115..8bb312f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,6 +7,8 @@
     # Home manager
     home-manager.url = "github:nix-community/home-manager/release-24.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    # Managing flatpak apps
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
   };
 
   outputs = {
@@ -20,6 +22,7 @@
     # HP Spectre x360 2018
     nixosConfigurations.spectre = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+      specialArgs = { inherit inputs; };
       modules = [
         ./hosts/spectre-x360-2018
         home-manager.nixosModules.home-manager
@@ -29,6 +32,7 @@
 
             home-manager.users.remy.imports = [
               ./users/remy.nix
+              inputs.nix-flatpak.homeManagerModules.nix-flatpak
             ];
           }
         ];
@@ -42,7 +46,9 @@
     # };
 
     ## Home Manager configurations here?
-    # TODO
 
+
+    ## Useful nix build tools
+    # iso builder TODO
   };
 }
diff --git a/modules/home-manager/flatpaks.nix b/modules/home-manager/flatpaks.nix
new file mode 100644
index 0000000..a90d42c
--- /dev/null
+++ b/modules/home-manager/flatpaks.nix
@@ -0,0 +1,19 @@
+{ lib, ... }: {
+
+  services.flatpak.enable = true;
+
+  services.flatpak.update.auto.enable = false;
+  services.flatpak.uninstallUnmanaged = false;
+  services.flatpak.packages = [
+    #{ appId = "com.brave.Browser"; origin = "flathub"; }
+    com.calibre_ebook.calibre
+    com.github.flxzt.rnote
+    com.github.tchx84.Flatseal
+    com.spotify.Client
+    io.podman_desktop.PodmanDesktop
+    org.pipewire.Helvum
+    #"com.obsproject.Studio"
+    #"im.riot.Riot"
+  ];
+
+}
\ No newline at end of file