ci: fix ci

.github/workflows/ci.yml

@@ -1,22 +1,16 @@
 name: CI
-on: [push, pull_request]
+on: [pull_request, merge_group]
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v6
-
-            - name: Install Nix
-              uses: cachix/install-nix-action@v31
-              with:
-                  nix_path: nixpkgs=channel:nixos-unstable
-
-            - name: Build Kernel
-              run: nix build .#kernel
-
-            - name: Build Host Tools
-              run: |
-                  nix build .#ipsw
-                  nix build .#gravity-setup
-                  nix build .#linker-wrapper
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly
+          components: rustfmt, clippy, rust-src
+          targets: aarch64-unknown-none-softfloat
+      - run: cargo fmt --all -- --check
+      - run: cargo clippy --workspace --exclude kernel --exclude dyld
+      - run: cargo clippy --workspace --target aarch64-unknown-none-softfloat -p kernel -p dyld

.gitignore

@@ -10,3 +10,4 @@ compile_commands.json
 /work
 /result
 /result-*
+src/kernel/src/rust_dyld.bin

CLAUDE.md

@@ -10,25 +10,18 @@ GravityOS is a Rust-based operating system and kernel targeting ARM64 (aarch64-u
 
 ### Prerequisites
 
-- Rust nightly toolchain with `aarch64-unknown-none-softfloat` target
-- QEMU (qemu-system-aarch64) for emulation
-- Buck2 and Reindeer
+- Nix
 
 ### Building the Kernel
 
 ```bash
-# Build the kernel
-./tools/buck2 build //src/kernel:kernel --target-platforms //platforms:kernel-arm64
+nix build -v .#kernel
 ```
 
 ### Running the Kernel
 
 ```bash
-# Build the disk image
-./tools/buck2 run //src/setup:setup
-
-# Run the kernel in QEMU
-./tools/buck2 run //src/setup:run_qemu --target-platforms //platforms:kernel-arm64
+nix run
 ```
 
 ## Workspace Structure

Cargo.toml

@@ -5,6 +5,7 @@ members = [
     "src/tools/gravity-setup",
     "src/tools/linker-wrapper",
     "src/lib/dyld",
+    "src/lib/loader",
     "src/lib/vfdecrypt",
     "src/lib/ipsw-downloader",
     "src/lib/hfsplus",
@@ -17,14 +18,28 @@ version = "0.1.0"
 
 [workspace.dependencies]
 thiserror = { version = "2.0.18", default-features = false }
-reqwest = { version = "0.13.1", default-features = false, features = ["native-tls", "stream", "http2"] }
-goblin = { version = "0.10.4", default-features = false, features = ["endian_fd", "alloc", "mach32", "mach64"] }
+reqwest = { version = "0.13.1", default-features = false, features = [
+    "native-tls",
+    "stream",
+    "http2",
+] }
+goblin = { version = "0.10.4", default-features = false, features = [
+    "endian_fd",
+    "alloc",
+    "mach32",
+    "mach64",
+    "elf32",
+    "elf64",
+] }
 linked_list_allocator = "0.10.5"
 spin = "0.10.0"
 plist = "1.8.0"
 serde = { version = "1.0.228", default-features = false, features = ["derive"] }
 tokio = { version = "1.49.0", default-features = false }
-clap = { version = "4.5.55", features = ["derive", "std"], default-features = false }
+clap = { version = "4.5.55", features = [
+    "derive",
+    "std",
+], default-features = false }
 aes = "0.8.4"
 hmac = "0.12.1"
 sha1 = "0.10.6"
@@ -37,7 +52,10 @@ byteorder = "1.5"
 bitflags = { version = "2.10.0", default-features = false }
 libc = { version = "0.2.180", default-features = false }
 xattr = "1.6.1"
-rustix = { version = "1.1.3", default-features = false, features = ["fs", "std"] }
+rustix = { version = "1.1.3", default-features = false, features = [
+    "fs",
+    "std",
+] }
 errno = { version = "0.3.14", default-features = false }
 zip = "=7.3.0-pre1"
 rayon = "1.11"
@@ -54,10 +72,13 @@ crc32fast = "1.5"
 hashbrown = "0.16"
 memmap2 = "0.9"
 binrw = { version = "0.15.0", default-features = false }
-zlib-rs = { version = "0.6.0", default-features = false, features = ["__internal-api"] }
+zlib-rs = { version = "0.6.0", default-features = false, features = [
+    "__internal-api",
+] }
 rand_core = { version = "0.9.5", default-features = false }
 rand_chacha = { version = "0.9.0", default-features = false }
 lzma-rust2 = { version = "=0.15.7", default-features = false }
+zstd-safe = { version = "7.2.4", default-features = false }
 
 [profile.dev]
 panic = "abort"