diff --git a/.gitignore b/.gitignore index 4abad8d..626d602 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +result dist-newstyle .cache _site diff --git a/README.md b/README.md index 0f63246..1b84fa0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ my personal website, made with [achille](https://acatalepsie.fr/projects/achille). +``` +nix-shell --attr env release.nix +nix-env -if release.nix +``` + ## todo - dark theme diff --git a/acatalepsie.nix b/acatalepsie.nix new file mode 100644 index 0000000..e3bc6b6 --- /dev/null +++ b/acatalepsie.nix @@ -0,0 +1,17 @@ +{ mkDerivation, achille, aeson, base, binary, bytestring +, containers, data-default, feed, filepath, lucid, pandoc +, pandoc-types, sort, stdenv, text, time, yaml +}: +mkDerivation { + pname = "site"; + version = "0.1.0.0"; + src = ./.; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + achille aeson base binary bytestring containers data-default feed + filepath lucid pandoc pandoc-types sort text time yaml + ]; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; +} diff --git a/cabal.project b/cabal.project deleted file mode 100644 index 6ed4d7b..0000000 --- a/cabal.project +++ /dev/null @@ -1,6 +0,0 @@ -packages: - ./ - ../achille - -package site - optimization: True diff --git a/content/assets/theme.css b/content/assets/theme.css index 749a250..869b774 100644 --- a/content/assets/theme.css +++ b/content/assets/theme.css @@ -13,7 +13,7 @@ } body { - font: 15px Inter, sans-serif; + font: 15px Inter, sans-serif, "é"; line-height: 1.54; margin: 0; height: 100vh; diff --git a/release.nix b/release.nix new file mode 100644 index 0000000..264ece0 --- /dev/null +++ b/release.nix @@ -0,0 +1,16 @@ +let + compiler = "ghc884"; + rev = "b78e08e981a9ad31036fc6c6fb880c1315b4ebea"; + overlay = _: pkgs: { + haskellPackages = pkgs.haskellPackages.override { + overrides = self: super: rec { + achille = self.callPackage ../achille/achille.nix {}; + }; + }; + }; + nixpkgs = + import (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz"; + }) { overlays = [ overlay ] ; }; + +in nixpkgs.haskellPackages.callPackage ./acatalepsie.nix {} diff --git a/site.cabal b/site.cabal index 344e89b..266552d 100644 --- a/site.cabal +++ b/site.cabal @@ -17,7 +17,7 @@ executable site , Visual , Templates , Readings - build-depends: base >=4.12 && <4.13 + build-depends: base >= 4.12 && < 5 , filepath , achille , data-default