diff options
| -rw-r--r-- | default.nix | 31 | ||||
| -rw-r--r-- | flake.lock | 62 | ||||
| -rw-r--r-- | flake.nix | 42 | ||||
| -rw-r--r-- | source/99_result/main.css | 4 | ||||
| -rw-r--r-- | source/99_result/overview.xsl | 6 |
5 files changed, 110 insertions, 35 deletions
diff --git a/default.nix b/default.nix deleted file mode 100644 index 173d6bb..0000000 --- a/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ pkgs ? import <nixpkgs> { }, mypkgs ? import <mypkgs> { }, ... }: - -pkgs.stdenv.mkDerivation { - name = "Overview"; - - src = ./.; - LANG = "en_US.UTF-8"; - - buildInputs = [ - pkgs.pandoc - pkgs.highlight - mypkgs.katex-wrapper - mypkgs.make-xslt - ]; - - installPhase = let - blog_feed = builtins.fetchurl { - url = "https://blog.kummerlaender.eu/atom.xml"; - }; - blip_feed = builtins.fetchurl { - url = "https://blip.kummerlaender.eu/timeline.xml"; - }; - in '' - cp ${blog_feed} source/00_content/blog_feed.xml - cp ${blip_feed} source/00_content/blip_feed.xml - - make-xslt - mkdir $out - cp -Lr target/99_result/* $out - ''; -} diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..7d6420a --- /dev/null +++ b/flake.lock @@ -0,0 +1,62 @@ +{ + "nodes": { + "mypkgs": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1629652608, + "narHash": "sha256-eNcsdqMyK/Q3P0Tj16uDNcQzKIFf4CJkM7qTq3BdtF0=", + "ref": "refs/heads/master", + "rev": "fb63603b5eec859c84464e1a7f6f14931303f679", + "revCount": 52, + "type": "git", + "url": "https://code.kummerlaender.eu/pkgs" + }, + "original": { + "type": "git", + "url": "https://code.kummerlaender.eu/pkgs" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1629271619, + "narHash": "sha256-by9D3OkEKk4rOzJIMbC0uP2wP3Bt81auP5xmbmPg2a8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7bbca9877caed472c6b5866ea09302cfcdce3dbf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-21.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "mypkgs": "mypkgs", + "stable": "stable" + } + }, + "stable": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-21.05", + "repo": "nixpkgs", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..5c5e945 --- /dev/null +++ b/flake.nix @@ -0,0 +1,42 @@ +{ + description = "kummerlaender.eu"; + + inputs = { + stable.url = github:NixOS/nixpkgs/nixos-21.05; + mypkgs.url = git+https://code.kummerlaender.eu/pkgs; + }; + + outputs = { self, stable, mypkgs, ... }: let + pkgs = stable.legacyPackages.x86_64-linux; + in { + defaultPackage.x86_64-linux = pkgs.stdenv.mkDerivation { + name = "Overview"; + + src = ./.; + LANG = "en_US.UTF-8"; + + buildInputs = [ + pkgs.pandoc + pkgs.highlight + mypkgs.katex-wrapper + mypkgs.make-xslt + ]; + + installPhase = let + blog_feed = builtins.fetchurl { + url = "https://blog.kummerlaender.eu/atom.xml"; + }; + blip_feed = builtins.fetchurl { + url = "https://blip.kummerlaender.eu/timeline.xml"; + }; + in '' + cp ${blog_feed} source/00_content/blog_feed.xml + cp ${blip_feed} source/00_content/blip_feed.xml + + make-xslt + mkdir $out + cp -Lr target/99_result/* $out + ''; + }; + }; +} diff --git a/source/99_result/main.css b/source/99_result/main.css index 8675d16..d523253 100644 --- a/source/99_result/main.css +++ b/source/99_result/main.css @@ -27,8 +27,8 @@ sub{vertical-align:baseline;position:relative;top:0.4em} #content p img{padding:.2em;border:.1em solid #e3e8e8;display:block;margin-left:auto;margin-right:auto;max-width:95%} #introduction{margin-top:1.5em;overflow:hidden} -#introduction img{border-radius:0.5em;margin-right:1.5em;float:left;width:12em;height:12em} -#introduction p{width:31.5em;float:right} +#introduction img{border-radius:0.5em;margin-right:1em;float:left;width:13em;height:13em} +#introduction p{width:30.5em;float:right} #introduction .greeting{font:bold 1.1em 'Oswald',sans-serif;display:inline-block} .info{font:normal .8em 'Oswald',sans-serif;margin-bottom:.5em;display:block} diff --git a/source/99_result/overview.xsl b/source/99_result/overview.xsl index a2cf9f9..ccd483d 100644 --- a/source/99_result/overview.xsl +++ b/source/99_result/overview.xsl @@ -150,9 +150,11 @@ </div> <div id="introduction"> - <img src="https://static.kummerlaender.eu/media/me_in_the_garden.jpeg"/> + <img src="https://static.kummerlaender.eu/media/me_in_the_highlands_square.jpg"/> <p> - <span class="greeting">Hi there!</span> My name is Adrian Kummerländer and I am a software developer currently studying mathematics in Karlsruhe. On these pages you will find <a href="https://blog.kummerlaender.eu">blog articles</a> covering amongst other topics some of my experiences in software development, open source and related tinkerings as well as <a href="https://code.kummerlaender.eu">repositories</a> and information on some of my personal <a href="https://tree.kummerlaender.eu/projects">projects</a>. If you have any comments or questions feel free to <a href="https://tree.kummerlaender.eu/contact">reach out</a>. I hope you will find something here worth your time. + <span class="greeting">Hi there!</span> My name is Adrian Kummerländer. + I am a software developer by vocation and a mathematician by degree, currently pursuing a doctorate at <a href="https://www.lbrg.kit.edu/">LBRG</a> in the intersection between HPC and LBM. + On these pages you will find <a href="https://blog.kummerlaender.eu">articles</a> covering some of my experiences in software development and related tinkerings as well as <a href="https://code.kummerlaender.eu">repositories</a> and information on some of my personal <a href="https://tree.kummerlaender.eu/projects">projects</a>. If you have any comments or questions feel free to <a href="https://tree.kummerlaender.eu/contact">reach out</a>. I hope you will find something here worth your time. </p> </div> |