Browse Source

Update blog and use generated submodule configuration

master
Danila Fedorin 4 months ago
parent
commit
29c6c9bcba
  1. 8
      flake.lock
  2. 4
      lib.nix

8
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"

4
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;

Loading…
Cancel
Save