Nix-Configs/blog-static-flake
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update blog and use generated submodule configuration

Browse Source
This commit is contained in:
Danila Fedorin 2022-04-09 10:20:02 +00:00
parent f2bb36b862
commit 29c6c9bcba
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

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

4
lib.nix
View File

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