7 files changed, 10 insertions, 109 deletions
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/bollux/fix_lesskey_nag.patch b/home/ebisu/meta/network/smolnet/bollux/fix_lesskey_nag.patch
deleted file mode 100644
index 329b886..0000000
--- a/home/ebisu/meta/network/smolnet/bollux/fix_lesskey_nag.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/bollux w/bollux
-index 267418e..090217e 100755
---- i/bollux
-+++ w/bollux
-@@ -1130,7 +1130,7 @@ display() { # display METADATA [TITLE]
- 		# text, and pre-formatted text shouldn't wrap.
- 		less_cmd+=(-S)
- 		# Load the keybindings (see `lesskey').
--		mklesskey && less_cmd+=(-k "$BOLLUX_LESSKEY")
-+		mklesskey && less_cmd+=(--lesskey-src="$BOLLUX_LESSKEY")
- 		local helpline="${KEY_OPEN}:open, "
- 		helpline+="${KEY_GOTO}/"
- 		helpline+="${KEY_GOTO_FROM}:goto, "
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 ];
-}