diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..6b6bc40 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "mypkgs"] + path = mypkgs + url = https://github.com/arielherself/mypkgs diff --git a/home-manager/home.nix b/home-manager/home.nix index 52d2d22..37aa6e8 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -39,6 +39,9 @@ in { }; xdg.configFile = { + "nixpkgs/config.nix" = { + source = ../nixpkgs-config.nix; + }; "starship.toml" = { source = ../starship.toml; }; diff --git a/mypkgs.bak/default.nix b/mypkgs.bak/default.nix new file mode 100644 index 0000000..ea42e51 --- /dev/null +++ b/mypkgs.bak/default.nix @@ -0,0 +1,3 @@ +{ + thorium = import ./thorium/package.nix; +} diff --git a/mypkgs.bak/thorium/package.nix b/mypkgs.bak/thorium/package.nix new file mode 100644 index 0000000..4056bd5 --- /dev/null +++ b/mypkgs.bak/thorium/package.nix @@ -0,0 +1,130 @@ +with import {}; +let + opusWithCustomModes = pkgs.libopus.override { withCustomModes = true; }; +in +pkgs.stdenv.mkDerivation rec { + name = "thorium-${version}"; + version = "124.0.6367.218"; + + dontPatchELF = true; + + src = pkgs.fetchurl { + url = "https://github.com/Alex313031/thorium/releases/download/M${version}/thorium-browser_${version}_AVX2.deb"; + hash = "sha256-nXz5ocZYDBWLIaARk8lN9LhP+7p8bEx+Kk+JAT2tG5c="; + }; + sourceRoot = "."; + unpackPhase = "dpkg-deb --fsys-tarfile ${src} | tar -x --no-same-owner"; + + + rpath = lib.makeLibraryPath buildInputs + ":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs; + + + nativeBuildInputs = [ + pkgs.dpkg + pkgs.qt6.wrapQtAppsHook + ]; + + buildInputs = with pkgs; [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + bzip2 + cairo + coreutils + cups + curl + dbus + expat + flac + fontconfig + freetype + gcc-unwrapped.lib + gdk-pixbuf + glib + harfbuzz + icu + libcap + libdrm + liberation_ttf + libexif + libglvnd + libkrb5 + libpng + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + libxkbcommon + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libxshmfence + xorg.libXtst + mesa + nspr + nss + opusWithCustomModes + pango + pciutils + pipewire + snappy + speechd + systemd + util-linux + wayland + wget + libpulseaudio + libva + gtk3 + gtk4 + libgcc + qt5.full + qt6.full + qt6.qtbase + libGL + ]; + + # dontConfigure = true; + # dontBuild = true; + + installPhase= '' + runHook preInstall + + appname=thorium + + mkdir -p $out/bin + mkdir -p $out/share + cp -R usr/bin $out/ + cp -R usr/share $out/ + cp -R opt $out/ + substituteInPlace $out/share/applications/thorium-browser.desktop --replace /usr/bin/ $out/bin/ + substituteInPlace $out/share/applications/thorium-shell.desktop --replace /usr/bin/ $out/bin/ + substituteInPlace $out/share/applications/thorium-shell.desktop --replace /opt/ $out/opt/ + substituteInPlace $out/bin/thorium-shell --replace /opt/ $out/opt/ + + ln -fs ${pkgs.widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/chromium.org/thorium/WidevineCdm + + patchelf $out/opt/chromium.org/thorium/thorium --add-needed libGL.so.1 + for exe in $out/opt/chromium.org/thorium/{thorium,chrome_crashpad_handler}; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" $exe + done + + ln -fs $out/opt/chromium.org/thorium/thorium-browser $out/bin/thorium-browser + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://thorium.rocks"; + description = "Web Browser"; + platforms = platforms.linux; + license = licenses.unfree; + }; +} diff --git a/mypkgs/default.nix b/mypkgs/default.nix deleted file mode 100644 index a1c66ad..0000000 --- a/mypkgs/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - thorium = import ./thorium/default.nix; -} diff --git a/mypkgs/thorium/default.nix b/mypkgs/thorium/default.nix deleted file mode 100644 index 7ac2b92..0000000 --- a/mypkgs/thorium/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -with import {}; -pkgs.stdenv.mkDerivation rec { - name = "thorium-${version}"; - version = "124.0.6367.218"; - - src = pkgs.fetchurl { - url = "https://github.com/Alex313031/thorium/releases/download/M${version}/thorium-browser_${version}_AVX2.deb"; - hash = "sha256-nXz5ocZYDBWLIaARk8lN9LhP+7p8bEx+Kk+JAT2tG5c="; - }; - sourceRoot = "."; - unpackPhase = "dpkg-deb --fsys-tarfile ${src} | tar -x --no-same-owner"; - - nativeBuildInputs = [ - pkgs.dpkg - pkgs.autoPatchelfHook - pkgs.qt5.wrapQtAppsHook - pkgs.wrapGAppsHook - ]; - - buildInputs = with pkgs; [ - glib - libgcc - qt5.full - qt6.full - qt5.qtbase - cairo - at-spi2-atk - pango - cups - libGL - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase= '' - runHook preInstall - - mkdir -p $out/bin - mkdir -p $out/share - cp -R usr/bin $out/ - cp -R usr/share $out/ - cp -R opt $out/ - substituteInPlace $out/share/applications/thorium-browser.desktop --replace /usr/bin/ $out/bin/ - substituteInPlace $out/share/applications/thorium-shell.desktop --replace /usr/bin/ $out/bin/ - substituteInPlace $out/share/applications/thorium-shell.desktop --replace /opt/ $out/opt/ - substituteInPlace $out/bin/thorium-shell --replace /opt/ $out/opt/ - - patchelf $out/opt/chromium.org/thorium/thorium --add-needed libGL.so.1 - - ln -fs $out/opt/chromium.org/thorium/thorium-browser $out/bin/thorium-browser - - runHook postInstall - ''; - - # preFixup = '' - # makeWrapperArgs+=("''${qtWrapperArgs[@]}") - # ''; - - meta = with lib; { - homepage = "https://thorium.rocks"; - description = "Web Browser"; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs-config.nix b/nixpkgs-config.nix new file mode 100644 index 0000000..680973e --- /dev/null +++ b/nixpkgs-config.nix @@ -0,0 +1,3 @@ +{ + allowUnfree = true; +}