hi

3 files changed, 3 insertions, 155 deletions

diff --git a/home/ebisu/meta/multimedia/browser/default.nix b/home/ebisu/meta/multimedia/browser/default.nix
index 176bc9c..0eaa3ed 100644
--- a/home/ebisu/meta/multimedia/browser/default.nix
+++ b/home/ebisu/meta/multimedia/browser/default.nix
@@ -14,6 +14,6 @@
     web-ext
     firefox
     tor-browser
-    (pkgs.callPackage ./zen-browser-bin.nix { })
+    (pkgs.callPackage ../../../../../pkgs/zen-browser-bin.nix { })
   ];
 }
diff --git a/home/ebisu/meta/multimedia/browser/thorium.nix b/home/ebisu/meta/multimedia/browser/thorium.nix
index e789275..20cdb73 100644
--- a/home/ebisu/meta/multimedia/browser/thorium.nix
+++ b/home/ebisu/meta/multimedia/browser/thorium.nix
@@ -1,30 +1,6 @@
-{ pkgs, lib, ... }:
-let
-  thorium-archive = pkgs.fetchurl {
-    url = "https://github.com/Alex313031/thorium/releases/download/M126.0.6478.246/Thorium_Browser_126.0.6478.246_Th24_SSE4.AppImage";
-    hash = "sha256-izYbx/mSA+l7fAh917SauHopk3UlUJo+7NjkyIGpnNA=";
-  };
-
-  version = "126.0.6478.246_Th24";
-
-  # https://discourse.nixos.org/t/creating-a-nix-derivation-for-an-appimage/31927
-  thorium = pkgs.appimageTools.wrapType2 {
-    pname = "thorium";
-    version = version;
-    src = "${thorium-archive}";
-
-    meta = with lib; {
-      description = "Chromium fork named after radioactive element No. 90. Windows and MacOS/Raspi/Android/Special builds are in different repositories, links are towards the top of the README.md.";
-      sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-      homepage = "https://thorium.rocks/";
-      license = licenses.bsd3;
-      platforms = platforms.linux;
-      mainProgram = "thorium-browser";
-    };
-  };
-in
+{ pkgs, ... }:
 {
-  home.packages = [ thorium ];
+  home.packages = [ (pkgs.callPackage ../../../../../pkgs/thorium.nix { }) ];
 
   xdg.configFile."thorium-flags.conf".text = ''
     --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer,TouchpadOverscrollHistoryNavigation
diff --git a/home/ebisu/meta/multimedia/browser/zen-browser-bin.nix b/home/ebisu/meta/multimedia/browser/zen-browser-bin.nix
deleted file mode 100644
index 51a95db..0000000
--- a/home/ebisu/meta/multimedia/browser/zen-browser-bin.nix
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchzip,
-  makeDesktopItem,
-  autoPatchelfHook,
-  wrapGAppsHook3,
-  copyDesktopItems,
-  gtk3,
-  alsa-lib,
-  dbus-glib,
-  xorg,
-  pciutils,
-  libva,
-  pipewire,
-  libglvnd,
-}:
-let
-  desktopItem = makeDesktopItem {
-    name = "zen-browser";
-    desktopName = "Zen Browser";
-    genericName = "Web Browser";
-    categories = [
-      "Network"
-      "WebBrowser"
-    ];
-    keywords = [
-      "internet"
-      "www"
-      "browser"
-      "web"
-      "explorer"
-    ];
-    exec = "zen %u";
-    icon = "zen";
-    mimeTypes = [
-      "text/html"
-      "text/xml"
-      "application/xhtml+xml"
-      "application/vnd.mozilla.xul+xml"
-      "x-scheme-handler/http"
-      "x-scheme-handler/https"
-    ];
-    startupNotify = true;
-    startupWMClass = "zen-alpha";
-    terminal = false;
-    actions = {
-      new-window = {
-        name = "New Window";
-        exec = "zen --new-window %u";
-      };
-      new-private-window = {
-        name = "New Private Window";
-        exec = "zen --private-window %u";
-      };
-      profile-manager-window = {
-        name = "Profile Manager";
-        exec = "zen --ProfileManager %u";
-      };
-    };
-  };
-in
-stdenv.mkDerivation rec {
-  pname = "zen-browser-bin";
-  version = "1.0.0-a.32";
-
-  src = fetchzip {
-    url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-specific.tar.bz2";
-    hash = "sha256-5Z+RG5UwSHM6sC1WT5KHgwL0cco2DlMTSteEfnLGrlo=";
-  };
-
-  desktopItems = [ desktopItem ];
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    wrapGAppsHook3
-    copyDesktopItems
-  ];
-
-  buildInputs = [
-    gtk3
-    alsa-lib
-    dbus-glib
-    xorg.libXtst
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/lib
-    cp -r $src $out/lib/zen/
-
-    mkdir -p $out/bin
-    ln -s $out/lib/zen/zen $out/bin/zen
-
-    for n in {16,32,48,64,128}; do
-      size=$n"x"$n
-      mkdir -p $out/share/icons/hicolor/$size/apps
-      file="default"$n".png"
-      cp $out/lib/zen/browser/chrome/icons/default/$file $out/share/icons/hicolor/$size/apps/zen.png
-    done
-
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix LD_LIBRARY_PATH : "${
-        lib.makeLibraryPath [
-          pciutils
-          pipewire
-          libva
-          libglvnd
-        ]
-      }"
-    )
-    gappsWrapperArgs+=(--set MOZ_LEGACY_PROFILES 1)
-    wrapGApp $out/lib/zen/zen
-  '';
-
-  meta = with lib; {
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ mordrag ];
-    description = "Experience tranquillity while browsing the web without people tracking you! ";
-    platforms = platforms.linux;
-    mainProgram = "zen";
-  };
-}