diff --git a/TODO b/TODO
index 2d2585c..2db2199 100644
--- a/TODO
+++ b/TODO
@@ -39,3 +39,4 @@
  +- [ ] Maybe symlink your music to a music folder in your home directory or something (i.e. `~/Music -> /mnt/world/music` or perhaps a subdirectory of that?)
 [x] rmpc isnt working WAAAAAAAAAAAAAAAAAAAAAAAAAaa ive been working on this for a month i just wanna be done so i can lie down and cuddle girls and be happy forever................
 [ ] alvr doesnt work :(
+[ ] Manage flatpaks declaratively (https://github.com/gmodena/nix-flatpak)
diff --git a/nixos/flake.lock b/nixos/flake.lock
index a4df30f..36064f3 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -63,6 +63,22 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1734128415,
+        "narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "8bdc2540da516006d07b04019eb57ae0781a04b3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "latest",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1734323986,
@@ -121,6 +137,7 @@
       "inputs": {
         "fenix": "fenix",
         "home-manager": "home-manager",
+        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur"
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 45f49c2..4599df3 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -4,6 +4,7 @@
     inputs = {
         nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
         nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+        nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
         home-manager = {
             url = "github:nix-community/home-manager/release-24.11";
             inputs.nixpkgs.follows = "nixpkgs";
@@ -20,7 +21,7 @@
         };
     };
 
-    outputs = { self, nixpkgs, home-manager, ... }@inputs: {
+    outputs = { self, nixpkgs, home-manager, nix-flatpak, ... }@inputs: {
         nixosConfigurations =
             let
                 system = hostname: {
@@ -29,6 +30,7 @@
                         system = "x86_64-linux";
                         specialArgs = { inherit inputs; };
                         modules = [
+                            nix-flatpak.nixosModules.nix-flatpak
                             ./hosts/${hostname}/configuration.nix
                         ];
                     };
diff --git a/nixos/hosts/base.nix b/nixos/hosts/base.nix
index c714d1c..0eab90d 100644
--- a/nixos/hosts/base.nix
+++ b/nixos/hosts/base.nix
@@ -64,7 +64,13 @@
         # CUPS printing
         printing.enable = true;
         # misc
-        flatpak.enable = true;
+        flatpak = {
+            enable = true;
+            packages = [
+                "com.github.tchx84.Flatseal"
+                { flatpakref = "https://sober.vinegarhq.org/sober.flatpakref"; sha256 = "1pj8y1xhiwgbnhrr3yr3ybpfis9slrl73i0b1lc9q89vhip6ym2l"; }
+            ];
+        };
         blueman.enable = true;
         openssh = {
             enable = true;
@@ -88,21 +94,6 @@
         };
     };
 
-    systemd.services = {
-        flatpak-repo = {
-            wantedBy = [ "multi-user.target" ];
-            path = [ pkgs.flatpak ];
-            script = ''
-                flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-            '';
-        };
-        #?rm
-        # https://github.com/NixOS/nixpkgs/issues/102547#issuecomment-1016671189
-        # mpd.environment = {
-        #     XDG_RUNTIME_DIR = "/run/user/1000";
-        # };
-    };
-
     xdg.portal = {
         enable = true;
         config = {