1 files changed, 14 insertions, 76 deletions
diff --git a/flake.nix b/flake.nix
index 7fe8562..26a1621 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,7 @@
     };
   };
 
-  outputs = {
+  outputs = inputs @ {
     self,
     nixpkgs,
     crane,
@@ -22,90 +22,28 @@
       inherit system;
       overlays = [(import rust-overlay)];
     };
-    toolchain = pkgs.rust-bin.fromRustupToolchain ((builtins.fromTOML (builtins.readFile ./src/rust-toolchain.toml)).toolchain // {profile = "minimal";});
-    craneLib = crane.lib.${system}.overrideToolchain toolchain;
-    tex = pkgs.texlive.combine {
-      inherit
-        (pkgs.texlive)
-        scheme-small
-        microtype
-        sectsty
-        printlen
-        psnfss
-        helvetic
-        courier
-        biblatex
-        latex-bin
-        latexmk
-        ;
-    };
+    tex-env = pkgs.callPackage ./nix/tex-env.nix inputs;
+    racket-env = pkgs.callPackage ./nix/racket-env.nix inputs;
+    candelabra = pkgs.callPackage ./nix/candelabra.nix inputs;
   in rec {
     devShells.${system}.default = pkgs.mkShell {
       buildInputs = [
+        tex-env
+        racket-env
+
         pkgs.just # command runner
-        tex # latex environment
         pkgs.biber # bibliography backend
-
-        (pkgs.callPackage ./racket-env.nix {})
-        pkgs.z3
       ];
     };
-    packages.${system} = {
-      thesis = pkgs.stdenvNoCC.mkDerivation rec {
-        name = "thesis";
-        src = ./thesis;
-        buildInputs = [pkgs.coreutils tex pkgs.biber];
-        phases = ["unpackPhase" "buildPhase" "installPhase"];
-        buildPhase = ''
-          export PATH="${pkgs.lib.makeBinPath buildInputs}";
-          mkdir -p .cache/texmf-var
-          env TEXMFHOME=.cache TEXMFVAR=.cache/texmf-var \
-            latexmk -interaction=nonstopmode -bibtex -pdf \
-            main.tex
-        '';
-        installPhase = ''
-          mkdir -p $out
-          cp main.pdf $out/
-        '';
-      };
-
-      default = let
-        rustCrate = craneLib.buildPackage {
-          pname = "candelabra-unwrapped";
-          version = "1.0.0";
-
-          src = craneLib.cleanCargoSource (craneLib.path ./src);
-          doCheck = false;
-
-          cargoExtraArgs = "-p candelabra-cli";
-        };
-      in
-        pkgs.runCommand "candelabra" {} ''
-          . ${pkgs.makeWrapper}/nix-support/setup-hook
-          mkdir -p $out/bin
-          makeWrapper ${rustCrate}/bin/candelabra $out/bin/candelabra \
-            --set CANDELABRA_SRC_DIR ${pkgs.lib.sourceByRegex ./src [
-            ".*crates"
-            ".*racket_specs.*"
-            ".*crates/library.*"
-            ".*crates/benchmarker.*"
-          ]}
-        '';
-    };
-
-    dockerImages.${system}.default = pkgs.dockerTools.streamLayeredImage {
-      name = "candelabra";
-      maxLayers = 128;
-      contents = [
-        toolchain
-        (pkgs.callPackage ./racket-env.nix {})
-        pkgs.z3
 
-        packages.${system}.default
+    packages.${system}.default = candelabra;
 
-        pkgs.just
-        (craneLib.cleanCargoSource (craneLib.path ./src))
-      ];
+    nixosConfigurations.default = nixpkgs.lib.nixosSystem {
+      inherit system;
+      specialArgs = {
+        inherit inputs tex-env racket-env candelabra;
+      };
+      modules = [./nix/configuration.nix];
     };
   };
 }