Update README.md

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+indent_style = tab
+trim_trailing_whitespaces = true
+insert_final_newline = false
+charset = utf-8
+
+[*.nix]
+indent_size = 2
+
+[*.{c,h,ld}]
+indent_size = 4

.github/workflows/deploy.yml

@@ -0,0 +1,54 @@
+name: Deploy website
+
+# Set permissions of the `GITHUB_TOKEN` to allow deployment to Github Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+# Workflow triggers
+on:
+  # Whenever any changes are made to `web/` from either a push or merging a pull request
+  push:
+    paths:
+      - "web/**"
+  pull_request:
+    paths:
+      - "web/**"
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Workflow actions
+jobs:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      # Clone repository
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # Configure Github Pages
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+
+      # Upload build - In this case it's just static files e.g. HTML and CSS
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload specific directory
+          path: './web'
+
+      # Deploy to Github Pages
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -6,7 +6,7 @@ build/
 !build/src/kernel/console/functions/edit.c.o
 
 # Libraries/Dependencies
-include/limine
+include/limine/*
 #!include/limine/limine.h
 
 .DS_Store
@@ -17,8 +17,9 @@ tools/png
 tools/bmp
 tools/lg.py
 
-dsk/hdd0
-dsk/disk.img
+.github/*
+
+logo.txt
 
 src/kernel/console/functions/edit.c
 

.zed/settings.json

@@ -0,0 +1,3 @@
+{
+	"project_name": "emexOS",
+}

Makefile

@@ -15,12 +15,13 @@ all: $(ISO)
 fetchDeps:
 	@echo "[DEPS] Fetching dependencies/libraries"
 	@mkdir -p $(INCLUDE_DIR)
-	#@mkdir -p $(BUILD_DIR)/src/kernel/console/functions
+
 	@echo "[DEPS] Fetching Limine"
-	@rm -rf $(INCLUDE_DIR)/limine
-	@git clone https://codeberg.org/Limine/Limine.git --branch=v10.3.0-binary --depth=1 $(INCLUDE_DIR)/limine
-	@echo "[DEPS] Building limine binary"
-	@$(MAKE) -C $(INCLUDE_DIR)/limine
+	@rm -rf $(LIMINE_DIR)
+	@git clone https://codeberg.org/Limine/Limine.git --branch=v10.x-binary --depth=1 $(LIMINE_DIR)
+	@rm -rf $(LIMINE_DIR)/.git
+	@echo "[DEPS] Fetching Limine protocol header file"
+	@wget https://codeberg.org/Limine/limine-protocol/raw/branch/trunk/include/limine.h -O $(LIMINE_DIR)/limine.h
 
 disk:
 	@mkdir -p $(DISK_DIR)
@@ -34,24 +35,16 @@ $(BUILD_DIR)/kernel.elf: src/kernel/linker.ld $(OBJS)
 userspace:
 	@$(MAKE) -C src/userspace
 
-# Ensure host limine tool exists (Linux/macOS binary).
+# Compile Limine
 $(LIMINE_TOOL):
 	@$(MAKE) -C $(LIMINE_DIR)
 
 # Create bootable ISO
-$(ISO): limine.conf $(BUILD_DIR)/kernel.elf disk userspace $(LIMINE_TOOL)
+$(ISO): limine.conf $(LIMINE_TOOL) $(BUILD_DIR)/kernel.elf disk userspace
 	@echo "[ISO] Creating bootable image..."
 	@rm -rf $(ISODIR)
+	@rm -f $(DISK_DIR)/initrd.cpio
 	@mkdir -p $(ISODIR)/boot/limine $(ISODIR)/EFI/BOOT
-#@cp $(BUILD_DIR)/kernel.elf $(ISODIR)/boot/
-	@cp $(BUILD_DIR)/kernel.elf $(ISODIR)/boot/kernel_a.elf
-	@cp $(BUILD_DIR)/kernel.elf $(ISODIR)/boot/kernel_b.elf
-#@cp activeslot.txt $(ISODIR)/boot/activeslot.cfg # slot system
-
-	@cp $< $(ISODIR)/boot/limine/
-	@cp $(addprefix $(INCLUDE_DIR)/limine/limine-, bios.sys bios-cd.bin uefi-cd.bin) $(ISODIR)/boot/limine/
-	@cp $(addprefix $(INCLUDE_DIR)/limine/BOOT, IA32.EFI X64.EFI) $(ISODIR)/EFI/BOOT/
-
 	@mkdir -p $(ISODIR)/boot
 	@mkdir -p $(ISODIR)/boot/ui
 	@mkdir -p $(ISODIR)/boot/ui/fonts
@@ -60,26 +53,38 @@ $(ISO): limine.conf $(BUILD_DIR)/kernel.elf disk userspace $(LIMINE_TOOL)
 	@mkdir -p $(ISODIR)/boot/keymaps
 	@mkdir -p $(ISODIR)/boot/images
 	@mkdir -p $(ISODIR)/boot/programs
+	@cp $(BUILD_DIR)/kernel.elf $(ISODIR)/boot/kernel_a.elf
+	@cp $(BUILD_DIR)/kernel.elf $(ISODIR)/boot/kernel_b.elf
+	@cp $< $(ISODIR)/boot/limine/
+	@cp $(addprefix $(INCLUDE_DIR)/limine/limine-, bios.sys bios-cd.bin uefi-cd.bin) $(ISODIR)/boot/limine/
+	@cp $(addprefix $(INCLUDE_DIR)/limine/BOOT, IA32.EFI X64.EFI) $(ISODIR)/EFI/BOOT/
 
-	@echo "[MOD] creating executables..."
-	@cp src/userspace/hello.elf $(ISODIR)/boot/programs/hello.elf
-
-#@echo "[MOD] copying configs..."
-#@cp shared/theme/bootconf.emcg $(ISODIR)/boot/bootconf.emcg
-#@cp shared/theme/font8x15.bin $(ISODIR)/boot/liminefont.f15
-
-	@echo "[MOD] copying assets..."
-	@cp shared/ui/assets/bootlogo.bin $(ISODIR)/boot/ui/assets/
-#@cp shared/images/logo.bmp $(ISODIR)/boot/images/
-#@cp shared/images/background.bmp $(ISODIR)/boot/images/
-	@cp shared/images/frog.bmp $(ISODIR)/boot/images/
-
-#@cp shared/images/bg.jpg $(ISODIR)/boot/
-
-	@echo "[MOD] copying keymaps..."
-	@cp shared/keymaps/US.map $(ISODIR)/boot/keymaps/
-	@cp shared/keymaps/DE.map $(ISODIR)/boot/keymaps/
-#@cp shared/keymaps/PL.map $(ISODIR)/boot/keymaps/
+	@echo "[MK] copying executables..."
+	@mkdir -p $(DISK_DIR)/rd/user/apps
+	@mkdir -p $(DISK_DIR)/rd/user/bin
+	@mkdir -p $(DISK_DIR)/rd/bin
+	@mkdir -p $(DISK_DIR)/rd/emr/system
+	@cp -r src/userspace/apps/shell/shell.emx $(DISK_DIR)/rd/user/apps/
+	@cp -r src/userspace/apps/system/system.emx $(DISK_DIR)/rd/emr/system/
+	@cp -r src/userspace/apps/gui/gui.emx $(DISK_DIR)/rd/user/apps/
+
+	@echo "[MK] copying files..."
+#@cp limine.conf $(DISK_DIR)/rd/boot/
+	@cp src/userspace/apps/login/login.elf $(DISK_DIR)/rd/emr/system
+	@cp src/userspace/bin/echo/echo.elf $(DISK_DIR)/rd/bin/
+	@cp src/userspace/bin/hello/hello.elf $(DISK_DIR)/rd/bin/
+	@cp src/userspace/bin/ls/ls.elf $(DISK_DIR)/rd/bin/
+	@cp src/userspace/bin/tree/tree.elf $(DISK_DIR)/rd/bin/
+	@cp src/userspace/bin/cat/cat.elf $(DISK_DIR)/rd/bin/
+	@cp src/userspace/bin/cd/cd.elf $(DISK_DIR)/rd/bin/
+	@cp src/userspace/bin/lsblk/lsblk.elf $(DISK_DIR)/rd/bin/
+	@cp src/userspace/bin/reboot/reboot.elf $(DISK_DIR)/rd/bin/
+
+
+	@echo "[MK] creating initrd.cpio..."
+	@chmod +x tools/initrd.sh
+	./tools/initrd.sh
+	@cp $(DISK_DIR)/initrd.cpio $(ISODIR)/boot/
 
 	@xorriso -as mkisofs -b boot/limine/limine-bios-cd.bin \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
@@ -123,4 +128,4 @@ $(BUILD_DIR)/%.asm.o: %.asm
 clean:
 	@echo "[CLR] Cleaning..."
 	@rm -rf $(BUILD_DIR)
-	@echo "[OK]"
+	@echo "[OK]"