From ce2b37331399b0e661063a8fab4d19fb9bb0928c Mon Sep 17 00:00:00 2001
From: Nicholas Orlowsky <nickorlow@nickorlow.com>
Date: Tue, 25 Feb 2025 16:24:07 -0500
Subject: [PATCH] add nix config

---
 .envrc         |  1 +
 .gitignore     |  1 +
 CMakeLists.txt |  6 +++---
 shell.nix      | 10 ++++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 .envrc
 create mode 100644 shell.nix

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..1d953f4
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/.gitignore b/.gitignore
index 06972d4..1a0df54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .cache/
 build/
 iso/boot/kernel.elf
+.direnv/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 856dd9e..fc353f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,9 +24,9 @@ FILE(GLOB SOURCES kernel/kernel.c)
 
 # Architecture Specific Files
 if (ARCH STREQUAL "i386")
-    set(CMAKE_C_COMPILER i386-elf-gcc)
-    set(CMAKE_ASM_COMPILER i386-elf-as)
-    set(LD i386-elf-gcc)
+    set(CMAKE_C_COMPILER i686-elf-gcc)
+    set(CMAKE_ASM_COMPILER i686-elf-as)
+    set(LD i686-elf-gcc)
     FILE(GLOB ASM_SOURCES arch/i386/*.s)
     SET(ARCH_FLAG "-DARCH_I386")
 endif()
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..69066fd
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,10 @@
+let
+  pkgs' = (import <nixpkgs> {}).pkgsCross.i686-embedded;
+  pkgs = (import <nixpkgs> {});
+in
+  pkgs'.mkShell {
+    nativeBuildInputs = [ 
+        pkgs.cdrkit
+        pkgs.qemu
+    ];
+}