diff --git a/flake.lock b/flake.lock
index 3c7ded3..baaa733 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,6 +40,21 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1768656715,
+        "narHash": "sha256-Sbh037scxKFm7xL0ahgSCw+X2/5ZKeOwI2clqrYr9j4=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "123fe29340a5b8671367055b75a6e7c320d6f89a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1772773019,
@@ -60,6 +75,7 @@
       "inputs": {
         "friendlyelecCM3588": "friendlyelecCM3588",
         "home-manager": "home-manager",
+        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 375cc82..bd2cd17 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,7 @@
       url = "github:YayaADev/nixos-friendlyelec-cm3588";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-flatpak.url = "github:gmodena/nix-flatpak";
   };
 
   outputs = {self, nixpkgs, home-manager, ... }@inputs: 
diff --git a/plasma.nix b/plasma.nix
index 6c0100b..2796008 100644
--- a/plasma.nix
+++ b/plasma.nix
@@ -12,8 +12,6 @@
     pkgs.kdePackages.elisa
   ];
 
-  # enable flatpak
-  services.flatpak.enable = true;
 
   # Enable sound.
   services.pipewire = {
diff --git a/software/default-graphical.nix b/software/default-graphical.nix
index 9fb6bff..7c39a15 100644
--- a/software/default-graphical.nix
+++ b/software/default-graphical.nix
@@ -1,5 +1,5 @@
 
-{ config, lib, pkgs, home-manager, ... }:
+{ config, lib, pkgs, home-manager, ... }@inputs:
 {
   imports = [home-manager.nixosModules.home-manager];
   home-manager.users.shatteredmint = {
@@ -18,4 +18,36 @@
       makemkv
     ];
   };
+  # enable flatpak
+  services.flatpak.enable = true;
+  home-manager.users.shatteredmint.imports = [
+    inputs.nix-flatpak.homeManagerModules.nix-flatpak 
+    {
+        services.flatpak = {
+          update.onActivation = true;
+          packages = [
+            "com.atlauncher.ATLauncher"
+            "com.discordapp.Discord"
+            "com.github.k4zmu2a.spacecadetpinball"
+            "com.heroicgameslauncher.hgl"
+            "com.obsproject.Studio"
+            "com.revolutionarygamesstudio.ThriveLauncher"
+            "com.spotify.Client"
+            # "com.teamspeak.TeamSpeak"
+            # "com.teamspeak.TeamSpeak3"
+            "com.usebottles.bottles"
+            "com.valvesoftware.Steam"
+            # "md.obsidian.Obsidian"
+            "org.kde.neochat"
+            "org.kicad.KiCad"
+            "org.libreoffice.LibreOffice"
+            # "org.pipewire.Helvum"
+            # "org.rncbc.qpwgraph"
+            "org.telegram.desktop"
+          ];
+        };
+    }
+  ];
+
+
 }