From 8deaee52e8223ddc6852bfd0ff94d167ba5114d7 Mon Sep 17 00:00:00 2001
From: comfysage <67917529+comfysage@users.noreply.github.com>
Date: Tue, 3 Dec 2024 12:38:31 +0000
Subject: [PATCH] feat(comfy): add ivy

---
 flake.lock                  | 27 +++++++++++++++++++++++++++
 flake.nix                   | 12 ++++++++++++
 systems/cottage/default.nix |  3 +++
 systems/wisp/default.nix    |  3 +++
 4 files changed, 45 insertions(+)

diff --git a/flake.lock b/flake.lock
index b2aa2fbb6..68ee7ab3b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -398,6 +398,32 @@
         "type": "github"
       }
     },
+    "ivy": {
+      "inputs": {
+        "beapkgs": [
+          "beapkgs"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733229146,
+        "narHash": "sha256-hAdiRXQxlfCa7bwpdNKl5VqWb3odNhP4GWYjiVmjwlQ=",
+        "owner": "comfysage",
+        "repo": "ivy",
+        "rev": "ac35da98c2489fec81aeea95d7b28864b785ae3d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "comfysage",
+        "repo": "ivy",
+        "type": "github"
+      }
+    },
     "izvim": {
       "inputs": {
         "beapkgs": [
@@ -604,6 +630,7 @@
         "git-hooks": "git-hooks",
         "home-manager": "home-manager",
         "homebrew": "homebrew",
+        "ivy": "ivy",
         "izvim": "izvim",
         "lanzaboote": "lanzaboote",
         "lix": "lix",
diff --git a/flake.nix b/flake.nix
index c62882368..edfd7426c 100755
--- a/flake.nix
+++ b/flake.nix
@@ -261,6 +261,18 @@
       };
     };
 
+    ivy = {
+      type = "github";
+      owner = "comfysage";
+      repo = "ivy";
+
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        systems.follows = "systems";
+        beapkgs.follows = "beapkgs";
+      };
+    };
+
     # exists for ".follows"
     flake-utils = {
       type = "github";
diff --git a/systems/cottage/default.nix b/systems/cottage/default.nix
index e4b5b1311..355f51562 100644
--- a/systems/cottage/default.nix
+++ b/systems/cottage/default.nix
@@ -1,3 +1,4 @@
+{ inputs', ... }:
 {
   imports = [ ./hardware.nix ];
 
@@ -86,6 +87,8 @@
       zathura.enable = true;
       rofi.enable = true;
       fish.enable = true;
+
+      neovim.package = inputs'.ivy.packages.default;
     };
   };
 }
diff --git a/systems/wisp/default.nix b/systems/wisp/default.nix
index 8060c34ab..3ac489997 100644
--- a/systems/wisp/default.nix
+++ b/systems/wisp/default.nix
@@ -1,3 +1,4 @@
+{ inputs', ... }:
 {
   garden = {
     device = {
@@ -69,6 +70,8 @@
       gui.enable = false;
 
       fish.enable = true;
+
+      neovim.package = inputs'.ivy.packages.default;
     };
   };
 }