diff --git a/.gitignore b/.gitignore
index fed75a618..eda6e0af3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ result*
 /pkgs/clan-cli/clan_cli/webui/assets
 nixos.qcow2
 **/*.glade~
+.flatpak-builder/
 
 # python
 __pycache__
diff --git a/pkgs/clan-cli/clan_cli/__init__.py b/pkgs/clan-cli/clan_cli/__init__.py
index c27b90c71..82c13659a 100644
--- a/pkgs/clan-cli/clan_cli/__init__.py
+++ b/pkgs/clan-cli/clan_cli/__init__.py
@@ -120,6 +120,7 @@ def create_parser(prog: str | None = None) -> argparse.ArgumentParser:
 # this will be the entrypoint under /bin/clan (see pyproject.toml config)
 @profile
 def main() -> None:
+    print("Mainn")
     parser = create_parser()
     args = parser.parse_args()
 
diff --git a/pkgs/clan-cli/flatpak/FLATPAK.md b/pkgs/clan-cli/flatpak/FLATPAK.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/pkgs/clan-cli/flatpak/org.clan.cli.Devel.yml b/pkgs/clan-cli/flatpak/org.clan.cli.Devel.yml
new file mode 100644
index 000000000..8720f3124
--- /dev/null
+++ b/pkgs/clan-cli/flatpak/org.clan.cli.Devel.yml
@@ -0,0 +1,50 @@
+id: org.clan.cli.Devel
+runtime: org.freedesktop.Platform
+runtime-version: '23.08'
+sdk: org.freedesktop.Sdk
+command: clan
+modules:
+  - name: clan-cli
+    buildsystem: simple
+    build-commands:
+      - pip install --prefix=/app --no-deps ./pkgs/clan-cli
+    build-options:
+     build-args:
+      - --share=network
+    sources:
+      - type: dir
+        path: ../../../
+finish-args:
+  - "--share=network"
+  - "--filesystem=host"
+  - "--filesystem=host-etc"
+  - "--filesystem=/run/current-system/sw/bin/nix"
+  - "--filesystem=/run/opengl-driver/"
+  - "--filesystem=/nix/store/"
+  - "--filesystem=xdg-config/sops"
+  - "--filesystem=xdg-run/qemu"
+  - "--filesystem=/tmp:rw"
+  - "--filesystem=/tmp/org.clan.cli/:create"
+  - "--env=TMPDIR=/tmp/org.clan.cli/"
+  - "--device=all"
+  - "--allow=multiarch"
+  - "--allow=devel"
+  # - "--filesystem=/dev/vsock"
+  - "--env=PATH=/run/current-system/sw/bin"
+  - "--share=ipc"
+  # - "--unshare=ipc"
+  - "--socket=fallback-x11"
+  - "--socket=wayland"
+  - "--socket=pulseaudio"
+  - "--socket=system-bus"
+  - "--socket=session-bus"
+  - "--filesystem=xdg-run/gvfs"
+  - "--filesystem=xdg-run/gvfsd"
+  - "--filesystem=xdg-run/pipewire-0:rw"
+  - "--talk-name=org.clan.cli"
+  - "--system-talk-name=org.freedesktop.UDisks2"
+  - "--filesystem=xdg-run/dconf"
+  - "--filesystem=~/.config/dconf:ro"
+  - "--talk-name=ca.desrt.dconf"
+  - "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules/"
+
diff --git a/pkgs/clan-cli/flatpak/org.clan.cli.yml b/pkgs/clan-cli/flatpak/org.clan.cli.yml
new file mode 100644
index 000000000..8e7050e5b
--- /dev/null
+++ b/pkgs/clan-cli/flatpak/org.clan.cli.yml
@@ -0,0 +1,55 @@
+id: org.clan.cli
+runtime: org.freedesktop.Platform
+runtime-version: '23.08'
+sdk: org.freedesktop.Sdk
+command: clan
+modules:
+  - name: clan-cli
+    buildsystem: simple
+    build-commands:
+      - pip install --prefix=/app --no-deps ./pkgs/clan-cli
+    build-options:
+     build-args:
+      - --share=network
+    sources:
+      - type: git
+        branch: init-flatpak
+        # branch: init/flatpak
+        path: /home/kenji/git/clan-projects/clan-core
+        # url: https://git.clan.lol/clan/clan-core/
+        # branch: init/clan-cli-flatpak
+        # branch: main
+finish-args:
+  - "--share=network"
+  - "--filesystem=host"
+  - "--filesystem=host-etc"
+  - "--filesystem=/run/current-system/sw/bin/nix"
+  - "--filesystem=/run/opengl-driver/"
+  - "--filesystem=/nix/store/"
+  - "--filesystem=xdg-config/sops"
+  - "--filesystem=xdg-run/qemu"
+  - "--filesystem=/tmp:rw"
+  - "--filesystem=/tmp/org.clan.cli/:create"
+  - "--env=TMPDIR=/tmp/org.clan.cli/"
+  - "--device=all"
+  - "--allow=multiarch"
+  - "--allow=devel"
+  # - "--filesystem=/dev/vsock"
+  - "--env=PATH=/run/current-system/sw/bin"
+  - "--share=ipc"
+  # - "--unshare=ipc"
+  - "--socket=fallback-x11"
+  - "--socket=wayland"
+  - "--socket=pulseaudio"
+  - "--socket=system-bus"
+  - "--socket=session-bus"
+  - "--filesystem=xdg-run/gvfs"
+  - "--filesystem=xdg-run/gvfsd"
+  - "--filesystem=xdg-run/pipewire-0:rw"
+  - "--talk-name=org.clan.cli"
+  - "--system-talk-name=org.freedesktop.UDisks2"
+  - "--filesystem=xdg-run/dconf"
+  - "--filesystem=~/.config/dconf:ro"
+  - "--talk-name=ca.desrt.dconf"
+  - "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules/"
+