diff options
15 files changed, 109 insertions, 124 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/image/default.nix b/home/ebisu/meta/multimedia/image/default.nix index 5ff22b8..ddebfeb 100644 --- a/home/ebisu/meta/multimedia/image/default.nix +++ b/home/ebisu/meta/multimedia/image/default.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { home.packages = with pkgs; [ - (pkgs.callPackage ./ahoviewer.nix { }) + (pkgs.callPackage ../../../../../pkgs/ahoviewer.nix { }) emulsion feh imv diff --git a/home/ebisu/meta/network/smolnet/bollux.nix b/home/ebisu/meta/network/smolnet/bollux.nix new file mode 100644 index 0000000..4e2b05d --- /dev/null +++ b/home/ebisu/meta/network/smolnet/bollux.nix @@ -0,0 +1,6 @@ +{ pkgs, config, ... }: +{ + home.packages = with pkgs; [ (pkgs.callPackage ../../../../../pkgs/bollux { }) ]; + + xdg.configFile."bollux/bollux.conf".text = ''''; +} diff --git a/home/ebisu/meta/network/smolnet/bollux/default.nix b/home/ebisu/meta/network/smolnet/bollux/default.nix deleted file mode 100644 index 4d26eee..0000000 --- a/home/ebisu/meta/network/smolnet/bollux/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ pkgs, lib, ... }: -let - bollux = - pkgs.stdenvNoCC.mkDerivation rec { - pname = "bollux"; - version = "0.4.1"; - - nativeBuildInputs = [ - pkgs.makeWrapper - ]; - - buildInputs = [ - pkgs.bashInteractive - ]; - - dontBuild = true; - - makeFlags = [ - "PREFIX=$(out)" - ]; - - src = pkgs.fetchFromGitea { - domain = "tildegit.org"; - owner = "acdw"; - repo = "bollux"; - rev = "f472e60f1164f0dc025d06db2a13ff4e8ebee1a2"; - hash = "sha256-mo2qWCPfW+dUaYcJLsos/vR5nJ8n1eABy8Zy8OZsfVg="; - }; - - patches = [ - # https://tildegit.org/acdw/bollux/issues/13#issuecomment-9786 - ./fix_lesskey_nag.patch - ]; - - postInstall = '' - wrapProgram $out/bin/bollux --prefix PATH : ${lib.makeBinPath [ - pkgs.bashInteractive - pkgs.iconv - pkgs.openssl - pkgs.less - pkgs.coreutils - ]} - ''; - - meta = with lib; { - description = "a Gemini browser in like, idk, 96% pure Bash"; - homepage = "https://tildegit.org/acdw/bollux"; - license = licenses.mit; - platforms = platforms.all; - mainProgram = "bollux"; - }; - }; -in -{ - home.packages = [ - # I'll update this later and move the above derivation to its own package - # once I push my entire NixOS system configuration. - # (pkgs.callPackage /path/to/pkgs/bollux.nix { - # src = bollux; - # }) - bollux - ]; - - xdg.configFile."bollux/bollux.conf".text = ''''; -} diff --git a/home/ebisu/meta/network/smolnet/default.nix b/home/ebisu/meta/network/smolnet/default.nix index 93003c1..7fee28f 100644 --- a/home/ebisu/meta/network/smolnet/default.nix +++ b/home/ebisu/meta/network/smolnet/default.nix @@ -1,6 +1,6 @@ { pkgs, config, ... }: { - imports = [ ./bollux ]; + imports = [ ./bollux.nix ]; home.packages = with pkgs; [ amfora diff --git a/home/ebisu/meta/network/tools/http/default.nix b/home/ebisu/meta/network/tools/http/default.nix index 59d6efc..b47540f 100644 --- a/home/ebisu/meta/network/tools/http/default.nix +++ b/home/ebisu/meta/network/tools/http/default.nix @@ -1,8 +1,9 @@ { pkgs, ... }: { imports = [ - ./httpie - ./yaak + ./httpie.nix ./wget.nix ]; + + home.packages = [ (pkgs.callPackage ../../../../../../pkgs/yaak.nix { }) ]; } diff --git a/home/ebisu/meta/network/tools/http/httpie/default.nix b/home/ebisu/meta/network/tools/http/httpie.nix index b917245..b917245 100644 --- a/home/ebisu/meta/network/tools/http/httpie/default.nix +++ b/home/ebisu/meta/network/tools/http/httpie.nix diff --git a/home/ebisu/meta/network/tools/http/yaak/default.nix b/home/ebisu/meta/network/tools/http/yaak/default.nix deleted file mode 100644 index 05bf0e7..0000000 --- a/home/ebisu/meta/network/tools/http/yaak/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, lib, ... }: -let - yaak-archive = pkgs.fetchzip { - url = "https://releases.yaak.app/releases/2024.6.6/yaak_2024.6.6_amd64.AppImage.tar.gz"; - hash = "sha256-Qnc4RlQmQWHARreQ69jAshq57bZ56Yt5a35jpTjGwNU="; - }; - - version = "2024.6.6"; - - # https://discourse.nixos.org/t/creating-a-nix-derivation-for-an-appimage/31927 - yaak = pkgs.appimageTools.wrapType2 { - pname = "yaak"; - version = version; - src = "${yaak-archive}/yaak_${version}_amd64.AppImage"; - - meta = with lib; { - description = "Play with APIs, intuitively"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - homepage = "https://yaak.app/"; - license = licenses.unfree; - platforms = platforms.linux; - mainProgram = "yaak"; - }; - }; -in -{ - home.packages = [ yaak ]; -} diff --git a/home/ebisu/meta/multimedia/image/ahoviewer.nix b/pkgs/ahoviewer.nix index 38524dc..38524dc 100644 --- a/home/ebisu/meta/multimedia/image/ahoviewer.nix +++ b/pkgs/ahoviewer.nix diff --git a/pkgs/bollux/default.nix b/pkgs/bollux/default.nix new file mode 100644 index 0000000..0922592 --- /dev/null +++ b/pkgs/bollux/default.nix @@ -0,0 +1,42 @@ +{ pkgs, lib, ... }: +pkgs.stdenvNoCC.mkDerivation rec { + pname = "bollux"; + version = "0.4.1"; + nativeBuildInputs = [ pkgs.makeWrapper ]; + buildInputs = [ pkgs.bashInteractive ]; + dontBuild = true; + makeFlags = [ "PREFIX=$(out)" ]; + + src = pkgs.fetchFromGitea { + domain = "tildegit.org"; + owner = "acdw"; + repo = "bollux"; + rev = "f472e60f1164f0dc025d06db2a13ff4e8ebee1a2"; + hash = "sha256-mo2qWCPfW+dUaYcJLsos/vR5nJ8n1eABy8Zy8OZsfVg="; + }; + + patches = [ + # https://tildegit.org/acdw/bollux/issues/13#issuecomment-9786 + ./fix_lesskey_nag.patch + ]; + + postInstall = '' + wrapProgram $out/bin/bollux --prefix PATH : ${ + lib.makeBinPath [ + pkgs.bashInteractive + pkgs.iconv + pkgs.openssl + pkgs.less + pkgs.coreutils + ] + } + ''; + + meta = with lib; { + description = "a Gemini browser in like, idk, 96% pure Bash"; + homepage = "https://tildegit.org/acdw/bollux"; + license = licenses.mit; + platforms = platforms.all; + mainProgram = "bollux"; + }; +} diff --git a/home/ebisu/meta/network/smolnet/bollux/fix_lesskey_nag.patch b/pkgs/bollux/fix_lesskey_nag.patch index 329b886..329b886 100644 --- a/home/ebisu/meta/network/smolnet/bollux/fix_lesskey_nag.patch +++ b/pkgs/bollux/fix_lesskey_nag.patch diff --git a/pkgs/thorium.nix b/pkgs/thorium.nix new file mode 100644 index 0000000..23ae485 --- /dev/null +++ b/pkgs/thorium.nix @@ -0,0 +1,25 @@ +{ pkgs, lib, ... }: +let + thorium-version = "126.0.6478.246"; + thorium-release = "${thorium-version}_Th24_SSE4"; + + thorium-archive = pkgs.fetchurl { + url = "https://github.com/Alex313031/thorium/releases/download/M${thorium-version}/Thorium_Browser_${thorium-release}.AppImage"; + hash = "sha256-izYbx/mSA+l7fAh917SauHopk3UlUJo+7NjkyIGpnNA="; + }; +in +# https://discourse.nixos.org/t/creating-a-nix-derivation-for-an-appimage/31927 +pkgs.appimageTools.wrapType2 { + pname = "thorium"; + version = thorium-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"; + }; +} diff --git a/pkgs/yaak.nix b/pkgs/yaak.nix new file mode 100644 index 0000000..5331462 --- /dev/null +++ b/pkgs/yaak.nix @@ -0,0 +1,28 @@ +{ + pkgs ? import <nixpkgs> { }, + lib, + ... +}: +let + yaak-version = "2024.6.6"; + + yaak-archive = pkgs.fetchzip { + url = "https://releases.yaak.app/releases/${yaak-version}/yaak_${yaak-version}_amd64.AppImage.tar.gz"; + hash = "sha256-Qnc4RlQmQWHARreQ69jAshq57bZ56Yt5a35jpTjGwNU="; + }; +in +# https://discourse.nixos.org/t/creating-a-nix-derivation-for-an-appimage/31927 +pkgs.appimageTools.wrapType2 rec { + pname = "yaak"; + version = yaak-version; + src = "${yaak-archive}/yaak_${yaak-version}_amd64.AppImage"; + + meta = with lib; { + description = "Play with APIs, intuitively"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + homepage = "https://yaak.app/"; + license = licenses.unfree; + platforms = platforms.linux; + mainProgram = "yaak"; + }; +} diff --git a/home/ebisu/meta/multimedia/browser/zen-browser-bin.nix b/pkgs/zen-browser-bin.nix index 51a95db..51a95db 100644 --- a/home/ebisu/meta/multimedia/browser/zen-browser-bin.nix +++ b/pkgs/zen-browser-bin.nix |