diff --git a/pkgs/sublime-music-mobile/default.nix b/pkgs/sublime-music-mobile/default.nix
index a8d562b1..3fe845f5 100644
--- a/pkgs/sublime-music-mobile/default.nix
+++ b/pkgs/sublime-music-mobile/default.nix
@@ -1,24 +1,186 @@
-{ pkgs
+# { pkgs
+# , lib
+# , libhandy
+# , ... }:
+# 
+# (pkgs.sublime-music.overrideAttrs (upstream: {
+#   pname = "sublime-music-mobile";
+#   version = "0.11.10";
+#   # <https://gitlab.com/BenjaminSchaaf/sublime-music/-/tree/libhandy>
+#   src = pkgs.fetchFromGitLab {
+#     owner = "BenjaminSchaaf";
+#     repo = "sublime-music";
+#     rev = "4ce2f222f13020574d54110d90839f48d8689b9d";
+#     sha256 = "sha256-V6YyBbPKAfZb5FVOesNcC6TfJbO73WZ4DvlOSWSSZzU=";
+#   };
+# 
+#   buildInputs = upstream.buildInputs ++ [
+#     # requires this PR that adds the drawtab:
+#     # - <https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/707>
+#     (libhandy.overrideAttrs (superhandy: {
+#       version = "1.5.0";
+#       src = pkgs.fetchFromGitLab {
+#         domain = "gitlab.gnome.org";
+#         owner = "BenjaminSchaaf";
+#         repo = "libhandy";
+#         rev = "0557503278a099c1b9999ceebb7c21fa9c15a3a5";
+#         sha256 = "sha256-MwOnQ2h1ypSvxOSaXDdSFoMKOMr9DonTCMNT796kaQs=";
+#       };
+#       nativeBuildInputs = superhandy.nativeBuildInputs ++ [
+#         pkgs.docbook_xml_dtd_43
+#         pkgs.docbook-xsl-nons
+#         pkgs.gtk-doc
+#       ];
+#     }))
+#   ];
+# 
+#   # i think Benjamin didn't update the tests?
+#   doCheck = false;
+#   doInstallCheck = false;
+# 
+#   meta.description = "A mobile-friendly sublime music fork";
+# }))
+
+{ fetchFromGitLab
+, fetchFromGitea
+, docbook_xml_dtd_43
+, docbook-xsl-nons
+, gtk-doc
 , lib
 , libhandy
-, ... }:
+, python3Packages
+, gobject-introspection
+, gtk3
+, pango
+, wrapGAppsHook
+, xvfb-run
+, chromecastSupport ? false
+, serverSupport ? false
+, keyringSupport ? true
+, notifySupport ? true, libnotify
+, networkSupport ? true, networkmanager
+}:
 
-(pkgs.sublime-music.overrideAttrs (upstream: {
-  src = pkgs.fetchFromGitLab {
-    owner = "BenjaminSchaaf";
+python3Packages.buildPythonApplication rec {
+  pname = "sublime-music-mobile";
+  version = "0.11.16";
+  format = "pyproject";
+
+  # src = fetchFromGitLab {
+  #   owner = "sublime-music";
+  #   repo = pname;
+  #   rev = "v${version}";
+  #   sha256 = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg=";
+  # };
+  # src = fetchFromGitLab {
+  #   owner = "BenjaminSchaaf";
+  #   repo = "sublime-music";
+  #   rev = "4ce2f222f13020574d54110d90839f48d8689b9d";
+  #   sha256 = "sha256-V6YyBbPKAfZb5FVOesNcC6TfJbO73WZ4DvlOSWSSZzU=";
+  # };
+  src = fetchFromGitea {
+    domain = "git.uninsane.org";
+    owner = "colin";
     repo = "sublime-music";
-    rev = "4ce2f222f13020574d54110d90839f48d8689b9d";
-    sha256 = "sha256-V6YyBbPKAfZb5FVOesNcC6TfJbO73WZ4DvlOSWSSZzU=";
+    rev = "5d8eb1f15c946a43dcf15266ce109f6bec810ce3";
+    sha256 = "sha256-qMCyRNPtmd29dQKKcPi+Jy5gr39crZUBizprdOZlmY4=";
   };
 
-  buildInputs = upstream.buildInputs ++ [
-    # TODO: need to patch handy to include the pulltab thing
-    libhandy
+  nativeBuildInputs = [
+    gobject-introspection
+    python3Packages.poetry-core
+    python3Packages.pythonRelaxDepsHook
+    wrapGAppsHook
+  ];
+
+  # Can be removed in later versions (probably > 0.11.16)
+  pythonRelaxDeps = [
+    "deepdiff"
+    "python-mpv"
+  ];
+
+  buildInputs = [
+    gtk3
+    pango
+    (libhandy.overrideAttrs (superhandy: {
+      version = "1.5.0";
+      src = fetchFromGitLab {
+        domain = "gitlab.gnome.org";
+        owner = "BenjaminSchaaf";
+        repo = "libhandy";
+        rev = "0557503278a099c1b9999ceebb7c21fa9c15a3a5";
+        sha256 = "sha256-MwOnQ2h1ypSvxOSaXDdSFoMKOMr9DonTCMNT796kaQs=";
+      };
+      nativeBuildInputs = superhandy.nativeBuildInputs ++ [
+        docbook_xml_dtd_43
+        docbook-xsl-nons
+        gtk-doc
+      ];
+    }))
+  ]
+   ++ lib.optional notifySupport libnotify
+   ++ lib.optional networkSupport networkmanager
+  ;
+
+  propagatedBuildInputs = with python3Packages; [
+    bleach
+    dataclasses-json
+    deepdiff
+    fuzzywuzzy
+    mpv
+    peewee
+    pygobject3
+    python-Levenshtein
+    python-dateutil
+    requests
+    semver
+  ]
+   ++ lib.optional chromecastSupport PyChromecast
+   ++ lib.optional keyringSupport keyring
+   ++ lib.optional serverSupport bottle
+  ;
+
+  postPatch = ''
+    sed -i "/--cov/d" setup.cfg
+    sed -i "/--no-cov-on-fail/d" setup.cfg
+    substituteInPlace pyproject.toml \
+      --replace 'deepdiff = "^5.8.1"' 'deepdiff = ">=5.8.1"'
+  '';
+
+  # hook for gobject-introspection doesn't like strictDeps
+  # https://github.com/NixOS/nixpkgs/issues/56943
+  strictDeps = false;
+
+  checkInputs = with python3Packages; [
+    pytest
+  ];
+
+  checkPhase = ''
+    ${xvfb-run}/bin/xvfb-run pytest
+  '';
+
+  pythonImportsCheck = [
+    "sublime_music"
   ];
 
   # i think Benjamin didn't update the tests?
   doCheck = false;
   doInstallCheck = false;
 
-  meta.description = "A mobile-friendly sublime music fork";
-}))
+  postInstall = ''
+    install -Dm444 sublime-music.desktop      -t $out/share/applications
+    install -Dm444 sublime-music.metainfo.xml -t $out/share/metainfo
+
+    for size in 16 22 32 48 64 72 96 128 192 512 1024; do
+        install -Dm444 logo/rendered/"$size".png \
+          $out/share/icons/hicolor/"$size"x"$size"/apps/sublime-music.png
+    done
+  '';
+
+  meta = with lib; {
+    description = "GTK3 Subsonic/Airsonic client";
+    homepage = "https://sublimemusic.app/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ albakham sumnerevans ];
+  };
+}