From 69bf4c65762066544d45a3b14f45125d9e61129c Mon Sep 17 00:00:00 2001 From: August Date: Sun, 11 Oct 2026 17:37:30 +0000 Subject: [PATCH] I don't know --- .envrc | 2 +- .gitignore | 3 ++- shell.nix | 30 ------------------------------ src/kernel/boot/mod.rs | 4 ++++ 4 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 shell.nix diff --git a/.envrc b/.envrc index 1d953f4..3550a30 100644 --- a/.envrc +++ b/.envrc @@ -1 +1 @@ -use nix +use flake diff --git a/.gitignore b/.gitignore index 75b98a8..515868b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /build .idea /log -a.out \ No newline at end of file +a.out +/.direnv \ No newline at end of file diff --git a/shell.nix b/shell.nix deleted file mode 100644 index cd2616e..0000000 --- a/shell.nix +++ /dev/null @@ -1,30 +0,0 @@ -let - nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"; - pkgs = import nixpkgs { config = {}; overlays = []; }; -in - -pkgs.mkShell { - - packages = with pkgs; [ - bash - limine-full - xorriso - rustup - qemu - cargo-make - cargo-binutils - ]; - - buildInputs = with pkgs; [ - limine-full - ]; - - shellHook = '' - echo $TMPDIR; - rustup default nightly; - rustup target add x86_64-unknown-none; - export LIMINEDIR="${pkgs.limine-full}/share/limine" - ''; - -} - diff --git a/src/kernel/boot/mod.rs b/src/kernel/boot/mod.rs index 860d7e0..4785635 100644 --- a/src/kernel/boot/mod.rs +++ b/src/kernel/boot/mod.rs @@ -33,3 +33,7 @@ pub static FIRMWARE_TYPE_REQUEST: FirmwareTypeRequest = limine::request::Firmwar #[used] #[unsafe(link_section = ".requests")] pub static RSDP_REQUEST: RsdpRequest = limine::request::RsdpRequest::new(); + +#[used] +#[unsafe(link_section = ".requests")] +pub static FLANTERM_REQUEST: FlantermParamsRequest = limine::request::FlantermParamsRequest::new(); \ No newline at end of file