From e304b79eff79d22cf1ec5aab5e31119001d0276b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9l=C3=A8ne=20Corbineau?= Date: Mon, 23 Sep 2024 22:16:34 +0200 Subject: [PATCH] =?UTF-8?q?Theming,=20logo=20d'en-t=C3=AAte,=20page=20FPGA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- docs/{chems.md => chemistry/solvants.md} | 11 +-- docs/img/logo.png | Bin 0 -> 7038 bytes docs/{tools.md => tools/cnc.md} | 16 +--- docs/tools/defonceuse.md | 0 docs/tools/imprimante3d.md | 0 docs/tools/perceuse_colonne.md | 0 docs/tools/ponceuse.md | 0 docs/tutorials/fpga.md | 100 +++++++++++++++++++++++ mkdocs.yml | 14 +++- overrides/main.html | 14 ++++ overrides/partials/banner.html | 1 + shell.nix | 3 +- 13 files changed, 133 insertions(+), 30 deletions(-) rename docs/{chems.md => chemistry/solvants.md} (65%) create mode 100644 docs/img/logo.png rename docs/{tools.md => tools/cnc.md} (54%) create mode 100644 docs/tools/defonceuse.md create mode 100644 docs/tools/imprimante3d.md create mode 100644 docs/tools/perceuse_colonne.md create mode 100644 docs/tools/ponceuse.md create mode 100644 docs/tutorials/fpga.md create mode 100644 overrides/main.html create mode 100644 overrides/partials/banner.html diff --git a/README.md b/README.md index 2e8245b..d80b9b1 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,11 @@ Le site hackens.org est construit via [mkDocs](https://www.mkdocs.org/) et déployé statiquement. Les PR sont bienvenues pour ajouter du contenu ! -Pour déployer le site chez soi, il suffit d'installer mkDocs via `pip` : +Pour déployer le site chez soi, il suffit d'installer mkDocs et le +thème mkDocs-terminal via `pip` : ``` pip install mkdocs +pip install mkdocs-terminal ``` ou la méthode adaptée à sa distribution le cas échéant. Ensuite, le site peut être déployé localement à l'addresse 127.0.0.1:8000 en exécutant diff --git a/docs/chems.md b/docs/chemistry/solvants.md similarity index 65% rename from docs/chems.md rename to docs/chemistry/solvants.md index d568b97..e87bae5 100644 --- a/docs/chems.md +++ b/docs/chemistry/solvants.md @@ -1,13 +1,4 @@ -# Chimie - -Stockés dans l'armoire métallique d'avant-HackENS avec les peintures -et les vernis, les produits chimiques sont à manipuler avec précaution. -Le port du masque est le plus souvent recommandé, ainsi que de gants. -Un point d'eau est disponible au labo photo. L'eau sortant du robinet est -souvent stagnante, il peut être utile de la laisser couler un peu avant de s'en -servir. - -## Solvants +# Solvants Les produits les plus souvent utilisés sont les solvants. Il en existe en gros 4 types en fonction de deux paramètres : mon solvant est-il polaire ? diff --git a/docs/img/logo.png b/docs/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..d1a2410a7d9e5fb1d2f0d1af87f20fbd96eb1901 GIT binary patch literal 7038 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 {} }: + +pkgs.mkShell { + buildInputs = [ + pkgs.bluespec + pkgs.verilator + pkgs.verilog + pkgs.gtkwave + pkgs.openfpgaloader + + pkgs.yosys + pkgs.nextpnrWithGui + pkgs.trellis + ]; + + shellHook = '' + export BLUESPECDIR=${pkgs.bluespec}/lib + ''; +} +``` diff --git a/mkdocs.yml b/mkdocs.yml index 99904ee..8c094b0 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,9 +1,17 @@ site_name: hackens.org + +theme: + name: terminal + custom_dir: overrides +# features: navigation.top.hide nav: - - Hackens: index.md - Projets: - Borne d'arcade: projects/arcade.md - Outils: - - Outils: tools.md + - Perceuse à colonne: tools/perceuse_colonne.md + - CNC: tools/cnc.md - Chimie: - - Chimie: chems.md + - Solvants: chemistry/solvants.md + - Tutoriels: + - FPGA: tutorials/fpga.md +# Section tutoriels ? Genre mill un PCB, ce genre de trucs pas évident diff --git a/overrides/main.html b/overrides/main.html new file mode 100644 index 0000000..00c91b9 --- /dev/null +++ b/overrides/main.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} + +{% block top_nav %} +
+
+ + {% include "partials/top-nav/menu.html" %} +
+
+{% endblock %} diff --git a/overrides/partials/banner.html b/overrides/partials/banner.html new file mode 100644 index 0000000..da93de8 --- /dev/null +++ b/overrides/partials/banner.html @@ -0,0 +1 @@ +

HackENS.org

diff --git a/shell.nix b/shell.nix index c2919c9..c9122f3 100644 --- a/shell.nix +++ b/shell.nix @@ -2,7 +2,8 @@ pkgs.mkShell { packages = [ (pkgs.python3.withPackages (ps: [ - ps.mkdocs + ps.mkdocs, + ps.mkdocs-terminal ])) ]; }