From 4f9b51a94b9141fdf1a9c7d4d3118632225516ad Mon Sep 17 00:00:00 2001
From: Jaculabilis <jaculabilis@git.alogoulogoi.com>
Date: Tue, 20 Jun 2023 04:35:11 +0000
Subject: [PATCH] Add intake to empyrean

---
 flake.lock | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 flake.nix  | 25 ++++++++++++++++++++----
 2 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0140736..51b89fa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
         "type": "github"
       },
       "original": {
@@ -31,9 +31,56 @@
         "type": "github"
       }
     },
+    "intake": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "nixos-shell": "nixos-shell",
+        "nixpkgs": [
+          "nixpkgs-next"
+        ]
+      },
+      "locked": {
+        "lastModified": 1687221640,
+        "narHash": "sha256-JzREQQZPT+sEb7sHafJ4gXgyCImcZPhGBWhKwW0dgg0=",
+        "ref": "refs/heads/master",
+        "rev": "760781d6d95eb78b3ecf1256e4fa860848d5decb",
+        "revCount": 60,
+        "type": "git",
+        "url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git"
+      }
+    },
+    "nixos-shell": {
+      "inputs": {
+        "nixpkgs": [
+          "intake",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1686216465,
+        "narHash": "sha256-0A4K6xVIyxUi2YZu4+156WwzAO1GDWGcKiMvsXpBQDQ=",
+        "owner": "Mic92",
+        "repo": "nixos-shell",
+        "rev": "65489e7eeef8eeea43e1e4218ad1b99d58852c7c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "nixos-shell",
+        "type": "github"
+      }
+    },
     "nixos-wsl": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": [
+          "flake-compat"
+        ],
         "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
@@ -87,6 +134,8 @@
     },
     "root": {
       "inputs": {
+        "flake-compat": "flake-compat",
+        "intake": "intake",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs",
         "nixpkgs-next": "nixpkgs-next"
diff --git a/flake.nix b/flake.nix
index 90f7aaf..8d27ba2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,15 +2,29 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/22.11";
     nixpkgs-next.url = "github:NixOS/nixpkgs/23.05";
-    nixos-wsl.url = "github:nix-community/NixOS-WSL";
-    nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+      flake = false;
+    };
+    nixos-wsl = {
+      url = "github:nix-community/NixOS-WSL";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-compat.follows = "flake-compat";
+    };
+    intake = {
+      url = "git+ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git";
+      inputs.nixpkgs.follows = "nixpkgs-next";
+      inputs.flake-compat.follows = "flake-compat";
+    };
   };
 
   outputs = {
     self,
     nixpkgs,
     nixpkgs-next,
-    nixos-wsl
+    flake-compat,
+    nixos-wsl,
+    intake,
   }: {
     nixosConfigurations = {
       catacomb = nixpkgs.lib.nixosSystem {
@@ -19,7 +33,10 @@
       };
       empyrean = nixpkgs-next.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [ ./machine/empyrean ];
+        modules = [
+          intake.nixosModules.intake
+          ./machine/empyrean
+        ];
       };
       stagirite = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";