fix conflicts

.github/workflows/gh-pages.yml

@@ -0,0 +1,54 @@
+name: Github Pages
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '*'
+  workflow_dispatch:
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup mdBook
+        uses: peaceiris/actions-mdbook@v2
+        with:
+          mdbook-version: 'latest'
+
+      - run: mdbook build book
+
+  deploy:
+    environment:
+      name: gh-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    needs: build
+    steps:
+      - name: Set output directory
+        run: |
+          OUTDIR=$(basename ${{ github.ref }})
+          echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
+
+      - name: Deploy stable
+        uses: peaceiris/actions-gh-pages@v4
+        if: startswith(github.ref, 'refs/tags/')
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./book/book
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./book/book
+          destination_dir: ./${{ env.OUTDIR }}

README-it.md

@@ -110,7 +110,7 @@ dd if=<your_binary_filename>.bin of=/dev/sdX && sync
 ## Appendice
 
 ### Stato dello sviluppo
-https://github.com/user-attachments/assets/f07cad18-845f-4457-a72a-a9bb4d3f6074
+https://github.com/user-attachments/assets/663e8477-4275-411b-a39a-c12e54096ad8
 
 ### Altre info
 **Sai che abbiamo un canale IRC? È `#highlightos` su [libera.chat](https://libera.chat).**

README-pl.md

@@ -110,7 +110,7 @@ dd if=<your_binary_filename>.bin of=/dev/sdX && sync
 ## Załączniki
 
 ### Status rozwoju
-https://github.com/user-attachments/assets/de796522-3d6b-4672-a335-ff282422fe86
+https://github.com/user-attachments/assets/663e8477-4275-411b-a39a-c12e54096ad8
 
 ### Dodatkowe informacje
 **Czy wiedziałeś że mamy kanał IRC? Jest to '#highlightos' na [libera.chat](https://libera.chat).**

README.md

@@ -110,7 +110,7 @@ dd if=<your_binary_filename>.bin of=/dev/sdX && sync
 ## Appendix
 
 ### Development status
-https://github.com/user-attachments/assets/de796522-3d6b-4672-a335-ff282422fe86
+https://github.com/user-attachments/assets/663e8477-4275-411b-a39a-c12e54096ad8
 
 ### Additional info
 **Did you know we have a IRC channel? It's `#highlightos` on [libera.chat](https://libera.chat).**

book/.gitignore

@@ -0,0 +1 @@
+book

book/book.toml

@@ -0,0 +1,17 @@
+[book]
+authors = ["Adam Perkowski"]
+language = "en"
+multilingual = false
+src = "src"
+title = "HighlightOS"
+
+[output.html]
+cname = "os.adamperkowski.dev"
+#default-theme = "colibri"
+#preferred-dark-theme = "colibri"
+git-repository-url = "https://github.com/adamperkowski/highlightos"
+edit-url-template = "https://github.com/adamperkowski/highlightos/edit/master/book/{path}"
+#additional-css = ["custom.css"]
+
+[output.html.search]
+use-boolean-and = true

book/src/SUMMARY.md

@@ -0,0 +1,3 @@
+# Summary
+
+- [HighlightOS](./highlightos.md)

book/src/highlightos.md

@@ -0,0 +1,5 @@
+# HighlightOS
+
+x86_64 OS (kernel) made completely from scratch in Assembly & Rust
+
+Documentation for bleeding-edge main can be found at [https://os.adamperkowski.dev/main](https://os.adamperkowski.dev/main).