commit aa9e770ba38bdfad35009ea54105b65a3aa13ea2 Author: Laureηt Date: Wed Dec 13 18:16:04 2023 +0100 refactor, nix flake diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e2f5dd2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..cf27df1 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "markdown.marp.enableHtml": true, +} \ No newline at end of file diff --git a/figs/centrale.jpg b/figs/centrale.jpg new file mode 100644 index 0000000..080b1de Binary files /dev/null and b/figs/centrale.jpg differ diff --git a/figs/chernobyl.png b/figs/chernobyl.png new file mode 100644 index 0000000..41c6415 Binary files /dev/null and b/figs/chernobyl.png differ diff --git a/figs/church.jpg b/figs/church.jpg new file mode 100644 index 0000000..7ea68c1 Binary files /dev/null and b/figs/church.jpg differ diff --git a/figs/doha-kiev.png b/figs/doha-kiev.png new file mode 100644 index 0000000..f0aae78 Binary files /dev/null and b/figs/doha-kiev.png differ diff --git a/figs/hero.jpg b/figs/hero.jpg new file mode 100644 index 0000000..9a06713 Binary files /dev/null and b/figs/hero.jpg differ diff --git a/figs/kiev-chernobyl.png b/figs/kiev-chernobyl.png new file mode 100644 index 0000000..d6b98f7 Binary files /dev/null and b/figs/kiev-chernobyl.png differ diff --git a/figs/liqueur.jpg b/figs/liqueur.jpg new file mode 100644 index 0000000..dda7f9c Binary files /dev/null and b/figs/liqueur.jpg differ diff --git a/figs/salo.jpg b/figs/salo.jpg new file mode 100644 index 0000000..1174303 Binary files /dev/null and b/figs/salo.jpg differ diff --git a/figs/tokyo-doha.png b/figs/tokyo-doha.png new file mode 100644 index 0000000..5a0ad76 Binary files /dev/null and b/figs/tokyo-doha.png differ diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..af9faf5 --- /dev/null +++ b/flake.lock @@ -0,0 +1,64 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..8c01cb5 --- /dev/null +++ b/flake.nix @@ -0,0 +1,35 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; + + outputs = inputs@{ nixpkgs, flake-parts, ... }: + flake-parts.lib.mkFlake { inherit inputs; } { + systems = [ "x86_64-linux" "aarch64-linux" ]; + + perSystem = { pkgs, system, ... }: { + devShells.default = + pkgs.mkShell { packages = with pkgs; [ marp-cli ]; }; + + packages.slides = pkgs.stdenvNoCC.mkDerivation { + name = "slides"; + + src = ./.; + dontUnpack = true; + buildInputs = with pkgs; [ marp-cli ]; + + buildPhase = '' + marp --html $src/slides.md --allow-local-files -o slides.html + ''; + + installPhase = '' + mkdir -p $out + cp -r $src/figs $out/figs + cp slides.html $out/index.html + ''; + }; + }; + }; +} + diff --git a/slides.md b/slides.md new file mode 100644 index 0000000..1838fc2 --- /dev/null +++ b/slides.md @@ -0,0 +1,170 @@ +--- +marp: true +--- + + + +

+わたしたちのまちは
+チョルノーブィリです！ +

+ +![bg left:80%](figs/hero.jpeg) + + + + + +--- + +チョルノーブィリは +ウクライナの北です。 + +![bg right:80%](figs/chernobyl.png) + + + + + +--- + +とうきょうからドーハまで +ひこうきでじゅうさんじかん +くらいです。 + +![bg left:80%](figs/tokyo-doha.png) + + + + + +--- + +ドーハからキエフまで +ひこうきでごじかん +よんじゅうごふん +くらいです。 + +![bg right:80%](figs/doha-kiev.png) + + + + + +--- + +キエフからチョルノーブィリまで +くるまでにじかん +くらいです。 + +![bg left:80%](figs/kiev-chernobyl.png) + + + +--- + +ちいさいゆうえんちがあります。
+ゆうえんちにかんらんしゃと +バンパーカーがあります。 + +![bg right:80%](https://images.unsplash.com/photo-1563881087891-b87cdd6072dc) +![bg right:80%](https://images.unsplash.com/photo-1548341050-9f6f83e408c7) + + + +--- + +オーソドックスのきょうかいがあります。 +サンエリアスはあおくてきれいです。 + +![bg left:80%](figs/church.jpg) + + + +--- + +げんしりょくはつでんしょはゆうめくて +ふるくてやばいです。 + +![bg right:80%](figs/centrale.jpeg) + + + +--- + +サロはぶたにくです。 +とてもしおからいです。 + +![bg left:80%](figs/salo.jpg) + + + +--- + +ナリヴカはつよいさけです。 +ラプスベリーとチェリーのさけです。 + +![bg right:80%](figs/liqueur.jpg) + +