feat: simplify nix flake

Author: pranc1ngpegasus

Cargo.toml

@@ -12,7 +12,10 @@ resolver = "3"
 exclude = ["vendor/wasapi"]
 
 [workspace.dependencies]
-chrono = { version = "0.4.45", default-features = false, features = ["clock", "std"] }
+chrono = { version = "0.4.45", default-features = false, features = [
+  "clock",
+  "std",
+] }
 crossbeam-channel = "0.5.15"
 gpui = "0.2.2"
 rusqlite = { version = "0.40.0", features = ["bundled", "chrono"] }
@@ -41,8 +44,8 @@ pedantic = { level = "deny", priority = -1 }
 # names). Kept at `warn` because two of its lints are environmental rather
 # than code issues and are opted out below.
 cargo = { level = "warn", priority = -1 }
-cargo_common_metadata = "allow"   # every crate is `publish = false`
-multiple_crate_versions = "allow" # decided by the lockfile, not our code
+cargo_common_metadata = "allow"           # every crate is `publish = false`
+multiple_crate_versions = "allow"         # decided by the lockfile, not our code
 
 # Restriction lints promoted to hard errors. Test code is exempted from the
 # panicking ones via .clippy.toml (allow-{unwrap,expect,panic}-in-tests).

apps/wisp-desktop/Cargo.toml

@@ -1,5 +1,6 @@
 [package]
 name = "wisp-desktop"
+description = ""
 edition.workspace = true
 version.workspace = true
 publish = false

apps/wisp-desktop/assets/make-icon.swift

@@ -14,32 +14,35 @@ import CoreGraphics
 import Foundation
 
 guard CommandLine.arguments.count == 3 else {
-    print("usage: make-icon <source> <output-1024.png>")
-    exit(1)
+  print("usage: make-icon <source> <output-1024.png>")
+  exit(1)
 }
 let srcURL = URL(fileURLWithPath: CommandLine.arguments[1])
 let dstURL = URL(fileURLWithPath: CommandLine.arguments[2])
 
 guard let srcImage = NSImage(contentsOf: srcURL),
-      let srcCG = srcImage.cgImage(forProposedRect: nil, context: nil, hints: nil)
+  let srcCG = srcImage.cgImage(forProposedRect: nil, context: nil, hints: nil)
 else {
-    print("failed to load source image at \(srcURL.path)")
-    exit(1)
+  print("failed to load source image at \(srcURL.path)")
+  exit(1)
 }
 
 let srcW = srcCG.width
 let srcH = srcCG.height
 let side = min(srcW, srcH)
 let cropOriginX = (srcW - side) / 2
 let cropOriginY = (srcH - side) / 2
-guard let cropped = srcCG.cropping(to: CGRect(
-    x: cropOriginX,
-    y: cropOriginY,
-    width: side,
-    height: side
-)) else {
-    print("crop failed")
-    exit(1)
+guard
+  let cropped = srcCG.cropping(
+    to: CGRect(
+      x: cropOriginX,
+      y: cropOriginY,
+      width: side,
+      height: side
+    ))
+else {
+  print("crop failed")
+  exit(1)
 }
 
 let canvas: CGFloat = 1024
@@ -49,33 +52,33 @@ let inset = (canvas - inner) / 2
 let cornerRadius = inner * 0.2237
 
 guard let colorSpace = CGColorSpace(name: CGColorSpace.sRGB),
-      let ctx = CGContext(
-          data: nil,
-          width: Int(canvas),
-          height: Int(canvas),
-          bitsPerComponent: 8,
-          bytesPerRow: 0,
-          space: colorSpace,
-          bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
-      )
+  let ctx = CGContext(
+    data: nil,
+    width: Int(canvas),
+    height: Int(canvas),
+    bitsPerComponent: 8,
+    bytesPerRow: 0,
+    space: colorSpace,
+    bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
+  )
 else {
-    print("CGContext init failed")
-    exit(1)
+  print("CGContext init failed")
+  exit(1)
 }
 
 // Drop shadow on the squircle itself.
 ctx.setShadow(
-    offset: CGSize(width: 0, height: -8),
-    blur: 24,
-    color: CGColor(red: 0, green: 0, blue: 0, alpha: 0.45)
+  offset: CGSize(width: 0, height: -8),
+  blur: 24,
+  color: CGColor(red: 0, green: 0, blue: 0, alpha: 0.45)
 )
 
 let innerRect = CGRect(x: inset, y: inset, width: inner, height: inner)
 let path = CGPath(
-    roundedRect: innerRect,
-    cornerWidth: cornerRadius,
-    cornerHeight: cornerRadius,
-    transform: nil
+  roundedRect: innerRect,
+  cornerWidth: cornerRadius,
+  cornerHeight: cornerRadius,
+  transform: nil
 )
 
 ctx.saveGState()
@@ -92,31 +95,32 @@ ctx.draw(cropped, in: innerRect)
 ctx.setShadow(offset: .zero, blur: 0, color: nil)
 let centre = CGPoint(x: innerRect.midX, y: innerRect.midY)
 let endRadius = inner * 0.72
-let colors = [
+let colors =
+  [
     CGColor(red: 0, green: 0, blue: 0, alpha: 0.0),
     CGColor(red: 0, green: 0, blue: 0, alpha: 0.0),
     CGColor(red: 0, green: 0, blue: 0, alpha: 0.55),
-] as CFArray
+  ] as CFArray
 let locations: [CGFloat] = [0.0, 0.55, 1.0]
 if let gradient = CGGradient(colorsSpace: colorSpace, colors: colors, locations: locations) {
-    ctx.drawRadialGradient(
-        gradient,
-        startCenter: centre, startRadius: 0,
-        endCenter: centre, endRadius: endRadius,
-        options: []
-    )
+  ctx.drawRadialGradient(
+    gradient,
+    startCenter: centre, startRadius: 0,
+    endCenter: centre, endRadius: endRadius,
+    options: []
+  )
 }
 
 ctx.restoreGState()
 
 guard let outCG = ctx.makeImage() else {
-    print("makeImage failed")
-    exit(1)
+  print("makeImage failed")
+  exit(1)
 }
 let rep = NSBitmapImageRep(cgImage: outCG)
 guard let png = rep.representation(using: .png, properties: [:]) else {
-    print("png encode failed")
-    exit(1)
+  print("png encode failed")
+  exit(1)
 }
 try png.write(to: dstURL)
 print("wrote \(dstURL.path)")

apps/wisp-mcp/Cargo.toml

@@ -1,5 +1,6 @@
 [package]
 name = "wisp-mcp"
+description = ""
 edition.workspace = true
 version.workspace = true
 publish = false

crates/wisp-audiokit-sys/build.rs

@@ -69,16 +69,19 @@ fn main() {
         Ok(v) if !v.starts_with("/nix/store/") => v.into(),
         _ => detect_sdk_root(&developer_dir),
     };
+    let swift_home =
+        PathBuf::from(env::var("OUT_DIR").expect("OUT_DIR is always set by cargo build scripts"));
 
     let configure = |cmd: &mut Command| {
         cmd.current_dir(&swift_pkg)
             .env("DEVELOPER_DIR", &developer_dir)
-            .env("SDKROOT", &sdk_root);
+            .env("SDKROOT", &sdk_root)
+            .env("HOME", &swift_home);
     };
 
     // 1) Build the Swift package.
     let mut build_cmd = Command::new("swift");
-    build_cmd.arg("build");
+    build_cmd.args(["build", "--disable-sandbox"]);
     configure(&mut build_cmd);
     if is_release {
         build_cmd.args(["-c", "release"]);
@@ -90,7 +93,7 @@ fn main() {
 
     // 2) Ask SwiftPM where it put the artifacts.
     let mut path_cmd = Command::new("swift");
-    path_cmd.args(["build", "--show-bin-path"]);
+    path_cmd.args(["build", "--disable-sandbox", "--show-bin-path"]);
     configure(&mut path_cmd);
     if is_release {
         path_cmd.args(["-c", "release"]);