From 4f387146f58fee9fd7aafabdb378019ea1786bd8 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Wed, 22 Mar 2023 20:11:12 +0100
Subject: package typst

---
 flake.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 5ccd370..8aaa8ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,11 @@
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
     emacs-overlay.url = "gitlab:nix-community/emacs-overlay?rev=d938b780a3d8072aeac0178c46121060079ff217";
 
+    crane.url = "github:ipetkov/crane";
+    crane.inputs.nixpkgs.follows = "nixpkgs";
+    rust-overlay.url = "github:oxalica/rust-overlay";
+    rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
+
     uplcg.url = "git+https://stuebinm.eu/git/uplcg?ref=main";
     uplcg.flake = false;
     tracktrain.url = "git+https://stuebinm.eu/git/tracktrain?ref=main";
@@ -38,16 +43,17 @@
     gtfsBooks.flake = false;
     walint.url = "git+https://stuebinm.eu/git/walint?ref=playground";
     walint.flake = false;
-
-    freiraum.url = "git+https://git.infra4future.de/stuebinm/22f3-roomplans?ref=network";
-    freiraum.flake = false;
   };
 
   outputs = { self, deploy-rs, ... }@inputs:
   let
     nixpkgs = import inputs.nixpkgs {
       system = "x86_64-linux";
-      overlays = [ self.overlays.default ];
+      overlays = [
+        inputs.rust-overlay.overlays.default
+        inputs.crane.overlays.default
+        self.overlays.default
+      ];
     };
     mkConfig = imports: config:
     inputs.nixpkgs.lib.nixosSystem rec {
@@ -111,9 +117,9 @@
     home-minimal = self.homeConfigurations.stuebinm-minimal.activationPackage;
 
     overlays.default = final: prev:
-      import ./pkgs/overlay.nix final prev;
+      import ./pkgs/overlay.nix { inherit inputs; } final prev;
     packages.x86_64-linux = {
-      inherit (nixpkgs) galmon-core galmon-full glitchtip;
+      inherit (nixpkgs) galmon-core galmon-full glitchtip typst;
     };
   };
 }
-- 
cgit v1.2.3