diff --git a/default.nix b/default.nix deleted file mode 100644 index bfe2391..0000000 --- a/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs ? import (import (builtins.fetchTarball https://github.com/input-output-hk/haskell.nix/archive/master.tar.gz)) -, haskellCompiler ? "ghc865" -}: - pkgs.haskell-nix.cabalProject { - src = pkgs.haskell-nix.haskellLib.cleanGit { src = ./.; }; - ghc = pkgs.buildPackages.pkgs.haskell-nix.compiler.${haskellCompiler}; - modules = [ - { packages."fail".components."library".doHaddock = false; - } - ]; - } diff --git a/shell.nix b/shell.nix index ad944dd..0ba64df 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,35 @@ +{ nixpkgs ? import {}, compiler ? "default", doBenchmark ? false }: + let - hsPkgs = import ./default.nix {}; + + inherit (nixpkgs) pkgs; + + f = { mkDerivation, base, directory, filepath, hakyll, HTTP + , stdenv, time + }: + mkDerivation { + pname = "nek0-blog"; + version = "0.1.0.0"; + src = ./.; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath hakyll HTTP time + ]; + homepage = "https://nek0.eu"; + description = "My blog"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }; + + haskellPackages = if compiler == "default" + then pkgs.haskellPackages + else pkgs.haskell.packages.${compiler}; + + variant = if doBenchmark then pkgs.haskell.lib.doBenchmark else pkgs.lib.id; + + drv = variant (haskellPackages.callPackage f {}); + in - hsPkgs.nek0-blog.components.all + + if pkgs.lib.inNixShell then drv.env else drv diff --git a/shell.nix.bak b/shell.nix.bak deleted file mode 100644 index f0081ce..0000000 --- a/shell.nix.bak +++ /dev/null @@ -1,35 +0,0 @@ -{ nixpkgs ? import {}, compiler ? "default", doBenchmark ? false }: - -let - - inherit (nixpkgs) pkgs; - - f = { mkDerivation, base, directory, filepath, hakyll, HTTP - , stdenv, time - }: - mkDerivation { - pname = "nek0-blog"; - version = "0.1.0.0"; - src = ./.; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory filepath hakyll HTTP time - ]; - homepage = "https://nek0.eu"; - description = "My blog"; - license = stdenv.lib.licenses.unfree; - hydraPlatforms = stdenv.lib.platforms.none; - }; - - haskellPackages = if compiler == "default" - then pkgs.haskellPackages - else pkgs.haskell.packages.${compiler}; - - variant = if doBenchmark then pkgs.haskell.lib.doBenchmark else pkgs.lib.id; - - drv = variant (haskellPackages.callPackage f {}); - -in - - if pkgs.lib.inNixShell then drv.env else drv diff --git a/site/contact.md b/site/contact.md index a515442..004b0fe 100644 --- a/site/contact.md +++ b/site/contact.md @@ -16,7 +16,7 @@ platforms, so check them out or get in touch: * [DeviantArt][deviantart] Furthermore You can contact me via [Jabber/XMPP][jabber] at the address -**nek0@jabber.c3d2.de**. +**nek0@jabber.nek0.eu**. [key]: /8ADADB98780B5BAF.asc [jabber]: https://en.wikipedia.org/wiki/XMPP diff --git a/site/posts/2020-03-18-Lockdown.md b/site/posts/2020-03-18-Lockdown.md new file mode 100644 index 0000000..156a950 --- /dev/null +++ b/site/posts/2020-03-18-Lockdown.md @@ -0,0 +1,30 @@ +--- +title: Lockdown +author: nek0 +tags: english +description: In light of recent events +--- + +Hi folks, + +In light of the recent events I would like to make a status update. + +I'm overall ok and am on self-imposed lockdown since March 14th and urged the +hackerspace I usually hang out at to do the same. + +School has been canceled for now and my apprenticeship practice is +transitioning to home office, but I have no information yet, how exactly this +is supposed to work and fear I might have trouble participating, because I have +no Windows licence. All my computers run Linux-based operating systems (NixOS +specifically). + +In the meantime I was able to tackle one bigger project of mine: I am running +my own XMPP-Server based on ejabberd now. Now you can reach me through my new +nek0@jabber.nek0.eu address. + +I hope people around here learn their lessons from this event. A pandemic +can happen anytime, so the healthcare system needs its resources to be able to +tackle it. Universal healthcare is a neccessity which mustn't be run for +profit. + +Stay safe. diff --git a/site/posts/2020-04-28-Building-an-art-portfolio.md b/site/posts/2020-04-28-Building-an-art-portfolio.md new file mode 100644 index 0000000..1d6f981 --- /dev/null +++ b/site/posts/2020-04-28-Building-an-art-portfolio.md @@ -0,0 +1,31 @@ +--- +title: Building an art portfolio +author: nek0 +tags: meta,art,english +description: Long overdue announcement of my art portfolio +--- + +Hi folks! + +I apologize for being so silent the past months. Lockdown does strange things +to me, but it's under control at the moment. I just needed readjustment of +medication. + +Since I am human and can't lie apathetically in a corner all day (which I also +had my good share of) I decided to build a website for my visual pieces of art, +a portfolio, so to speak. You can reach it at . + +The website is built with [Hakyll](https://jaspervdj.be/hakyll), of course, and +I took the opportunity to learn some of the more advanced features and even some +supplementary libraries. I was once again very pleasantly surprised how powerful +this software is. + +Some of the pictures there are related to my ongoing webcomic +[Alitheia Road](https://alitheia-comic.eu/), which I had currently to put on +hold to alleviate pressure from my mind. But It will continue, I promise. I am +gathering ideas and fleshing out storylines for future pages whenever it feels +ok to do so. + +So much for an update from me. + +Stay calm and wash hands. diff --git a/src/Main.hs b/src/Main.hs index e63b6d9..61a4b41 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -120,8 +120,6 @@ main = >>= loadAndApplyTemplate "templates/default.html" archiveCtx -- >>= relativizeUrls - match "templates/*" $ compile templateCompiler - -- feeds create ["atom.xml"] $ do