diff options
| -rw-r--r-- | flake.lock | 241 | ||||
| -rw-r--r-- | flake.nix | 138 | ||||
| -rw-r--r-- | package.nix | 9 | ||||
| -rw-r--r-- | src/content/writings/kant-and-free-software.pdf | bin | 0 -> 318521 bytes | |||
| -rw-r--r-- | src/content/writings/raman-spectroscopy.pdf | bin | 0 -> 16284404 bytes |
5 files changed, 33 insertions, 355 deletions
@@ -1,202 +1,5 @@ { "nodes": { - "crane": { - "locked": { - "lastModified": 1788465171, - "narHash": "sha256-Y1/TTVXjYXGF068IThQH9fPSZ0SIE74PABlUxnWTUH0=", - "owner": "ipetkov", - "repo": "crane", - "rev": "eb35abda9f232cc6610b1d1e3200d15c49b7ac54", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "essay": { - "inputs": { - "crane": [ - "crane" - ], - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], - "flake_version_update": [ - "flake_version_update" - ], - "lpm": [ - "lpm" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ], - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1710975858, - "narHash": "sha256-l/ZuFe9K4j8T5fq0ZRWEfeg3pH1eGrVIbki6TbgP+ec=", - "ref": "refs/heads/prime", - "rev": "98240f9e13f57d4c9787674eb5a1c551ffd91b35", - "revCount": 12, - "type": "git", - "url": "https://codeberg.org/bpeetz/kant_and_free_software.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/bpeetz/kant_and_free_software.git" - } - }, - "facharbeit": { - "inputs": { - "crane": [ - "crane" - ], - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], - "flake_version_update": [ - "flake_version_update" - ], - "lpm": [ - "lpm" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ], - "systems": [ - "systems" - ], - "treefmt-nix": [ - "treefmt-nix" - ] - }, - "locked": { - "lastModified": 1720872389, - "narHash": "sha256-BO4Nwi6K3IAxgR6CtQptPJvsw7UYZslqqnmxDy7faCo=", - "ref": "refs/heads/prime", - "rev": "cb4e55de2f2d5249cd37427fbb4452aab53d470e", - "revCount": 12, - "type": "git", - "url": "https://codeberg.org/bpeetz/facharbeit.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/bpeetz/facharbeit.git" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake_version_update": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1685288691, - "narHash": "sha256-oP6h34oJ8rm6KlUpyZrX+ww3hnoWny2ecrEXxkU7F3c=", - "ref": "refs/heads/prime", - "rev": "e9a97e01eca780bd16e1dbdbd8856b59558f4959", - "revCount": 5, - "type": "git", - "url": "https://codeberg.org/soispha/flake_version_update.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/soispha/flake_version_update.git" - } - }, - "lpm": { - "inputs": { - "crane": [ - "crane" - ], - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ], - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1727604239, - "narHash": "sha256-ZJoY3UJpohaMlOcr+S13HZuOs8frr3Trq80dE+67Qqg=", - "ref": "refs/heads/prime", - "rev": "3108d1e43fdb97c8d327000a22fdc6da66f90456", - "revCount": 31, - "type": "git", - "url": "https://codeberg.org/bpeetz/lpm.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/bpeetz/lpm.git" - } - }, "nixpkgs": { "locked": { "lastModified": 1788881743, @@ -215,54 +18,10 @@ }, "root": { "inputs": { - "crane": "crane", - "essay": "essay", - "facharbeit": "facharbeit", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "flake_version_update": "flake_version_update", - "lpm": "lpm", "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay", - "systems": "systems", "treefmt-nix": "treefmt-nix" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1788938153, - "narHash": "sha256-czAKV0qN7TtdlGIREdDAJmoATGH0lfF7wNO8OMVToCw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5280ed136f4359ce3f977b0c4c4dab6a34254201", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1680978846, - "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", - "owner": "nix-systems", - "repo": "x86_64-linux", - "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "x86_64-linux", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -3,135 +3,59 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - systems.url = "github:nix-systems/x86_64-linux"; - crane = { - url = "github:ipetkov/crane"; - inputs = {}; - }; - 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"; - }; - }; - 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"; - }; - }; treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs = { nixpkgs.follows = "nixpkgs"; }; }; - - # 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"; - treefmt-nix.follows = "treefmt-nix"; - nixpkgs.follows = "nixpkgs"; - rust-overlay.follows = "rust-overlay"; - systems.follows = "systems"; - }; - }; }; outputs = { self, - essay, - facharbeit, - flake-utils, nixpkgs, treefmt-nix, ... - }: - flake-utils.lib.eachDefaultSystem ( - system: let - pkgs = nixpkgs.legacyPackages.${system}; - treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;}; + }: let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;}; - build = pkgs.callPackage ./package.nix {inherit essay facharbeit;}; - check = pkgs.stdenv.mkDerivation { - # Add the source name, to force this to rerun. - name = "zola-check-${./src}"; - src = ./src; + build = pkgs.callPackage ./package.nix {}; + check = pkgs.stdenv.mkDerivation { + # Add the source name, to force this to rerun (needed because it's a FOD). + name = "zola-check-${./src}"; + src = ./src; - # Allow network access for link checking - outputHash = "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY="; - outputHashMode = "recursive"; + # Allow network access for link checking + outputHash = "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY="; + outputHashMode = "recursive"; - # Run local - preferLocalBuild = true; - allowSubstitutes = false; + # Run local + preferLocalBuild = true; + allowSubstitutes = false; - nativeBuildInputs = [pkgs.zola pkgs.findutils]; + nativeBuildInputs = [pkgs.zola pkgs.findutils]; - buildPhase = '' - zola check - ''; + buildPhase = '' + zola check + ''; - installPhase = "touch $out"; - }; - in { - packages = { - default = build; - }; + installPhase = "touch $out"; + }; + in { + packages."${system}" = { + default = build; + }; - checks = { - inherit build check; - formatting = treefmtEval.config.build.check self; - }; + checks."${system}" = { + inherit build check; + formatting = treefmtEval.config.build.check self; + }; - formatter = treefmtEval.config.build.wrapper; - } - ); + formatter."${system}" = treefmtEval.config.build.wrapper; + }; } # vim: ts=2 diff --git a/package.nix b/package.nix index 0bb826e..c7e8e2a 100644 --- a/package.nix +++ b/package.nix @@ -1,12 +1,7 @@ { stdenv, - system, - # Deps zola, fd, - # Data - facharbeit, - essay, }: stdenv.mkDerivation { pname = "b-peetz.de"; @@ -47,7 +42,7 @@ stdenv.mkDerivation { mkdir --parents ./dead-trees{,/chemistry,/philosophy} { - ${installWriting "kant-and-free-software.pdf" "${essay.outputs.packages."${system}".default}/philosophy/kant_and_free_software.pdf"} + ${installWriting "kant-and-free-software.pdf" "${./src/content/writings/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 "$base" ./dead-trees/kant_and_free_software.pdf @@ -55,7 +50,7 @@ stdenv.mkDerivation { } { - ${installWriting "raman-spectroscopy.pdf" "${facharbeit.outputs.packages."${system}".default}/chemistry/facharbeit.pdf"} + ${installWriting "raman-spectroscopy.pdf" "${./src/content/writings/raman-spectroscopy.pdf}"} # NOTE: This link is for backward compatibility, as I have given out links with that url <2024-07-13> ln --symbolic --relative "$base" ./dead-trees/raman_spectrometer.pdf diff --git a/src/content/writings/kant-and-free-software.pdf b/src/content/writings/kant-and-free-software.pdf Binary files differnew file mode 100644 index 0000000..d13de60 --- /dev/null +++ b/src/content/writings/kant-and-free-software.pdf diff --git a/src/content/writings/raman-spectroscopy.pdf b/src/content/writings/raman-spectroscopy.pdf Binary files differnew file mode 100644 index 0000000..c87b99c --- /dev/null +++ b/src/content/writings/raman-spectroscopy.pdf |