Compare commits

..

No commits in common. "bf7b634f4085b0e6a390de257872559e174b3f1c" and "3f07274b1925df3f01b15798f9d8ac61c8502bed" have entirely different histories.

9 changed files with 39 additions and 117 deletions

View file

@ -1,4 +1,5 @@
{ {
"explorer.excludeGitIgnore": true,
"latex-workshop.latex.recipe.default": "latexmk (lualatex)", "latex-workshop.latex.recipe.default": "latexmk (lualatex)",
"gitlens.codeLens.authors.enabled": false, "gitlens.codeLens.authors.enabled": false,
"gitlens.codeLens.recentChange.enabled": false, "gitlens.codeLens.recentChange.enabled": false,

BIN
assets/turbine_decoupe.webp (Stored with Git LFS)

Binary file not shown.

11
check.sh Executable file
View file

@ -0,0 +1,11 @@
for file in assets/*
do
filename=$(basename $file)
if grep -q $filename pdf/paper.tex; then
echo "$filename used in paper.tex"
elif grep -q $filename slides/slides.md; then
echo "$filename used in slides.md"
else
echo "$filename NOT USED !!!!!!"
fi
done

View file

@ -1,32 +1,27 @@
{ {
"nodes": { "nodes": {
"flake-parts": { "flake-utils": {
"inputs": {
"nixpkgs-lib": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1727826117, "lastModified": 1667395993,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "hercules-ci", "owner": "numtide",
"repo": "flake-parts", "repo": "flake-utils",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hercules-ci", "owner": "numtide",
"repo": "flake-parts", "repo": "flake-utils",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1673796341,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "6dccdc458512abce8d19f74195bb20fdb067df50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,24 +33,8 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"systems": "systems"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
} }
} }
}, },

View file

@ -1,79 +1,17 @@
{ {
description = "Biblio proj long";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-parts = { flake-utils.url = "github:numtide/flake-utils";
url = "github:hercules-ci/flake-parts";
inputs.nixpkgs-lib.follows = "nixpkgs";
};
systems.url = "github:nix-systems/default";
}; };
outputs = {flake-parts, ...} @ inputs: outputs = { self, nixpkgs, flake-utils }:
flake-parts.lib.mkFlake {inherit inputs;} { flake-utils.lib.eachDefaultSystem (system:
systems = import inputs.systems; let pkgs = nixpkgs.legacyPackages.${system};
in {
perSystem = { devShell = pkgs.mkShell {
pkgs, buildInputs = with pkgs; [ texlive.combined.scheme-full nodejs ];
system,
...
}: rec {
devShells.default = pkgs.mkShell {
packages = packages.slides.nativeBuildInputs ++ packages.report.buildInputs;
};
packages.report = pkgs.stdenvNoCC.mkDerivation {
name = "report";
src = ./pdf;
assets = ./assets;
buildInputs = [
pkgs.texlive.combined.scheme-full
];
buildPhase = ''
rm assets
ln -s $assets assets
mkdir -p .cache/texmf-var
env TEXMFHOME=.cache TEXMFVAR=.cache/texmf-var \
latexmk -pdf -shell-escape -lualatex \
paper.tex
'';
installPhase = ''
mkdir -p $out
mv paper.pdf $out
'';
};
packages.slides = pkgs.stdenvNoCC.mkDerivation rec {
name = "slides";
src = ./slides;
assets = ./assets;
npmDeps = pkgs.fetchNpmDeps {
inherit src;
hash = "sha256-GJ10or/LERFOsBG6CqnRFXnXSEZB7+0C5CV6t8X/Um8=";
};
nativeBuildInputs = [
pkgs.npmHooks.npmConfigHook
pkgs.nodejs
];
buildPhase = ''
rm assets
ln -s $assets assets
npm run build
'';
installPhase = ''
mv dist $out
'';
};
};
}; };
});
} }

View file

@ -1 +0,0 @@
../assets

View file

@ -52,7 +52,7 @@
\setlength{\parskip}{7pt}% \setlength{\parskip}{7pt}%
% assets path % assets path
\graphicspath{{assets/}} \graphicspath{{../assets/}}
% header and footer settings % header and footer settings
\usepackage{lastpage} \usepackage{lastpage}

View file

@ -3,8 +3,5 @@
"@slidev/cli": "^0.42.9", "@slidev/cli": "^0.42.9",
"@slidev/theme-default": "^0.21.2", "@slidev/theme-default": "^0.21.2",
"slidev-theme-academic": "^1.1.3" "slidev-theme-academic": "^1.1.3"
},
"scripts": {
"build": "slidev build slides.md"
} }
} }

View file

@ -87,10 +87,10 @@ safran génère des revenus majoritairement grâce vente de moteur propulsion av
## Détails d'un moteur d'avion ## Détails d'un moteur d'avion
<div class="flex items-center h-full"> <div class="flex items-center h-full">
<img src="/assets/turbine_decoupe.webp" class="ml-20 h-full"> <img src="https://avr-global.com/wp-content/uploads/2019/06/03-b-moteur-turbine-gaz-2-2.png" class="ml-20 h-full">
</div> </div>
<a href="https://www.thingiverse.com/thing:1327093" class="absolute bottom-0 font-extralight mb-1 mr-2 right-0 text-xs">Thingiverse catiav5ftw</a> <a href="https://avr-global.com/aerospace/" class="absolute bottom-0 font-extralight mb-1 mr-2 right-0 text-xs">AV&R Global</a>
<!-- <!--
Lors de mon stage, \ Lors de mon stage, \