From e858afea728c3c42cd4f24d64d4832e0ee4cc39d Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Tue, 11 Oct 2022 03:22:40 -0700
Subject: [PATCH] add uninsane.org sources as a flake input

one can build the site from here with:

```
nix build '.#uninsane.uninsane-dot-org'
```
---
 flake.lock | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
 flake.nix  | 24 +++++++++++++++++++++---
 2 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index b3583b66..b4bfcde3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1656169755,
-        "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
+        "lastModified": 1665475263,
+        "narHash": "sha256-T4at7d+KsQNWh5rfjvOtQCaIMWjSDlSgQZKvxb+LcEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
+        "rev": "17208be516fc36e2ab0ceb064d931e90eb88b2a3",
         "type": "github"
       },
       "original": {
@@ -85,11 +100,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1665132027,
-        "narHash": "sha256-zoHPqSQSENt96zTk6Mt1AP+dMNqQDshXKQ4I6MfjP80=",
+        "lastModified": 1665328694,
+        "narHash": "sha256-hVj8yEs5PAbR3cPPpmOtJYxZ8P+hD7RZTMSV9U0QYPA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9ecc270f02b09b2f6a76b98488554dd842797357",
+        "rev": "9282141c8bc05568ec0e342eac39df72603aa9fa",
         "type": "github"
       },
       "original": {
@@ -105,7 +120,8 @@
         "mobile-nixos": "mobile-nixos",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "uninsane": "uninsane"
       }
     },
     "sops-nix": {
@@ -128,6 +144,27 @@
         "repo": "sops-nix",
         "type": "github"
       }
+    },
+    "uninsane": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1665482600,
+        "narHash": "sha256-1Glmamug0vpQMGEqogvzjjtc1fI9dRZCeuClgmaCQ9U=",
+        "ref": "refs/heads/master",
+        "rev": "7b526e62f2d5ec15313b1e025beb8514cf4dd69b",
+        "revCount": 152,
+        "type": "git",
+        "url": "https://git.uninsane.org/colin/uninsane"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.uninsane.org/colin/uninsane"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index e435eaf1..54d488ae 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,9 +19,13 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     impermanence.url = "github:nix-community/impermanence";
+    uninsane = {
+      url = "git+https://git.uninsane.org/colin/uninsane";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-stable, mobile-nixos, home-manager, sops-nix, impermanence }:
+  outputs = { self, nixpkgs, nixpkgs-stable, mobile-nixos, home-manager, sops-nix, impermanence, uninsane }:
   let
     patchedPkgs = system: nixpkgs.legacyPackages.${system}.applyPatches {
       name = "nixpkgs-patched-uninsane";
@@ -51,6 +55,7 @@
           nixpkgs.config.allowUnfree = true;
           nixpkgs.overlays = [
             (import "${mobile-nixos}/overlay/overlay.nix")
+            uninsane.overlay
             (import ./pkgs/overlay.nix)
             (next: prev: rec {
               # non-emulated packages build *from* local *for* target.
@@ -96,8 +101,21 @@
   in {
     nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfiguration) machines;
     imgs = builtins.mapAttrs (name: value: value.img) machines;
-    packages.x86_64-linux = customPackagesFor "x86_64-linux" "x86_64-linux";
-    packages.aarch64-linux = customPackagesFor "aarch64-linux" "aarch64-linux";
+    packages = let
+      custom-x86_64 = customPackagesFor "x86_64-linux" "x86_64-linux";
+      custom-aarch64 = customPackagesFor "aarch64-linux" "aarch64-linux";
+      nixpkgs-x86_64 = nixpkgsFor "x86_64-linux" "x86_64-linux";
+      nixpkgs-aarch64 = nixpkgsFor "aarch64-linux" "aarch64-linux";
+    in {
+      x86_64-linux = custom-x86_64 // {
+        nixpkgs = nixpkgs-x86_64;
+        uninsane = uninsane.packages.x86_64-linux;
+      };
+      aarch64-linux = custom-aarch64 // {
+        nixpkgs = nixpkgs-aarch64;
+        uninsane = uninsane.packages.aarch64-linux;
+      };
+    };
   };
 }