From 197df696beeb67dd24b894f8aaf6bb87d53f7dd9 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 7 Jun 2024 22:52:07 +0000
Subject: [PATCH] uninsane-dot-org: acquire by fetchFromGitea instead of flake

---
 flake.lock                                   | 23 +-------------------
 flake.nix                                    | 20 ++---------------
 pkgs/additional/uninsane-dot-org/default.nix | 12 ++++++++++
 pkgs/default.nix                             |  1 +
 4 files changed, 16 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/additional/uninsane-dot-org/default.nix

diff --git a/flake.lock b/flake.lock
index a5861a2c..febf8b40 100644
--- a/flake.lock
+++ b/flake.lock
@@ -52,28 +52,7 @@
       "inputs": {
         "nixpkgs-next-unpatched": "nixpkgs-next-unpatched",
         "nixpkgs-staging-unpatched": "nixpkgs-staging-unpatched",
-        "nixpkgs-unpatched": "nixpkgs-unpatched",
-        "uninsane-dot-org": "uninsane-dot-org"
-      }
-    },
-    "uninsane-dot-org": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-unpatched"
-        ]
-      },
-      "locked": {
-        "lastModified": 1715894399,
-        "narHash": "sha256-h1EdA/h74zgNPNEYbH+0mgOMlJgLVcxuZ8/ewsZlgEc=",
-        "ref": "refs/heads/master",
-        "rev": "e6f88f563bdd1700c04018951de4f69862646dd1",
-        "revCount": 240,
-        "type": "git",
-        "url": "https://git.uninsane.org/colin/uninsane"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.uninsane.org/colin/uninsane"
+        "nixpkgs-unpatched": "nixpkgs-unpatched"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index fb98cd48..bf8abbe0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,13 +47,6 @@
     nixpkgs-staging-unpatched.url = "github:nixos/nixpkgs?ref=staging";
     # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-staging-next";
     nixpkgs-next-unpatched.url = "github:nixos/nixpkgs?ref=staging-next";
-
-    uninsane-dot-org = {
-      # provides the package to deploy <https://uninsane.org>, used only when building the servo host
-      url = "git+https://git.uninsane.org/colin/uninsane";
-      # inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs.follows = "nixpkgs-unpatched";
-    };
   };
 
   outputs = {
@@ -61,7 +54,6 @@
     nixpkgs-unpatched,
     nixpkgs-next-unpatched ? nixpkgs-unpatched,
     nixpkgs-staging-unpatched ? nixpkgs-unpatched,
-    uninsane-dot-org,
     ...
   }@inputs:
     let
@@ -131,7 +123,6 @@
           self.nixosModules.passthru
           {
             nixpkgs.overlays = [
-              self.overlays.passthru
               self.overlays.sane-all
             ];
           }
@@ -199,7 +190,6 @@
         sane-all = final: prev: import ./overlays/all.nix final prev;
         pkgs = final: prev: import ./overlays/pkgs.nix final prev;
         preferences = final: prev: import ./overlays/preferences.nix final prev;
-        passthru = uninsane-dot-org.overlays.default;
       };
 
       nixosModules = rec {
@@ -220,7 +210,6 @@
             (nixpkgsCompiledBy { inherit system variant; })
             .appendOverlays (
               [
-                self.overlays.passthru
                 self.overlays.pkgs
               ] ++ additionalOverlays
             );
@@ -250,17 +239,12 @@
             && (passthruPkgs.lib.meta.availableOn passthruPkgs.stdenv.hostPlatform pkg)
           )
           (
-            # expose sane packages and chosen inputs (uninsane.org)
-            (import ./pkgs { pkgs = passthruPkgs; }) // {
-              inherit (passthruPkgs) uninsane-dot-org;
-            }
+            import ./pkgs { pkgs = passthruPkgs; }
           )
         )
         # self.legacyPackages;
         {
-          x86_64-linux = (nixpkgsCompiledBy { system = "x86_64-linux"; }).appendOverlays [
-            self.overlays.passthru
-          ];
+          x86_64-linux = nixpkgsCompiledBy { system = "x86_64-linux"; };
         }
       ;
 
diff --git a/pkgs/additional/uninsane-dot-org/default.nix b/pkgs/additional/uninsane-dot-org/default.nix
new file mode 100644
index 00000000..079fc5a3
--- /dev/null
+++ b/pkgs/additional/uninsane-dot-org/default.nix
@@ -0,0 +1,12 @@
+{ callPackage
+, fetchFromGitea
+}:
+let
+  src = fetchFromGitea {
+    domain = "git.uninsane.org";
+    owner = "colin";
+    repo = "uninsane";
+    rev = "e6f88f563bdd1700c04018951de4f69862646dd1";
+    hash = "sha256-h1EdA/h74zgNPNEYbH+0mgOMlJgLVcxuZ8/ewsZlgEc=";
+  };
+in callPackage "${src}/default.nix" { }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index c9aa90b3..613fa1f2 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -93,6 +93,7 @@ let
     tree-sitter-nix-shell = callPackage ./additional/tree-sitter-nix-shell { };
     trivial-builders = lib.recurseIntoAttrs (callPackage ./additional/trivial-builders { });
     uassets = callPackage ./additional/uassets { };
+    uninsane-dot-org = callPackage ./additional/uninsane-dot-org { };
     wvkbd-mk = callPackage ./additional/wvkbd-mk { };
     inherit (trivial-builders)
       copyIntoOwnPackage