diff options
| -rw-r--r-- | flake.nix | 92 | ||||
| -rw-r--r-- | src/dead-trees/essen_analyse.pdf | bin | 184684 -> 0 bytes | |||
| -rw-r--r-- | src/dead-trees/facharbeit2.pdf | bin | 16284409 -> 0 bytes | |||
| -rw-r--r-- | src/dead-trees/index.html | 5 | ||||
| l--------- | src/dead-trees/raman_spectrometer.pdf | 1 |
5 files changed, 89 insertions, 9 deletions
diff --git a/flake.nix b/flake.nix index 08ee12f..73cd4b7 100644 --- a/flake.nix +++ b/flake.nix @@ -4,18 +4,88 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; systems.url = "github:nix-systems/x86_64-linux"; + + crane = { + url = "github:ipetkov/crane"; + inputs = { + nixpkgs.follows = "nixpkgs"; + }; + }; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs = { + nixpkgs.follows = "nixpkgs"; + }; + }; + + # inputs for following + flake-compat = { + url = "github:edolstra/flake-compat"; + flake = false; + }; flake-utils = { url = "github:numtide/flake-utils"; - inputs.systems.follows = "systems"; + inputs = { + systems.follows = "systems"; + }; }; - revealjs = { - url = "github:hakimel/reveal.js"; - flake = false; + lpm = { + url = "git+https://codeberg.org/bpeetz/lpm.git"; + inputs = { + systems.follows = "systems"; + rust-overlay.follows = "rust-overlay"; + nixpkgs.follows = "nixpkgs"; + crane.follows = "crane"; + flake-utils.follows = "flake-utils"; + flake-compat.follows = "flake-compat"; + }; + }; + flake_version_update = { + url = "git+https://codeberg.org/soispha/flake_version_update.git"; + inputs = { + systems.follows = "systems"; + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; }; + + # data essay = { url = "git+https://codeberg.org/bpeetz/kant_and_free_software.git"; inputs = { + crane.follows = "crane"; + flake-compat.follows = "flake-compat"; + flake-utils.follows = "flake-utils"; + flake_version_update.follows = "flake_version_update"; + lpm.follows = "lpm"; nixpkgs.follows = "nixpkgs"; + rust-overlay.follows = "rust-overlay"; + systems.follows = "systems"; + }; + }; + facharbeit = { + url = "git+https://codeberg.org/bpeetz/facharbeit.git"; + inputs = { + crane.follows = "crane"; + flake-compat.follows = "flake-compat"; + flake-utils.follows = "flake-utils"; + flake_version_update.follows = "flake_version_update"; + lpm.follows = "lpm"; + nixpkgs.follows = "nixpkgs"; + rust-overlay.follows = "rust-overlay"; + systems.follows = "systems"; + }; + }; + essens_analyse = { + url = "git+https://codeberg.org/bpeetz/essens_analyse.git"; + inputs = { + crane.follows = "crane"; + flake-compat.follows = "flake-compat"; + flake-utils.follows = "flake-utils"; + flake_version_update.follows = "flake_version_update"; + lpm.follows = "lpm"; + nixpkgs.follows = "nixpkgs"; + rust-overlay.follows = "rust-overlay"; systems.follows = "systems"; }; }; @@ -25,6 +95,8 @@ nixpkgs, flake-utils, essay, + facharbeit, + essens_analyse, ... }: flake-utils.lib.eachDefaultSystem ( @@ -43,11 +115,19 @@ nativeBuildInputs = []; buildPhase = '' - cp ${essay.outputs.packages."${system}".default}/philosophy/kant_and_free_software.pdf ./dead-trees/kant_and_free_software.pdf + install -D ${essay.outputs.packages."${system}".default}/philosophy/kant_and_free_software.pdf ./dead-trees/philosophy/kant_and_free_software.pdf + # NOTE: This link is for backward compatibility, as I have given out links with that url <2024-07-13> + ln --symbolic --relative ./dead-trees/philosophy/kant_and_free_software.pdf ./dead-trees/kant_and_free_software.pdf + + install -D ${facharbeit.outputs.packages."${system}".default}/chemistry/facharbeit.pdf ./dead-trees/chemistry/facharbeit.pdf + # NOTE: This link is for backward compatibility, as I have given out links with that url <2024-07-13> + ln --symbolic --relative ./dead-trees/chemistry/facharbeit.pdf ./dead-trees/raman_spectrometer.pdf + + install -D ${essens_analyse.outputs.packages."${system}".default}/chemistry/essens_analyse.pdf ./dead-trees/chemistry/essens_analyse.pdf ''; installPhase = '' install -d $out/ - cp -r . $out/ + cp --recursive . $out/ ''; }; }; diff --git a/src/dead-trees/essen_analyse.pdf b/src/dead-trees/essen_analyse.pdf deleted file mode 100644 index 6a2d434..0000000 --- a/src/dead-trees/essen_analyse.pdf +++ /dev/null Binary files differdiff --git a/src/dead-trees/facharbeit2.pdf b/src/dead-trees/facharbeit2.pdf deleted file mode 100644 index 8052970..0000000 --- a/src/dead-trees/facharbeit2.pdf +++ /dev/null Binary files differdiff --git a/src/dead-trees/index.html b/src/dead-trees/index.html index 23fd7bf..0e34505 100644 --- a/src/dead-trees/index.html +++ b/src/dead-trees/index.html @@ -2,8 +2,9 @@ <body> <h1>My paper like things, provided in the portable document format</h1> <ul> - <li><a href="./kant_and_free_software.pdf">My essay on free software and Kantian ethics</a></li> - <li><a href="./raman_spectrometer.pdf">My 'Facharbeit' on Raman spectrometry</a></li> + <li><a href="./philosophy/kant_and_free_software.pdf">My essay on free software and Kantian ethics</a></li> + <li><a href="./chemistry/facharbeit.pdf">My 'Facharbeit' on Raman Spektrometrie</a></li> + <li><a href="./chemistry/essens_analyse.pdf">My analysis of liquid food replacements</a></li> </ul> </body> </html> diff --git a/src/dead-trees/raman_spectrometer.pdf b/src/dead-trees/raman_spectrometer.pdf deleted file mode 120000 index d44f349..0000000 --- a/src/dead-trees/raman_spectrometer.pdf +++ /dev/null @@ -1 +0,0 @@ -facharbeit2.pdf \ No newline at end of file |