using desktopfile hook now

_sources/generated.json

@@ -148,27 +148,6 @@
         },
         "version": "8c48a699e201aa5559227a96d879b2f57192b354"
     },
-    "oh-my-pi": {
-        "cargoLock": null,
-        "date": null,
-        "extract": null,
-        "name": "oh-my-pi",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "can1357",
-            "repo": "oh-my-pi",
-            "rev": "v15.10.1",
-            "sha256": "sha256-SPVour0OyZmJ+G+p7SFAjB0vdTWuvUAQH82InOvSVZc=",
-            "sparseCheckout": [],
-            "type": "github"
-        },
-        "version": "v15.10.1"
-    },
     "qebspil": {
         "cargoLock": null,
         "date": "2025-10-25",

_sources/generated.nix

@@ -98,17 +98,6 @@
     };
     date = "2026-05-16";
   };
-  oh-my-pi = {
-    pname = "oh-my-pi";
-    version = "v15.10.1";
-    src = fetchFromGitHub {
-      owner = "can1357";
-      repo = "oh-my-pi";
-      rev = "v15.10.1";
-      fetchSubmodules = false;
-      sha256 = "sha256-SPVour0OyZmJ+G+p7SFAjB0vdTWuvUAQH82InOvSVZc=";
-    };
-  };
   qebspil = {
     pname = "qebspil";
     version = "8e4d9e676a3b3afe136cda9b953a2139ff1a32d0";

flake.lock

@@ -1,52 +1,8 @@
 {
   "nodes": {
-    "bun2nix": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1778446047,
-        "narHash": "sha256-oQvcadh2BCkrog+SGrG6YffKJrveYpjj3TdQJWaKhaM=",
-        "owner": "nix-community",
-        "repo": "bun2nix",
-        "rev": "f2bc12af1a6369648aac41041ceeaa0b866599c6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "bun2nix",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "bun2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1777988971,
-        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -80,7 +36,6 @@
     },
     "root": {
       "inputs": {
-        "bun2nix": "bun2nix",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
@@ -99,42 +54,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "bun2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1775636079,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -4,86 +4,87 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     flake-utils.url = "github:numtide/flake-utils";
-    # Added for oh-my-pi
-    bun2nix.url = "github:nix-community/bun2nix";
-    bun2nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = {
+  outputs =
-    self,
-    nixpkgs,
-    bun2nix,
-    flake-utils,
-  } @ inputs: (
-    nixpkgs.lib.recursiveUpdate
-    (
-      flake-utils.lib.eachSystem
-      [
-        "x86_64-linux"
-        "aarch64-linux"
-      ]
-      (
-        system: let
-          pkgs = import nixpkgs {
-            inherit system;
-            overlays = [bun2nix.overlays.default];
-            config = {
-              allowUnfree = true;
-            };
-          };
-          inherit (pkgs) lib;
-          scope = lib.makeScope pkgs.newScope (final: self.overlays.default (pkgs // final) pkgs);
-          recursePackage = name: pkg: let
-            isDrv = lib.isDerivation pkg;
-            isAttrs = lib.isAttrs pkg;
-            isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
-          in
-            if !isSameSystem
-            then []
-            else if isDrv
-            then [
-              (lib.nameValuePair name pkg)
-            ]
-            else if isAttrs
-            then lib.mapAttrsToList (nameNew: subPkg: recursePackage "${name}-${nameNew}" subPkg) pkg
-            else [];
-          flatPackages = builtins.listToAttrs (
-            lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope)
-          );
-          workingPackages = lib.filterAttrs (_: pkg: !pkg.meta.broken) flatPackages;
-          # Disable for now
-          # recursePackageSets =
-          #   pkg:
-          #   let
-          #     isDrv = lib.isDerivation pkg;
-          #     isAttrs = lib.isAttrs pkg;
-          #     isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
-          #   in
-          #   if isDrv && isSameSystem then
-          #     pkg
-          #   else if isAttrs then
-          #     lib.mapAttrs (_: subPkg: recursePackageSets subPkg) pkg
-          #   else
-          #     null;
-          #
-          # # Recursively filter out nulls and remove overrides (probably a btter way to do this but it works for now)
-          # packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") (
-          #   lib.mapAttrs (name: pkg: recursePackageSets pkg) scope
-          # );
-        in {
-          overlays = final: prev: flatPackages;
-          packages = flatPackages;
-          checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages;
-          devShells.default = pkgs.mkShellNoCC {
-            packages = [pkgs.nvfetcher];
-          };
-        }
-      )
-    )
     {
-      overlays = {
+      self,
-        default = final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
+      nixpkgs,
-      };
+      flake-utils,
-    }
+    }@inputs:
-  );
+    (nixpkgs.lib.recursiveUpdate
+      (flake-utils.lib.eachSystem
+        [
+          "x86_64-linux"
+          "aarch64-linux"
+        ]
+        (
+          system:
+          let
+            pkgs = import nixpkgs {
+              inherit system;
+              config = {
+                allowUnfree = true;
+              };
+            };
+            inherit (pkgs) lib;
+            scope = lib.makeScope pkgs.newScope (final: self.overlays.default (pkgs // final) pkgs);
+            recursePackage =
+              name: pkg:
+              let
+                isDrv = lib.isDerivation pkg;
+                isAttrs = lib.isAttrs pkg;
+                isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
+              in
+              if !isSameSystem then
+                [ ]
+              else if isDrv then
+                [
+                  (lib.nameValuePair name pkg)
+                ]
+              else if isAttrs then
+                lib.mapAttrsToList (nameNew: subPkg: recursePackage "${name}-${nameNew}" subPkg) pkg
+              else
+                [ ];
+            flatPackages = builtins.listToAttrs (
+              lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope)
+            );
+            workingPackages = lib.filterAttrs (_: pkg: !pkg.meta.broken) flatPackages;
+            # Disable for now
+            # recursePackageSets =
+            #   pkg:
+            #   let
+            #     isDrv = lib.isDerivation pkg;
+            #     isAttrs = lib.isAttrs pkg;
+            #     isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
+            #   in
+            #   if isDrv && isSameSystem then
+            #     pkg
+            #   else if isAttrs then
+            #     lib.mapAttrs (_: subPkg: recursePackageSets subPkg) pkg
+            #   else
+            #     null;
+            #
+            # # Recursively filter out nulls and remove overrides (probably a btter way to do this but it works for now)
+            # packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") (
+            #   lib.mapAttrs (name: pkg: recursePackageSets pkg) scope
+            # );
+          in
+          {
+            overlays = final: prev: flatPackages;
+            packages = flatPackages;
+            checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages;
+            devShells.default = pkgs.mkShellNoCC {
+              packages = [ pkgs.nvfetcher ];
+            };
+          }
+        )
+      )
+      {
+        overlays = {
+          default =
+            final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
+        };
+      }
+    );
 }

nvfetcher.toml

@@ -49,7 +49,3 @@ fetch.github = "Slush97/grimoire"
 src.github = "Slush97/vpkmerge"
 fetch.github = "Slush97/vpkmerge"
 cargo_lock = ["Cargo.lock"]
-
-[oh-my-pi]
-src.github = "can1357/oh-my-pi"
-fetch.github = "can1357/oh-my-pi"

pkgs/by-name/oh/oh-my-pi/package.nix

@@ -1,38 +0,0 @@
-{
-  lib,
-  callPackage,
-  stdenv,
-  bun2nix,
-}: let
-  sources = callPackage ../../../../_sources/generated.nix {};
-in
-  stdenv.mkDerivation {
-    pname = "oh-my-pi";
-    version = "unstable-${sources.oh-my-pi.version}";
-
-    inherit (sources.oh-my-pi) src;
-
-    nativeBuildInputs = [
-      bun2nix.hook
-    ];
-
-    bunDeps = bun2nix.fetchBunDeps {
-      bunNix = ./bun.nix;
-    };
-
-    preBuild = ''
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      runHook postInstall
-    '';
-
-    meta = with lib; {
-      description = "UEFI boot driver to start co-processors on Qualcomm platforms late during the boot process";
-      homepage = "https://github.com/can1357/oh-my-pi";
-      license = licenses.mit;
-      platforms = ["aarch64-linux" "x86_64-linux"];
-      mainProgram = "omp";
-    };
-  }