From b71c72d7353c0ba15913836e182589655691d50d Mon Sep 17 00:00:00 2001
From: Syed Daanish <me@syedm.dev>
Date: Sun, 26 Jul 2026 06:57:47 +0100
Subject: [PATCH] Cleanup flake.nix

---
 flake.nix | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index 804ed92..8f8943c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,24 +11,19 @@
       mruby = pkgs.stdenv.mkDerivation {
         pname = "mruby";
         version = "0.0.1";
-
         src = pkgs.lib.cleanSourceWith {
           src = ./libs;
           name = "mruby-src";
         };
-
         patches = [ ./libs/changes.patch ];
-
         nativeBuildInputs = with pkgs; [
           ruby
           gnumake
           gcc
         ];
-
         buildPhase = ''
           (cd mruby && rake)
         '';
-
         installPhase = ''
           mkdir -p $out
           cp -r mruby/build/host/lib $out/
@@ -38,15 +33,12 @@
       kutu = pkgs.stdenv.mkDerivation {
         pname = "kutu";
         version = "0.1.0";
-
         src = ./.;
-
         nativeBuildInputs = with pkgs; [
           dune_3
           ocaml
           ocamlPackages.findlib
         ];
-
         buildInputs = with pkgs; [
           libxcb
           xcbutilwm
@@ -54,30 +46,18 @@
           ocamlPackages.ctypes-foreign
           mruby
         ];
-
         buildPhase = ''
           export MRUBY_LIB=${mruby}/lib
           dune build src/main.exe --release
         '';
-
         installPhase = ''
           mkdir -p $out/bin
           cp _build/default/src/main.exe $out/bin/kutu
         '';
       };
 
-    in
-    {
-      packages.${system} = {
-        default = kutu;
-        kutu = kutu;
-        mruby = mruby;
-      };
-
-      apps.${system}.default = {
-        type = "app";
-        program = "${pkgs.writeShellScript "kutu-run" ''
-          set -e
+      kutu-run = pkgs.writeShellScriptBin "kutu-run" ''
+        set -e
           if [ -z "$DISPLAY" ]; then
             exec ${pkgs.xinit}/bin/startx \
               ${kutu}/bin/kutu \
@@ -97,7 +77,18 @@
             DISPLAY=$DISPLAY_NUM ${kutu}/bin/kutu
             echo "Returned: $?"
           fi
-        ''}";
+      '';
+    in
+    {
+      packages.${system} = {
+        default = kutu;
+        kutu = kutu;
+        mruby = mruby;
+      };
+
+      apps.${system}.default = {
+        type = "app";
+        program = "${kutu-run}/bin/kutu-run";
       };
 
       devShells.${system}.default = pkgs.mkShell {