diff --git a/hosts/lungmen/default.nix b/hosts/lungmen/default.nix
index cf93a20..478c5a6 100644
--- a/hosts/lungmen/default.nix
+++ b/hosts/lungmen/default.nix
@@ -193,7 +193,7 @@ in {
       enableGC = true;
       autoMount = true;
     };
-    flatpak.enable = false;
+    flatpak.enable = true;
     xserver.videoDrivers = ["amdgpu"];
   };
 
diff --git a/pkgs-set/overlays/fractal-next.nix b/pkgs-set/overlays/fractal-next.nix
new file mode 100644
index 0000000..24a6d06
--- /dev/null
+++ b/pkgs-set/overlays/fractal-next.nix
@@ -0,0 +1,120 @@
+let
+  fractal-next = {
+    lib,
+    stdenv,
+    fetchFromGitLab,
+    nix-update-script,
+    meson,
+    cmake,
+    ninja,
+    gettext,
+    python3,
+    rustPlatform,
+    pkg-config,
+    glib,
+    libhandy,
+    libsecret,
+    libshumate,
+    gtk4,
+    gtksourceview5,
+    libadwaita,
+    llvmPackages,
+    glibc,
+    wayland,
+    pipewire,
+    dbus,
+    openssl,
+    sqlite,
+    gst_all_1,
+    cairo,
+    gdk-pixbuf,
+    gspell,
+    wrapGAppsHook,
+    desktop-file-utils,
+    appstream-glib,
+  }:
+    stdenv.mkDerivation rec {
+      pname = "fractal-next";
+      version = "1206d4ed12059a298b5d918fd0a77dca034f7084";
+
+      src = fetchFromGitLab {
+        domain = "gitlab.gnome.org";
+        owner = "GNOME";
+        repo = "fractal";
+        rev = "1206d4ed12059a298b5d918fd0a77dca034f7084";
+        sha256 = "sha256-ioMgVj85BKvsIjBbTAHFN6k5B/H86GLMTgAXK/5ji/k=";
+      };
+
+      cargoDeps = rustPlatform.fetchCargoTarball {
+        inherit src;
+        name = "${pname}-${version}";
+        hash = "sha256-gbTljLIYAanXm1D/tNBGNMlaDatXgZDeSY5pA8s5gog=";
+      };
+
+      nativeBuildInputs = [
+        appstream-glib # for appstream-util
+        gettext
+        meson
+        ninja
+        pkg-config
+        python3
+        rustPlatform.rust.cargo
+        rustPlatform.cargoSetupHook
+        rustPlatform.rust.rustc
+        wrapGAppsHook
+        desktop-file-utils
+        glib
+        cmake
+      ];
+
+      buildInputs = [
+        cairo
+        dbus
+        gdk-pixbuf
+        glib
+        gspell
+        gst_all_1.gst-editing-services
+        gst_all_1.gst-plugins-bad
+        gst_all_1.gst-plugins-base
+        (gst_all_1.gst-plugins-good.override {
+          gtkSupport = true;
+        })
+        gst_all_1.gstreamer
+        gst_all_1.gst-devtools
+        gtk4
+        gtksourceview5
+        libadwaita
+        wayland
+        pipewire
+        libhandy
+        openssl
+        libsecret
+        libshumate
+      ];
+
+      # libspa-sys requires this for bindgen
+      LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
+      # <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h>
+      BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include";
+
+      postPatch = ''
+        patchShebangs build-aux/meson_post_install.py
+      '';
+
+      passthru = {
+        updateScript = nix-update-script {
+          attrPath = pname;
+        };
+      };
+
+      meta = with lib; {
+        description = "Matrix group messaging app";
+        homepage = "https://gitlab.gnome.org/GNOME/fractal";
+        license = licenses.gpl3;
+        maintainers = teams.gnome.members ++ (with maintainers; [dtzWill genofire]);
+      };
+    };
+in
+  _: prev: {
+    fractal-next = prev.callPackage fractal-next {};
+  }
diff --git a/pkgs-set/pkgs-to-export.nix b/pkgs-set/pkgs-to-export.nix
index 0d75846..edfa699 100644
--- a/pkgs-set/pkgs-to-export.nix
+++ b/pkgs-set/pkgs-to-export.nix
@@ -1 +1 @@
-["discord-system-electron"]
+["discord-system-electron" "fractal-next"]
diff --git a/users/modules/starship/default.nix b/users/modules/starship/default.nix
index 28dfa2d..41b9f0c 100644
--- a/users/modules/starship/default.nix
+++ b/users/modules/starship/default.nix
@@ -2,7 +2,7 @@
   programs.starship = {
     enable = true;
     settings = {
-      format = "$shell$shlvl$nix_shell@ $directory> ";
+      format = "$shell$shlvl$nix_shell@ $directory$character";
       add_newline = false;
       character = {
         success_symbol = "[>](bold green)";