refactor(flake): move maple and mayu to yae environment

3 files changed, 33 insertions, 82 deletions

diff --git a/flake.lock b/flake.lock
index d96e21e..8accd00 100644
--- a/flake.lock
+++ b/flake.lock
@@ -65,7 +65,6 @@
     "gitignore": {
       "inputs": {
         "nixpkgs": [
-          "mayu",
           "nixpkgs"
         ]
       },
@@ -104,60 +103,6 @@
         "type": "github"
       }
     },
-    "maple": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": [
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1727666938,
-        "narHash": "sha256-8CaILQp7/f85RbgpxhNKvHFe9qpTqpH4nQHlydzpQoo=",
-        "owner": "gemrest",
-        "repo": "maple",
-        "rev": "53eafff719d9c026cd04c62a0e31a913c66cdaf5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gemrest",
-        "repo": "maple",
-        "type": "github"
-      }
-    },
-    "mayu": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "gitignore": "gitignore",
-        "nix-gleam": "nix-gleam",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1727526176,
-        "narHash": "sha256-InhLv5wgA2ICcot3LgORLm7mxQYfyxR9PEB5aO35ov0=",
-        "owner": "Fuwn",
-        "repo": "mayu",
-        "rev": "f00ee62bdf66f482c803b2679bbd04dad1bfd1a3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Fuwn",
-        "repo": "mayu",
-        "type": "github"
-      }
-    },
     "nix-gleam": {
       "locked": {
         "lastModified": 1717670865,
@@ -234,8 +179,8 @@
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "gigi": "gigi",
-        "maple": "maple",
-        "mayu": "mayu",
+        "gitignore": "gitignore",
+        "nix-gleam": "nix-gleam",
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems"
diff --git a/flake.nix b/flake.nix
index 7c92b01..261c6f0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,8 +13,8 @@
     {
       flake-utils,
       gigi,
-      maple,
-      mayu,
+      gitignore,
+      nix-gleam,
       nixpkgs,
       pre-commit-hooks,
       self,
@@ -54,6 +54,8 @@
           ((import "${archive}/flake.nix").outputs {
             inherit
               flake-utils
+              gitignore
+              nix-gleam
               nixpkgs
               pre-commit-hooks
               ;
@@ -74,8 +76,8 @@
           code-stats-ls = pkgs.callPackage ./pkgs/code-stats-ls.nix { };
           gigi = gigi.packages.${system}.default;
           git-sumi = pkgs.callPackage ./pkgs/git-sumi.nix { };
-          maple = maple.packages.${system}.default;
-          mayu = mayu.packages.${system}.default;
+          maple = yaePackage "maple";
+          mayu = yaePackage "mayu";
           html2md = pkgs.callPackage ./pkgs/html2md.nix { };
           lilipod = pkgs.callPackage ./pkgs/lilipod.nix { };
           private-internet-access = pkgs.callPackage ./pkgs/private-internet-access.nix { };
@@ -118,6 +120,7 @@
     );
 
   inputs = {
+    nix-gleam.url = "github:arnarg/nix-gleam";
     nixpkgs.url = "github:NixOS/nixpkgs";
     systems.url = "github:nix-systems/default";
 
@@ -131,15 +134,6 @@
       inputs.systems.follows = "systems";
     };
 
-    pre-commit-hooks = {
-      url = "github:cachix/git-hooks.nix";
-
-      inputs = {
-        flake-compat.follows = "flake-compat";
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
-
     gigi = {
       url = "github:Fuwn/gigi";
 
@@ -150,22 +144,16 @@
       };
     };
 
-    maple = {
-      url = "github:gemrest/maple";
-
-      inputs = {
-        flake-compat.follows = "flake-compat";
-        flake-utils.follows = "flake-utils";
-        nixpkgs.follows = "nixpkgs";
-        systems.follows = "systems";
-      };
+    gitignore = {
+      url = "github:hercules-ci/gitignore.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    mayu = {
-      url = "github:Fuwn/mayu";
+    pre-commit-hooks = {
+      url = "github:cachix/git-hooks.nix";
 
       inputs = {
-        flake-utils.follows = "flake-utils";
+        flake-compat.follows = "flake-compat";
         nixpkgs.follows = "nixpkgs";
       };
     };
diff --git a/yae.json b/yae.json
index 5a9480e..6522a19 100644
--- a/yae.json
+++ b/yae.json
@@ -1,4 +1,22 @@
 {
+  "maple": {
+    "url": "https://github.com/gemrest/maple/archive/main.tar.gz",
+    "sha256": "12j2x7fckr81kpw93ajkmbv5wwdw989wcadq8lwzzzbv18nqh9ph",
+    "unpack": true,
+    "type": "git",
+    "version": "main",
+    "url_template": "https://github.com/gemrest/maple/archive/{version}.tar.gz",
+    "force": true
+  },
+  "mayu": {
+    "url": "https://github.com/Fuwn/mayu/archive/main.tar.gz",
+    "sha256": "0zzd2x1c1dgqbqczvlgsccgnaclfnsllwsfbzxskz7xf2qzyy6ra",
+    "unpack": true,
+    "type": "git",
+    "version": "main",
+    "url_template": "https://github.com/Fuwn/mayu/archive/{version}.tar.gz",
+    "force": true
+  },
   "rui": {
     "url": "https://github.com/Fuwn/rui/archive/main.tar.gz",
     "sha256": "1x4mznk1wjhgcaxk7yl3d9iim896gpcj6h8phnc2z4nz3wrsbj4m",