From 0687f98f5e8f293c19ee4de018a4389d355c55b8 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Wed, 28 Aug 2024 22:35:07 -0700
Subject: hi

---
 home/ebisu/meta/network/tools/http/default.nix     |  5 ++--
 home/ebisu/meta/network/tools/http/httpie.nix      |  6 +++++
 .../meta/network/tools/http/httpie/default.nix     |  6 -----
 .../ebisu/meta/network/tools/http/yaak/default.nix | 28 ----------------------
 4 files changed, 9 insertions(+), 36 deletions(-)
 create mode 100644 home/ebisu/meta/network/tools/http/httpie.nix
 delete mode 100644 home/ebisu/meta/network/tools/http/httpie/default.nix
 delete mode 100644 home/ebisu/meta/network/tools/http/yaak/default.nix

(limited to 'home/ebisu/meta/network/tools')

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.nix b/home/ebisu/meta/network/tools/http/httpie.nix
new file mode 100644
index 0000000..b917245
--- /dev/null
+++ b/home/ebisu/meta/network/tools/http/httpie.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    httpie
+    httpie-desktop
+  ];
+}
diff --git a/home/ebisu/meta/network/tools/http/httpie/default.nix b/home/ebisu/meta/network/tools/http/httpie/default.nix
deleted file mode 100644
index b917245..0000000
--- a/home/ebisu/meta/network/tools/http/httpie/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [
-    httpie
-    httpie-desktop
-  ];
-}
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 ];
-}
-- 
cgit v1.2.3