Add shell.nix

contact.markdown

@@ -8,3 +8,4 @@ I live in Espoo Finland. You can contact me on any of the following services.
 - **Slack**: masser@functionalprogramming.slack.com
 - **IRC**: MasseR@freenode
 - **Mastodon**: MasseR@mastodon.social
+- **Keybase**: [https://keybase.io/MasseR](https://keybase.io/MasseR)

js/api.js

@@ -1,22 +0,0 @@
-
-var getApiIpfsCurrent = function(onSuccess, onError) {
-  var xhr = new XMLHttpRequest();
-  xhr.open('GET', '/api/ipfs/current', true);
-  xhr.setRequestHeader('Accept', 'application/json');
-  xhr.onreadystatechange = function () {
-    var res = null;
-    if (xhr.readyState === 4) {
-      if (xhr.status === 204 || xhr.status === 205) {
-        onSuccess();
-      } else if (xhr.status >= 200 && xhr.status < 300) {
-        try { res = JSON.parse(xhr.responseText); } catch (e) { onError(e); }
-        if (res) onSuccess(res);
-      } else {
-        try { res = JSON.parse(xhr.responseText); } catch (e) { onError(e); }
-        if (res) onError(res);
-      }
-    }
-  };
-  xhr.send(null);
-};
-

js/app.js

@@ -1,10 +0,0 @@
-$(document).ready(function() {
-    var success = function(x) {
-	$("#ipfs > em").html(x);
-    };
-    var error = function(x) {
-	$("#ipfs").hide();
-	console.log("ipfs hash not found: " + x);
-    };
-    getApiIpfsCurrent(success, error);
-});

nixpkgs.json

@@ -0,0 +1,7 @@
+{
+  "url": "https://github.com/NixOS/nixpkgs",
+  "rev": "7e1f60dfbba67b975d1a77d710a6f1437fd9709c",
+  "date": "2020-02-01T09:20:37-05:00",
+  "sha256": "0vk55459iljr5dzwnr5661l44b0wdc15952lk2rjcmxr1620yr5v",
+  "fetchSubmodules": false
+}

release.nix

@@ -1,8 +1,32 @@
-{ pkgs ? import <nixpkgs> {} }:
+let
+  pin = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
+  pinnedPkgs = with pin; import (builtins.fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
+    inherit sha256;
+  }) {};
+
+in
+
+{ pkgs ? pinnedPkgs }:
 
 let
   haskellPackages = pkgs.haskellPackages;
   site = pkgs.callPackage ./default.nix {};
+  website = with pkgs; stdenv.mkDerivation {
+    pname = "rauhala.info";
+    version = "0.1.0";
+    src = lib.cleanSource ./.;
+    LANG = "en_US.UTF-8";
+    LOCALE_ARCHIVE = lib.optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
+    buildPhase = ''
+      ${site}/bin/site clean
+      ${site}/bin/site build
+    '';
+    installPhase = ''
+      mkdir -p $out/share/
+      mv _site $out/share/html
+    '';
+  };
   shell = pkgs.buildEnv {
     name = "site-shell";
     paths = [];
@@ -16,6 +40,5 @@ let
 in
 
 {
-  site = site;
-  shell = shell;
+  inherit site shell website;
 }

shell.nix

@@ -0,0 +1,2 @@
+(import ./release.nix {}).shell
+

site.hs

@@ -8,7 +8,11 @@ import           Data.Time (formatTime, defaultTimeLocale)
 
 --------------------------------------------------------------------------------
 main :: IO ()
-main = hakyllWith defaultConfiguration{ deployCommand = "ipfs add -Q -r _site" } $do
+main = hakyllWith defaultConfiguration $ do
+    match "well-known/*" $ do
+        route (customRoute (prepend '.'. toFilePath))
+        compile copyFileCompiler
+
     match "images/*" $ do
         route   idRoute
         compile copyFileCompiler
@@ -31,40 +35,6 @@ main = hakyllWith defaultConfiguration{ deployCommand = "ipfs add -Q -r _site" }
             >>= loadAndApplyTemplate "templates/default.html" defaultContext
             >>= relativizeUrls
 
-    match "posts/incomplete/*" $ do
-      route $ setExtension "html"
-      compile $ pandocCompiler
-        >>= loadAndApplyTemplate "templates/post.html"    postCtx
-        >>= loadAndApplyTemplate "templates/default.html" postCtx
-        >>= relativizeUrls
-
-    match "posts/guides/*" $ do
-      route $ setExtension "html"
-      compile $ pandocCompiler
-        >>= loadAndApplyTemplate "templates/post.html"    postCtx
-        >>= loadAndApplyTemplate "templates/default.html" postCtx
-        >>= relativizeUrls
-
-    match "posts/brainstorming/*" $ do
-      route $ setExtension "html"
-      compile $ pandocCompiler
-        >>= loadAndApplyTemplate "templates/post.html"    postCtx
-        >>= loadAndApplyTemplate "templates/default.html" postCtx
-        >>= relativizeUrls
-
-    create ["guides.html"] $ do
-        route idRoute
-        compile $ do
-            posts <- modFirst =<< loadAll "posts/guides/*"
-            let archiveCtx =
-                    listField "posts" postCtx (return posts) `mappend`
-                    constField "title" "Guides"            `mappend`
-                    defaultContext
-
-            makeItem ""
-                >>= loadAndApplyTemplate "templates/guides.html" archiveCtx
-                >>= loadAndApplyTemplate "templates/default.html" archiveCtx
-                >>= relativizeUrls
 
 
     match "templates/*" $ compile templateBodyCompiler
@@ -85,3 +55,6 @@ postCtx =
     modifiedField key format = field key $ \i -> do
       time <- getItemModificationTime $ itemIdentifier i
       return $ formatTime defaultTimeLocale format time
+
+prepend :: a -> [a] -> [a]
+prepend = (:)

templates/default.html

@@ -10,9 +10,9 @@
     </head>
     <body>
         <header>
-            <div class="logo">
-                <a href="/">rauhala.info</a>
-            </div>
+            <!-- <div class="logo"> -->
+            <!--     <a href="/">rauhala.info</a> -->
+            <!-- </div> -->
             <nav>
                 <!-- Git logo from https://git-scm.com/downloads/logos -->
                 <!-- Logo by Jason Long -->
@@ -29,10 +29,6 @@
         <footer>
             Site proudly generated by
             <a href="http://jaspervdj.be/hakyll">Hakyll</a>
-	    <span id="ipfs">and found on IPFS as <em></em></ipfs>
         </footer>
     </body>
-    <script type="application/javascript" src="/js/jquery-3.3.1.min.js"></script>
-    <script type="application/javascript" src="/js/api.js"></script>
-    <script type="application/javascript" src="/js/app.js"></script>
 </html>

well-known/keybase.txt

@@ -0,0 +1,56 @@
+==================================================================
+https://keybase.io/masser
+--------------------------------------------------------------------
+
+I hereby claim:
+
+  * I am an admin of https://masser.keybase.pub
+  * I am masser (https://keybase.io/masser) on keybase.
+  * I have a public key ASD7WFMicMJhoArgnvPuR7Dc92WStIUWWXcyngnsTE_IaQo
+
+To do so, I am signing this object:
+
+{
+  "body": {
+    "key": {
+      "eldest_kid": "01202eb5d3b8d2fc63e4bc9c6edefb3a38f1043dfdc44a7268393951fe0ea5214cf00a",
+      "host": "keybase.io",
+      "kid": "0120fb58532270c261a00ae09ef3ee47b0dcf76592b485165977329e09ec4c4fc8690a",
+      "uid": "b01557931e13482e9e646593a64e9119",
+      "username": "masser"
+    },
+    "merkle_root": {
+      "ctime": 1580587604,
+      "hash": "890506579950548b2aa6fd0f35850b9fdb1d064786714f18515d0e3089cdc2458c5fe847d40ca71c2e021ca11677de055ac97804c53d1bef89432f88b57599d4",
+      "hash_meta": "104419595abc52918530f85495417faf35c7a5a608d6730bf53152dfa7288970",
+      "seqno": 14451686
+    },
+    "service": {
+      "entropy": "QIvRp0qNOIZFplyzXERiwp75",
+      "hostname": "masser.keybase.pub",
+      "protocol": "https:"
+    },
+    "type": "web_service_binding",
+    "version": 2
+  },
+  "client": {
+    "name": "keybase.io go client",
+    "version": "4.3.1"
+  },
+  "ctime": 1580587641,
+  "expire_in": 504576000,
+  "prev": "c99f66ba0bfa7ff6be736e24691c8007b0db41b6036b7f1e5f9335ab7f3550f4",
+  "seqno": 34,
+  "tag": "signature"
+}
+
+which yields the signature:
+
+hKRib2R5hqhkZXRhY2hlZMOpaGFzaF90eXBlCqNrZXnEIwEg+1hTInDCYaAK4J7z7kew3PdlkrSFFll3Mp4J7ExPyGkKp3BheWxvYWTESpcCIsQgyZ9mugv6f/a+c24kaRyAB7DbQbYDa38eX5M1q381UPTEIH8FtgpzXt/JJxrhAYknW7xL4+K57JBJnbhFpXWAfEH5AgHCo3NpZ8RApEnmCcZApdOTf+XAHRbbgoysAZHfyTHamWC/BEHKuqEf/BlUFSxo6ASa/YC+Y2sMJfW2iRFlP2bs822TyJTBA6hzaWdfdHlwZSCkaGFzaIKkdHlwZQildmFsdWXEINm3yJdAbmbGJd03EnpuKVh2JzkI8WkngbWbAxbbR0MMo3RhZ80CAqd2ZXJzaW9uAQ==
+
+And finally, I am proving ownership of this host by posting or
+appending to this document.
+
+View my publicly-auditable identity here: https://keybase.io/masser
+
+==================================================================