Properly expose a default package for all operating systems

flake.lock

@@ -3,11 +3,11 @@
     "blog-source": {
       "flake": false,
       "locked": {
-        "lastModified": 1648508215,
-        "narHash": "sha256-H8rF4vpzeNw6Pg/hMtF45UFSm/cHN9HIalDrz+mfpC8=",
+        "lastModified": 1649499261,
+        "narHash": "sha256-CdWl6P7No/4rMMXon3U4tE1ddILfZRIA6kKkxEOdN8M=",
         "ref": "master",
-        "rev": "f044082fa53b72a5b8386e42a200ddb8072c7a90",
-        "revCount": 560,
+        "rev": "e6129dd01dd7e4cda521cab8bdf75d899bb39fa8",
+        "revCount": 563,
         "submodules": true,
         "type": "git",
         "url": "https://dev.danilafe.com/Web-Projects/blog-static.git"

flake.nix

@@ -19,17 +19,17 @@
   };
 
   outputs = { self, blog-source, blog-source-localized, nixpkgs, flake-utils, katex-html }:
-    {
+    let
       buildersFor = system: import ./lib.nix {
         inherit blog-source blog-source-localized;
         pkgs = import nixpkgs { inherit system; };
 	katex-html = katex-html.defaultPackage.${system};
       };
-      nixosModule = (import ./module.nix);
-      packages.x86_64-linux.blog-debug = (import ./lib.nix {
-        inherit blog-source blog-source-localized;
-	pkgs = import nixpkgs { system = "x86_64-linux"; };
-	katex-html = katex-html.defaultPackage."x86_64-linux";
-      }).english { host = "danilafe.com"; };
-    };
+    in
+      {
+	inherit buildersFor;
+        nixosModule = (import ./module.nix);
+      } // flake-utils.lib.eachDefaultSystem (system: {
+          defaultPackage = (buildersFor system).english { host = "danilafe.com"; };
+      });
 }

lib.nix

@@ -13,7 +13,7 @@ let
       in
         with settings.replaceUrl; "s/${regexEscape from}/${regexEscape to}/g";
     publicPath = settings.path;
-    extraFlags = if settings.drafts then " -D " else "";
+    extraFlags = (if settings.drafts then " -D " else "") + settings.extraFlags;
     builder = ./build/builder.sh;
     buildInputs = [
       hugo katex-html
@@ -28,6 +28,7 @@ in
       drafts = settings.drafts or false;
       src = blog-source;
       path = ".";
+      extraFlags = "--config=config.toml,config-gen.toml";
       replaceUrl = {
         from = "https://danilafe.com";
         to = wrapHost (settings.ssl or false) settings.host;
@@ -39,6 +40,7 @@ in
       drafts = settings.drafts or false;
       src = blog-source-localized;
       path = "ru";
+      extraFlags = "";
       replaceUrl = {
         from = "https://ru.danilafe.com";
         to = wrapHost (settings.ssl or false) settings.host;