From fc5498ef29f95fd80f8c302119d066ad89d8376b Mon Sep 17 00:00:00 2001
From: jutty <j@jutty.dev>
Date: Sun, 21 Jun 2026 18:40:15 -0300
Subject: [PATCH] Actually pass the flake build

---
 flake.nix | 111 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/flake.nix b/flake.nix
index bfac211..d8421b2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,80 +1,99 @@
+# Note this is just a draft, not properly tested or documented yet
+
 {
     description = "A non-linear writing instrument.";
-
     inputs.nixpkgs.url = "nixpkgs/nixos-26.05";
 
     outputs = { nixpkgs, self }: let
         name = "en";
-        version = "0.4.0";
+        version = "0.4.0-alpha";
 
         supportedSystems = [
             "x86_64-linux"
-            "aarch64-linux"
         ];
 
         forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-
-        nixpkgsFor = forAllSystems (system: import nixpkgs {
-            inherit system;
-        });
+        nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
 
     in {
-        packages = forAllSystems (system: let
-            pkgs = nixpkgsFor.${system};
+        packages = forAllSystems (system: let pkgs = nixpkgsFor.${system};
         in {
             default = pkgs.rustPlatform.buildRustPackage {
                 inherit name version;
                 src = ./.;
-
+                nativeBuildInputs = with pkgs; [
+                    just
+                ];
+                dontUseJustInstall = true;
+                dontUseJustBuild = true;
                 cargoHash =
-                    "sha256-"
-                    + "em229cShq/IShRnxlp5mgcIu7pIOf0LflV8Pw0lLUEY=";
-            };
-        });
-
-        apps = forAllSystems (system: {
-            default = {
-                type = "app";
-                program =
-                    "${self.packages.${system}.default}/bin/en";
+                    "sha256-U6jf48KmqcdCBYKyZhYPpiv5qj98SjlNqw8Ii2mJn0I=";
             };
         });
 
         devShells = forAllSystems (system:
-            let pkgs = nixpkgsFor.${system}; in {
-                default = pkgs.mkShell {
-                    buildInputs = with pkgs; [
-                        rustup
-                        just
-                        watchexec
-                        cargo-deny
-                        cargo-llvm-cov
-                        cargo-mutants
-                        go-tools
-                        typos
-                        taplo
+            let
+                pkgs = nixpkgsFor.${system};
+                base = with pkgs; [
+                    rustup
+                    just
+                    watchexec
+                    cargo-deny
+                    cargo-llvm-cov
+                    cargo-mutants
+                    cargo-msrv
+                    typos
+                    taplo
+                ];
+            in {
+                default = pkgs.mkShell { buildInputs = base; };
+                cross = pkgs.mkShell {
+                    buildInputs = with pkgs; base ++ [
+                        cargo-xwin
+                        wine
                     ];
                 };
             }
         );
 
-
-        nixosModules.bot = { config, lib, system, ... }: {
-            options.within.services.en.enable =
-                lib.mkEnableOption "enable en server";
-
-            config = lib.mkIf config.within.services.en.enable {
-                systemd.services.en = {
-                    wantedBy = [ "multi-user.target" ];
-                    serviceConfig = {
-                        Restart = "always";
-                        ExecStart =
-                            "${self.packages."${system}".default}/bin/en";
+        nixosModules.en = { config, lib, system, ... }:
+            {
+                options.within.services.en = {
+                    enable = lib.mkEnableOption "enable en server";
+                    port = lib.mkOption {
+                        description = "Port to serve your graph on";
+                        defaultText = "A random port chosen by the OS";
+                        type = lib.types.port;
+                    };
+                    host = lib.mkOption {
+                        description = "Address or hostname to serve your graph on";
+                        default = "0.0.0.0";
+                        type = lib.types.str;
+                    };
+                    graph = lib.mkOption {
+                        description = "File path pointing to your graph file";
+                        default = "./static/graph.toml";
+                        type = lib.types.path;
                     };
                 };
-            };
-        };
 
+                config =
+                    lib.mkIf config.within.services.en.enable {
+                        systemd.services.en = {
+                            wantedBy = [ "multi-user.target" ];
+                            serviceConfig = {
+                                Restart = "always";
+                                ExecStart = let
+                                        user_opts = config.within.services.en;
+                                    in
+                                    "${self.packages.${system}.default}/bin/en"
+                                    + " --port ${user_opts.port}"
+                                    + " --host ${user_opts.host}"
+                                    + " --graph ${user_opts.graph}";
+                            };
+                        };
+                    };
+            };
 
     };
 }