diff --git a/flake.lock b/flake.lock index 2d614d3..690f8ca 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1667254466, - "narHash": "sha256-YrMQzDVOo+uz5gg1REj2q/uVhJE3WcpkqGiMzh3Da3o=", + "lastModified": 1678426640, + "narHash": "sha256-3Q4KN0XAXQT7YE3A8n3LzLtRNUCo0U++W3gl+5NhKHs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1b4722674c315de0e191d0d79790b4eac51570a1", + "rev": "824f886682fc893e6dbf27114e5001ebf2770ea1", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 4b409da..a797e42 100644 --- a/flake.nix +++ b/flake.nix @@ -1,54 +1,55 @@ { - description = "hakyll-nix-template"; + inputs.nixpkgs.url = "nixpkgs/nixos-22.11"; - nixConfig.bash-prompt = "[nix]λ "; - - inputs.nixpkgs.url = "nixpkgs/nixos-22.05"; - - outputs = { nixpkgs, self }: let + outputs = { self, nixpkgs }: let system = "x86_64-linux"; - overlays = [ (import ./nix/haskell-overlay.nix) ]; - pkgs = import nixpkgs { inherit overlays system; }; + pkgs = nixpkgs.legacyPackages.${system}; in { - overlays = { - haskell-overlay = import ./nix/haskell-overlay.nix; - default = self.overlays.haskell-overlay; - }; + packages.${system} = { + static-site-generator = pkgs.haskellPackages.developPackage { + name = "static-site-generator"; + root = ./.; + }; - packages.${system} = with pkgs.myHaskellPackages; { - inherit ssg website; - default = website; + default = self.packages.${system}.website; + website = pkgs.stdenvNoCC.mkDerivation { + name = "website"; + buildInputs = with pkgs; [ + self.packages.${system}.static-site-generator + graphviz + ]; + + src = pkgs.nix-gitignore.gitignoreSourcePure [ + ".gitignore" + ".git" + ".github" + ] ./.; + + buildPhase = '' + hakyll-site build --verbose + ''; + + installPhase = '' + cp -r dist "$out" + ''; + }; }; apps.${system} = { - hakyll-site = let - drv = self.packages.${system}.ssg; - exePath = "/bin/hakyll-site"; + default = self.apps.${system}.watch-hakyll-site; + watch-hakyll-site = let + ssg = self.packages.${system}.static-site-generator; + drv = pkgs.writeScriptBin "watch-hakyll-site" '' + ${ssg}/bin/static-site-generator watch + ''; in { type = "app"; - program = "${drv}${exePath}"; + program = "${drv}/bin/watch-hakyll-site"; }; - default = self.apps.${system}.hakyll-site; - }; - - devShells.${system}.default = pkgs.myHaskellPackages.shellFor { - packages = p: [ p.ssg ]; - - buildInputs = with pkgs.myHaskellPackages; [ - # ssg - - # Helpful tools for `nix develop` shells - ghcid # https://github.com/ndmitchell/ghcid - haskell-language-server # https://github.com/haskell/haskell-language-server - hlint # https://github.com/ndmitchell/hlint - ormolu # https://github.com/tweag/ormolu - ]; - - withHoogle = true; }; hydraJobs = { - ssg.${system} = self.packages.${system}.ssg; + static-site-generator.${system} = self.packages.${system}.static-site-generator; website.${system} = self.packages.${system}.website; }; }; diff --git a/nix/hakyll.patch b/nix/hakyll.patch deleted file mode 100644 index e69de29..0000000 diff --git a/nix/haskell-overlay.nix b/nix/haskell-overlay.nix deleted file mode 100644 index 9825691..0000000 --- a/nix/haskell-overlay.nix +++ /dev/null @@ -1,68 +0,0 @@ -final: prev: - let - inherit (prev.stdenv) mkDerivation; - inherit (prev.lib.trivial) flip pipe; - inherit (prev.haskell.lib) - appendPatch - appendConfigureFlags - dontCheck - doJailbreak; - - withPatch = flip appendPatch; - withFlags = flip appendConfigureFlags; - - haskellCompiler = "ghc884"; - in { - myHaskellPackages = prev.haskell.packages.${haskellCompiler}.override { - overrides = hpFinal: hpPrev: - rec { - hakyll = pipe hpPrev.hakyll [ - doJailbreak - dontCheck - # (withPatch ./hakyll.patch) - (withFlags [ "-f" "watch" ]) - ]; - - pandoc = pipe hpPrev.pandoc [ - doJailbreak - dontCheck - ]; - - slugger = hpPrev.slugger; - - ssg = hpPrev.callCabal2nix "ssg" ../ssg {}; - - website = prev.stdenv.mkDerivation { - #__contentAddressed = true; # uncomment if using cas: https://www.tweag.io/blog/2020-09-10-nix-cas/ - name = "website"; - buildInputs = [ - ssg - final.graphviz - ]; - src = prev.nix-gitignore.gitignoreSourcePure [ - ../.gitignore - "../.git" - "../.github" - ] ../.; - - # LANG and LOCALE_ARCHIVE are fixes pulled from the community: - # https://github.com/jaspervdj/hakyll/issues/614#issuecomment-411520691 - # https://github.com/NixOS/nix/issues/318#issuecomment-52986702 - # https://github.com/MaxDaten/brutal-recipes/blob/source/default.nix#L24 - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = prev.lib.optionalString - (prev.buildPlatform.libc == "glibc") - "${prev.glibcLocales}/lib/locale/locale-archive"; - - buildPhase = '' - hakyll-site build --verbose - ''; - - installPhase = '' - mkdir -p "$out" - cp -r dist/* "$out" - ''; - }; - }; - }; -} diff --git a/nix/pure-css/default.nix b/nix/pure-css/default.nix deleted file mode 100644 index faa8f8a..0000000 --- a/nix/pure-css/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ pkgs ? import {} }: - -with pkgs.stdenv.lib; - -let - - name = "pure-css"; - version = "v2.0.6"; - - # pull in the code for building npm packages - nodePackages = import ./npm-packages.nix { - inherit pkgs; - inherit (pkgs) stdenv nodejs fetchurl fetchgit; - neededNatives = [ pkgs.python ] ++ pkgs.lib.optional -pkgs.stdenv.isLinux pkgs.utillinux; - self = nodePackages; - }; - - buildModules = [ - nodePackages."bower" - nodePackages."grunt" - nodePackages."grunt-cli" - nodePackages."grunt-contrib-cssmin" - nodePackages."grunt-contrib-clean" - nodePackages."grunt-contrib-copy" - nodePackages."grunt-contrib-concat" - nodePackages."grunt-contrib-compress" - nodePackages."grunt-contrib-csslint" - nodePackages."grunt-contrib-watch" - nodePackages."grunt-css-selectors" - nodePackages."grunt-pure-grids" - nodePackages."grunt-stripmq" - ]; - -in pkgs.stdenv.mkDerivation { - - name = "${name}-${version}"; - - src = pkgs.fetchgit { - url = https://github.com/pure-css/pure; - rev = "refs/tags/v2.0.6"; - sha256 = -"049ac2ef812771852978d11cd5aecac2dd561e97bb16ad89c79eb1e10aa57672"; - }; - - buildInputs = buildModules; - - buildCommand = '' - cp -r $src src - chmod +w src - cd src - grunt - ''; - -} diff --git a/nix/pure-css/npm-packages.nix b/nix/pure-css/npm-packages.nix deleted file mode 100644 index 70d93a5..0000000 --- a/nix/pure-css/npm-packages.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, stdenv, nodejs, fetchurl, fetchgit, neededNatives, self }: - -rec { - - nativeDeps = {}; - - buildNodePackage = import -"${pkgs.path}/pkgs/development/web/nodejs/build-node-package.nix" { - inherit stdenv nodejs neededNatives; - inherit (pkgs) runCommand; - }; - - patchSource = fn: srcAttrs: - let src = fn srcAttrs; in pkgs.runCommand src.name {} '' - mkdir unpack - cd unpack - unpackFile ${src} - chmod -R +w */ - mv */ package 2>/dev/null || true - sed -i -e "s/:\s*\"latest\"/: \"*\"/" -e -"s/:\s*\"\(https\?\|git\(\+\(ssh\|http\|https\)\)\?\):\/\/[^\"]*\"/: -\"*\"/" package/package.json - mv */ $out - ''; - - # Backwards compat - patchLatest = patchSource fetchurl; - -} // import ./purecss-npm-generated.nix { inherit self fetchurl fetchgit; -inherit (pkgs) lib; } diff --git a/ssg/LICENSE b/ssg/LICENSE deleted file mode 100644 index 1009f96..0000000 --- a/ssg/LICENSE +++ /dev/null @@ -1,29 +0,0 @@ -BSD 3-Clause License - -Copyright (c) 2020, Robert Pearce -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/ssg/ssg.cabal b/static-site-generator.cabal similarity index 86% rename from ssg/ssg.cabal rename to static-site-generator.cabal index ff7daf9..f623332 100644 --- a/ssg/ssg.cabal +++ b/static-site-generator.cabal @@ -1,14 +1,14 @@ cabal-version: 2.4 -name: ssg +name: static-site-generator version: 0.1.0.0 build-type: Simple license: BSD-3-Clause license-file: LICENSE -executable hakyll-site +executable static-site-generator main-is: Main.hs - hs-source-dirs: src + hs-source-dirs: static-site-generator build-depends: base >= 4.8 , hakyll >= 4.15 , pandoc >= 2.14 diff --git a/ssg/src/Formats/Gogen.hs b/static-site-generator/Formats/Gogen.hs similarity index 100% rename from ssg/src/Formats/Gogen.hs rename to static-site-generator/Formats/Gogen.hs diff --git a/ssg/src/Formats/Posts.hs b/static-site-generator/Formats/Posts.hs similarity index 100% rename from ssg/src/Formats/Posts.hs rename to static-site-generator/Formats/Posts.hs diff --git a/ssg/src/Main.hs b/static-site-generator/Main.hs similarity index 97% rename from ssg/src/Main.hs rename to static-site-generator/Main.hs index 8970b2f..f792cf3 100644 --- a/ssg/src/Main.hs +++ b/static-site-generator/Main.hs @@ -38,7 +38,7 @@ root = siteName :: String siteName = - "Nani~" + "Nani" config :: Configuration config = @@ -47,9 +47,9 @@ config = , ignoreFile = const False , previewHost = "127.0.0.1" , previewPort = 8000 - , providerDirectory = "src" - , storeDirectory = "ssg/_cache" - , tmpDirectory = "ssg/_tmp" + , providerDirectory = "www" + , storeDirectory = "/tmp/nani-wtf-hakyll/store" + , tmpDirectory = "/tmp/nani-wtf-hakyll/tmp" } -------------------------------------------------------------------------------- @@ -57,7 +57,7 @@ config = main :: IO () main = hakyllWith config $ do - fileHashes <- preprocess (mapKeys (fromFilePath . drop 4 . toFilePath) <$> mkFileHashes "src/posts") + fileHashes <- preprocess (mapKeys (fromFilePath . drop 4 . toFilePath) <$> mkFileHashes "www/posts") forM_ [ "CNAME" @@ -279,4 +279,4 @@ feedConfiguration = , feedAuthorName = "h7x4" , feedAuthorEmail = "h7x4@protonmail.com" , feedRoot = root - } \ No newline at end of file + } diff --git a/ssg/src/Preprocessing/Graphviz.hs b/static-site-generator/Preprocessing/Graphviz.hs similarity index 100% rename from ssg/src/Preprocessing/Graphviz.hs rename to static-site-generator/Preprocessing/Graphviz.hs diff --git a/ssg/src/Preprocessing/LogoLinks.hs b/static-site-generator/Preprocessing/LogoLinks.hs similarity index 100% rename from ssg/src/Preprocessing/LogoLinks.hs rename to static-site-generator/Preprocessing/LogoLinks.hs diff --git a/ssg/src/Util/Hakyll/Context.hs b/static-site-generator/Util/Hakyll/Context.hs similarity index 100% rename from ssg/src/Util/Hakyll/Context.hs rename to static-site-generator/Util/Hakyll/Context.hs diff --git a/ssg/src/Util/Hakyll/Routes.hs b/static-site-generator/Util/Hakyll/Routes.hs similarity index 100% rename from ssg/src/Util/Hakyll/Routes.hs rename to static-site-generator/Util/Hakyll/Routes.hs diff --git a/ssg/src/Util/Hash.hs b/static-site-generator/Util/Hash.hs similarity index 100% rename from ssg/src/Util/Hash.hs rename to static-site-generator/Util/Hash.hs diff --git a/src/2022-03-27-debug.md b/www/2022-03-27-debug.md similarity index 100% rename from src/2022-03-27-debug.md rename to www/2022-03-27-debug.md diff --git a/src/_config.yaml b/www/_config.yaml similarity index 100% rename from src/_config.yaml rename to www/_config.yaml diff --git a/src/css/default.css b/www/css/default.css similarity index 100% rename from src/css/default.css rename to www/css/default.css diff --git a/src/css/styles.css b/www/css/styles.css similarity index 100% rename from src/css/styles.css rename to www/css/styles.css diff --git a/src/gogen/are.md b/www/gogen/are.md similarity index 100% rename from src/gogen/are.md rename to www/gogen/are.md diff --git a/src/gogen/connectors/kara.md b/www/gogen/connectors/kara.md similarity index 100% rename from src/gogen/connectors/kara.md rename to www/gogen/connectors/kara.md diff --git a/src/gogen/connectors/keredomo.md b/www/gogen/connectors/keredomo.md similarity index 100% rename from src/gogen/connectors/keredomo.md rename to www/gogen/connectors/keredomo.md diff --git a/src/gogen/connectors/nara.md b/www/gogen/connectors/nara.md similarity index 100% rename from src/gogen/connectors/nara.md rename to www/gogen/connectors/nara.md diff --git a/src/gogen/dake.md b/www/gogen/dake.md similarity index 100% rename from src/gogen/dake.md rename to www/gogen/dake.md diff --git a/src/gogen/dame.md b/www/gogen/dame.md similarity index 100% rename from src/gogen/dame.md rename to www/gogen/dame.md diff --git a/src/gogen/dore.md b/www/gogen/dore.md similarity index 100% rename from src/gogen/dore.md rename to www/gogen/dore.md diff --git a/src/gogen/hodo.md b/www/gogen/hodo.md similarity index 100% rename from src/gogen/hodo.md rename to www/gogen/hodo.md diff --git a/src/gogen/hou.md b/www/gogen/hou.md similarity index 100% rename from src/gogen/hou.md rename to www/gogen/hou.md diff --git a/src/gogen/imada.md b/www/gogen/imada.md similarity index 100% rename from src/gogen/imada.md rename to www/gogen/imada.md diff --git a/src/gogen/ippai.md b/www/gogen/ippai.md similarity index 100% rename from src/gogen/ippai.md rename to www/gogen/ippai.md diff --git a/src/gogen/kichinto.md b/www/gogen/kichinto.md similarity index 100% rename from src/gogen/kichinto.md rename to www/gogen/kichinto.md diff --git a/src/gogen/kore.md b/www/gogen/kore.md similarity index 100% rename from src/gogen/kore.md rename to www/gogen/kore.md diff --git a/src/gogen/maji.md b/www/gogen/maji.md similarity index 100% rename from src/gogen/maji.md rename to www/gogen/maji.md diff --git a/src/gogen/mama.md b/www/gogen/mama.md similarity index 100% rename from src/gogen/mama.md rename to www/gogen/mama.md diff --git a/src/gogen/masa.md b/www/gogen/masa.md similarity index 100% rename from src/gogen/masa.md rename to www/gogen/masa.md diff --git a/src/gogen/motto.md b/www/gogen/motto.md similarity index 100% rename from src/gogen/motto.md rename to www/gogen/motto.md diff --git a/src/gogen/mou.md b/www/gogen/mou.md similarity index 100% rename from src/gogen/mou.md rename to www/gogen/mou.md diff --git a/src/gogen/nado.md b/www/gogen/nado.md similarity index 100% rename from src/gogen/nado.md rename to www/gogen/nado.md diff --git a/src/gogen/nanika.md b/www/gogen/nanika.md similarity index 100% rename from src/gogen/nanika.md rename to www/gogen/nanika.md diff --git a/src/gogen/osoraku.md b/www/gogen/osoraku.md similarity index 100% rename from src/gogen/osoraku.md rename to www/gogen/osoraku.md diff --git a/src/gogen/particles/ga.md b/www/gogen/particles/ga.md similarity index 100% rename from src/gogen/particles/ga.md rename to www/gogen/particles/ga.md diff --git a/src/gogen/particles/to.md b/www/gogen/particles/to.md similarity index 100% rename from src/gogen/particles/to.md rename to www/gogen/particles/to.md diff --git a/src/gogen/particles/toka.md b/www/gogen/particles/toka.md similarity index 100% rename from src/gogen/particles/toka.md rename to www/gogen/particles/toka.md diff --git a/src/gogen/particles/ya.md b/www/gogen/particles/ya.md similarity index 100% rename from src/gogen/particles/ya.md rename to www/gogen/particles/ya.md diff --git a/src/gogen/sara.md b/www/gogen/sara.md similarity index 100% rename from src/gogen/sara.md rename to www/gogen/sara.md diff --git a/src/gogen/shibaraku.md b/www/gogen/shibaraku.md similarity index 100% rename from src/gogen/shibaraku.md rename to www/gogen/shibaraku.md diff --git a/src/gogen/shika.md b/www/gogen/shika.md similarity index 100% rename from src/gogen/shika.md rename to www/gogen/shika.md diff --git a/src/gogen/sore.md b/www/gogen/sore.md similarity index 100% rename from src/gogen/sore.md rename to www/gogen/sore.md diff --git a/src/gogen/sude.md b/www/gogen/sude.md similarity index 100% rename from src/gogen/sude.md rename to www/gogen/sude.md diff --git a/src/gogen/sugoi.md b/www/gogen/sugoi.md similarity index 100% rename from src/gogen/sugoi.md rename to www/gogen/sugoi.md diff --git a/src/gogen/takusan.md b/www/gogen/takusan.md similarity index 100% rename from src/gogen/takusan.md rename to www/gogen/takusan.md diff --git a/src/gogen/tokoro.md b/www/gogen/tokoro.md similarity index 100% rename from src/gogen/tokoro.md rename to www/gogen/tokoro.md diff --git a/src/gogen/totemo.md b/www/gogen/totemo.md similarity index 100% rename from src/gogen/totemo.md rename to www/gogen/totemo.md diff --git a/src/gogen/tsune.md b/www/gogen/tsune.md similarity index 100% rename from src/gogen/tsune.md rename to www/gogen/tsune.md diff --git a/src/gogen/tsuto.md b/www/gogen/tsuto.md similarity index 100% rename from src/gogen/tsuto.md rename to www/gogen/tsuto.md diff --git a/src/gogen/verb_forms/reba.md b/www/gogen/verb_forms/reba.md similarity index 100% rename from src/gogen/verb_forms/reba.md rename to www/gogen/verb_forms/reba.md diff --git a/src/gogen/verb_forms/sareru.md b/www/gogen/verb_forms/sareru.md similarity index 100% rename from src/gogen/verb_forms/sareru.md rename to www/gogen/verb_forms/sareru.md diff --git a/src/gogen/verb_forms/saseru.md b/www/gogen/verb_forms/saseru.md similarity index 100% rename from src/gogen/verb_forms/saseru.md rename to www/gogen/verb_forms/saseru.md diff --git a/src/gogen/verb_forms/tara.md b/www/gogen/verb_forms/tara.md similarity index 100% rename from src/gogen/verb_forms/tara.md rename to www/gogen/verb_forms/tara.md diff --git a/src/gogen/verb_forms/temiru.md b/www/gogen/verb_forms/temiru.md similarity index 100% rename from src/gogen/verb_forms/temiru.md rename to www/gogen/verb_forms/temiru.md diff --git a/src/gogen/verbs/ageru.md b/www/gogen/verbs/ageru.md similarity index 100% rename from src/gogen/verbs/ageru.md rename to www/gogen/verbs/ageru.md diff --git a/src/gogen/verbs/dasu.md b/www/gogen/verbs/dasu.md similarity index 100% rename from src/gogen/verbs/dasu.md rename to www/gogen/verbs/dasu.md diff --git a/src/gogen/verbs/itadaku.md b/www/gogen/verbs/itadaku.md similarity index 100% rename from src/gogen/verbs/itadaku.md rename to www/gogen/verbs/itadaku.md diff --git a/src/gogen/verbs/kakaru.md b/www/gogen/verbs/kakaru.md similarity index 100% rename from src/gogen/verbs/kakaru.md rename to www/gogen/verbs/kakaru.md diff --git a/src/gogen/verbs/kureru.md b/www/gogen/verbs/kureru.md similarity index 100% rename from src/gogen/verbs/kureru.md rename to www/gogen/verbs/kureru.md diff --git a/src/gogen/verbs/morau.md b/www/gogen/verbs/morau.md similarity index 100% rename from src/gogen/verbs/morau.md rename to www/gogen/verbs/morau.md diff --git a/src/gogen/verbs/shitagau.md b/www/gogen/verbs/shitagau.md similarity index 100% rename from src/gogen/verbs/shitagau.md rename to www/gogen/verbs/shitagau.md diff --git a/src/gogen/verbs/sugiru.md b/www/gogen/verbs/sugiru.md similarity index 100% rename from src/gogen/verbs/sugiru.md rename to www/gogen/verbs/sugiru.md diff --git a/src/gogen/verbs/suru.md b/www/gogen/verbs/suru.md similarity index 100% rename from src/gogen/verbs/suru.md rename to www/gogen/verbs/suru.md diff --git a/src/gogen/verbs/tsukeru.md b/www/gogen/verbs/tsukeru.md similarity index 100% rename from src/gogen/verbs/tsukeru.md rename to www/gogen/verbs/tsukeru.md diff --git a/src/gogen/verbs/tsumoru.md b/www/gogen/verbs/tsumoru.md similarity index 100% rename from src/gogen/verbs/tsumoru.md rename to www/gogen/verbs/tsumoru.md diff --git a/src/gogen/yahari.md b/www/gogen/yahari.md similarity index 100% rename from src/gogen/yahari.md rename to www/gogen/yahari.md diff --git a/src/gogen/yori.md b/www/gogen/yori.md similarity index 100% rename from src/gogen/yori.md rename to www/gogen/yori.md diff --git a/src/gogen/you.md b/www/gogen/you.md similarity index 100% rename from src/gogen/you.md rename to www/gogen/you.md diff --git a/src/images/header-nani.svg b/www/images/header-nani.svg similarity index 100% rename from src/images/header-nani.svg rename to www/images/header-nani.svg diff --git a/src/images/index_header_background.jpg b/www/images/index_header_background.jpg similarity index 100% rename from src/images/index_header_background.jpg rename to www/images/index_header_background.jpg diff --git a/src/images/logos/dart.svg b/www/images/logos/dart.svg similarity index 100% rename from src/images/logos/dart.svg rename to www/images/logos/dart.svg diff --git a/src/images/logos/gitea.svg b/www/images/logos/gitea.svg similarity index 100% rename from src/images/logos/gitea.svg rename to www/images/logos/gitea.svg diff --git a/src/images/logos/github.svg b/www/images/logos/github.svg similarity index 100% rename from src/images/logos/github.svg rename to www/images/logos/github.svg diff --git a/src/images/logos/gitlab.svg b/www/images/logos/gitlab.svg similarity index 100% rename from src/images/logos/gitlab.svg rename to www/images/logos/gitlab.svg diff --git a/src/images/logos/haskell_orange.svg b/www/images/logos/haskell_orange.svg similarity index 100% rename from src/images/logos/haskell_orange.svg rename to www/images/logos/haskell_orange.svg diff --git a/src/images/logos/haskell_purple.svg b/www/images/logos/haskell_purple.svg similarity index 100% rename from src/images/logos/haskell_purple.svg rename to www/images/logos/haskell_purple.svg diff --git a/src/images/logos/nani.svg b/www/images/logos/nani.svg similarity index 100% rename from src/images/logos/nani.svg rename to www/images/logos/nani.svg diff --git a/src/images/logos/nix_options.svg b/www/images/logos/nix_options.svg similarity index 100% rename from src/images/logos/nix_options.svg rename to www/images/logos/nix_options.svg diff --git a/src/images/logos/nix_packages.svg b/www/images/logos/nix_packages.svg similarity index 100% rename from src/images/logos/nix_packages.svg rename to www/images/logos/nix_packages.svg diff --git a/src/images/logos/npm.svg b/www/images/logos/npm.svg similarity index 100% rename from src/images/logos/npm.svg rename to www/images/logos/npm.svg diff --git a/src/images/logos/reddit.svg b/www/images/logos/reddit.svg similarity index 100% rename from src/images/logos/reddit.svg rename to www/images/logos/reddit.svg diff --git a/src/images/logos/rust.svg b/www/images/logos/rust.svg similarity index 100% rename from src/images/logos/rust.svg rename to www/images/logos/rust.svg diff --git a/src/images/logos/stack_overflow.svg b/www/images/logos/stack_overflow.svg similarity index 100% rename from src/images/logos/stack_overflow.svg rename to www/images/logos/stack_overflow.svg diff --git a/src/images/logos/wikipedia.svg b/www/images/logos/wikipedia.svg similarity index 100% rename from src/images/logos/wikipedia.svg rename to www/images/logos/wikipedia.svg diff --git a/www/images/nani.png b/www/images/nani.png new file mode 100644 index 0000000..a3f4c1c Binary files /dev/null and b/www/images/nani.png differ diff --git a/src/images/nani.svg b/www/images/nani.svg similarity index 100% rename from src/images/nani.svg rename to www/images/nani.svg diff --git a/src/images/nix_banner.png b/www/images/nix_banner.png similarity index 100% rename from src/images/nix_banner.png rename to www/images/nix_banner.png diff --git a/src/index.html b/www/index.html similarity index 100% rename from src/index.html rename to www/index.html diff --git a/src/js/script.js b/www/js/script.js similarity index 100% rename from src/js/script.js rename to www/js/script.js diff --git a/src/js/ui.js b/www/js/ui.js similarity index 100% rename from src/js/ui.js rename to www/js/ui.js diff --git a/src/posts/2022-10-16-tangling-org-files.md b/www/posts/2022-10-16-tangling-org-files.md similarity index 100% rename from src/posts/2022-10-16-tangling-org-files.md rename to www/posts/2022-10-16-tangling-org-files.md diff --git a/src/posts/2022-10-16-the-arrow-operator.md b/www/posts/2022-10-16-the-arrow-operator.md similarity index 100% rename from src/posts/2022-10-16-the-arrow-operator.md rename to www/posts/2022-10-16-the-arrow-operator.md diff --git a/src/robots.txt b/www/robots.txt similarity index 100% rename from src/robots.txt rename to www/robots.txt diff --git a/src/templates/default.html b/www/templates/default.html similarity index 100% rename from src/templates/default.html rename to www/templates/default.html diff --git a/src/templates/gogen.html b/www/templates/gogen.html similarity index 100% rename from src/templates/gogen.html rename to www/templates/gogen.html diff --git a/src/templates/post.html b/www/templates/post.html similarity index 100% rename from src/templates/post.html rename to www/templates/post.html diff --git a/src/templates/sitemap.xml b/www/templates/sitemap.xml similarity index 100% rename from src/templates/sitemap.xml rename to www/templates/sitemap.xml