diff --git a/nixos-configurations/flatpak.sh b/nixos-configurations/flatpak.sh
new file mode 100644
index 0000000..c800aa0
--- /dev/null
+++ b/nixos-configurations/flatpak.sh
@@ -0,0 +1,3 @@
+flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+
+flatpak install flathub io.dbeaver.DBeaverCommunity
diff --git a/nixos-configurations/laptop/default.nix b/nixos-configurations/laptop/default.nix
index c18d046..d786a6a 100644
--- a/nixos-configurations/laptop/default.nix
+++ b/nixos-configurations/laptop/default.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   imports = [
diff --git a/nixos-configurations/shared-desktop.nix b/nixos-configurations/shared-desktop.nix
index 13c255d..a00e1c8 100644
--- a/nixos-configurations/shared-desktop.nix
+++ b/nixos-configurations/shared-desktop.nix
@@ -33,14 +33,6 @@
     flatpak.enable = true;
   };
 
-  systemd.services.flatpak-repo = {
-    wantedBy = [ "multi-user.target" ];
-    path = [ pkgs.flatpak ];
-    script = ''
-      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    '';
-  };
-
   networking.firewall = {
     allowedTCPPorts = [ 53317 ];
     allowedUDPPorts = [ 53317 ];