diff --git a/flake.lock b/flake.lock index aae680a..25ddfae 100644 --- a/flake.lock +++ b/flake.lock @@ -102,6 +102,27 @@ "type": "github" } }, + "helium": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1775098031, + "narHash": "sha256-OfHMljT9Z053S4Tuw3YCaicXZy5ROzvmzCpBqRlSYa0=", + "owner": "schembriaiden", + "repo": "helium-browser-nix-flake", + "rev": "d79ff6e1c30e93f621ac0d27b0057ff9ee811c1a", + "type": "github" + }, + "original": { + "owner": "schembriaiden", + "repo": "helium-browser-nix-flake", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -138,25 +159,6 @@ "type": "github" } }, - "mynixpkgs": { - "inputs": { - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1773777798, - "narHash": "sha256-2RqnNcMmPSWvS3Dxbd2rY8pPz4gaNqnUlPaLH3VLogo=", - "owner": "linuxmobile", - "repo": "mynixpkgs", - "rev": "5bd67d272772b698ec7f2a27babfb76df8c58774", - "type": "github" - }, - "original": { - "owner": "linuxmobile", - "repo": "mynixpkgs", - "type": "github" - } - }, "nix-index-db": { "inputs": { "nixpkgs": [ @@ -178,22 +180,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1773734432, "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", @@ -215,10 +201,10 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "flake-utils": "flake-utils", + "helium": "helium", "import-tree": "import-tree", - "mynixpkgs": "mynixpkgs", "nix-index-db": "nix-index-db", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "systems": "systems_2", "zen-browser": "zen-browser" } @@ -253,6 +239,24 @@ "type": "github" } }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "zen-browser": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 164e12d..0e0f8cd 100644 --- a/flake.nix +++ b/flake.nix @@ -53,13 +53,16 @@ import-tree.url = "github:vic/import-tree"; - mynixpkgs.url = "github:linuxmobile/mynixpkgs"; - zen-browser = { url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + helium = { + url = "github:schembriaiden/helium-browser-nix-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-index-db = { url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/packages/browsers/helium.nix b/home/packages/browsers/helium.nix index bfd6587..6c4a11d 100644 --- a/home/packages/browsers/helium.nix +++ b/home/packages/browsers/helium.nix @@ -8,7 +8,7 @@ heliumWrapped = pkgs.symlinkJoin { name = "helium-wrapped"; - paths = [inputs.mynixpkgs.packages.${pkgs.stdenv.hostPlatform.system}.helium]; + paths = [inputs.helium.packages.${pkgs.system}.default]; buildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/helium \ diff --git a/home/packages/packages.nix b/home/packages/packages.nix index aeeec99..43faa53 100644 --- a/home/packages/packages.nix +++ b/home/packages/packages.nix @@ -41,17 +41,6 @@ inkscape scrcpy android-tools - (inputs.mynixpkgs.packages.${stdenv.hostPlatform.system}.multiviewer.overrideAttrs (old: { - buildInputs = (old.buildInputs or []) ++ [pkgs.makeWrapper]; - postInstall = '' - wrapProgram $out/bin/multiviewer \ - --set LD_LIBRARY_PATH "/run/opengl-driver/lib:''${LD_LIBRARY_PATH:-}" \ - --set __EGL_VENDOR_LIBRARY_FILENAMES ${pkgs.mesa}/share/glvnd/egl_vendor.d/50_mesa.json \ - --set LIBGL_ALWAYS_INDIRECT 0 \ - --set ELECTRON_OZONE_PLATFORM_HINT wayland - ''; - })) - swww openvpn ]; diff --git a/home/terminal/software/tui.nix b/home/terminal/software/tui.nix index 5e45eef..ac7c202 100644 --- a/home/terminal/software/tui.nix +++ b/home/terminal/software/tui.nix @@ -34,13 +34,6 @@ wiremix zfxtop opencode - ] - ++ (with inputs.mynixpkgs.packages.${stdenv.hostPlatform.system}; [ - dawn - dfft loupe - nekot - omm - prs - ]); + ]; }