hakyll-skeleton: converted to flake

flake.lock

@@ -1,5 +1,22 @@
 {
   "nodes": {
+    "hakyll-skeleton": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1656491537,
+        "narHash": "sha256-bC8ND81E0Sq7i+7btoSzhpCB75oHoa3eEcFvvG8XB4g=",
+        "ref": "consensus",
+        "rev": "c0df6f6abed90c66e2eff2106ce89bac0a3344db",
+        "revCount": 3,
+        "type": "git",
+        "url": "https://source.jfdic.org/jfdic/hakyll-skeleton/"
+      },
+      "original": {
+        "ref": "consensus",
+        "type": "git",
+        "url": "https://source.jfdic.org/jfdic/hakyll-skeleton/"
+      }
+    },
     "jfdic-web": {
       "flake": false,
       "locked": {
@@ -173,6 +190,7 @@
     },
     "root": {
       "inputs": {
+        "hakyll-skeleton": "hakyll-skeleton",
         "jfdic-web": "jfdic-web",
         "nix": "nix",
         "nixops": "nixops",

flake.nix

@@ -2,6 +2,10 @@
   description = "jfdic-ops deployment";
 
   inputs = {
+    hakyll-skeleton = {
+      flake = false;
+      url = git+https://source.jfdic.org/jfdic/hakyll-skeleton/?ref=consensus;
+    };
     jfdic-web = {
       flake = false;
       url = git+https://source.jfdic.org/JFDIC/jfdic-web/?ref=consensus;

outputs.nix

@@ -1,5 +1,6 @@
 {
   self,
+  hakyll-skeleton,
   jfdic-web,
   nix,
   nixops,

profiles/hakyll-skeleton.nix

@@ -1,14 +1,14 @@
 # NixOps configuration for deploying the JFDIC website
-
+{
-{ config, pkgs, ... }:
+  self,
-
+  config,
-let
+  inputs,
-  sources = import ../nix/sources.nix;
+  pkgs,
-  hakyll-skeleton = import sources.hakyll-skeleton { };
+  ...
+}: let
+  hakyll-skeleton = import inputs.hakyll-skeleton {};
   webdomain = "skeleton.jfdic.org";
-
 in {
-
   environment.sessionVariables = {
     LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
   };
@@ -20,14 +20,15 @@ in {
     recommendedProxySettings = true;
     recommendedTlsSettings = true;
     virtualHosts = {
-      "${webdomain}" = { # website hostname
+      "${webdomain}" = {
+        # website hostname
         enableACME = true; # Use ACME certs
         forceSSL = true; # Force SSL
         root = "${hakyll-skeleton}"; # Wesbite root
       };
-      "www.${webdomain}" = { # Respect our elders :-)
+      "www.${webdomain}" = {
-        locations."/".extraConfig =
+        # Respect our elders :-)
-          "return 301 $scheme://${webdomain}$request_uri;";
+        locations."/".extraConfig = "return 301 $scheme://${webdomain}$request_uri;";
       };
     };
   };
@@ -38,5 +39,4 @@ in {
   };
 
   networking.firewall.allowedTCPPorts = [80 443];
-
 }