Skip to content

Commit 73ba7ff

Browse files
marijanpmarijanp
committed
bump to tailwind4, daisyui5
1 parent 30750c9 commit 73ba7ff

File tree

443 files changed

+33833
-2976
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

443 files changed

+33833
-2976
lines changed

‎default.nix‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,54 @@
11
{
22
runCommand,
33
soupault,
4-
nodePackages,
4+
tailwindcss_4,
55
pandoc,
66
nodejs,
77
npmlock2nix,
88
lib,
99
}:
10-
10+
let
11+
NODE_PATH = "${
12+
npmlock2nix.v2.node_modules {
13+
src = lib.fileset.toSource {
14+
root = ./.;
15+
fileset = lib.fileset.unions [
16+
./package.json
17+
./package-lock.json
18+
];
19+
};
20+
inherit nodejs;
21+
}
22+
}/node_modules";
23+
in
1124
runCommand "dist"
1225
{
1326
LANG = "en_US.UTF-8";
1427
nativeBuildInputs = [
15-
nodePackages.tailwindcss
28+
soupault
29+
tailwindcss_4
1630
pandoc
1731
];
18-
NODE_PATH = "${
19-
npmlock2nix.v2.node_modules {
20-
src = ./.;
21-
inherit nodejs;
22-
}
23-
}/node_modules";
32+
inherit NODE_PATH;
2433
}
2534
''
2635
set -euo pipefail
2736
cp -r ${./site} site
2837
cp -r ${./templates} templates
2938
cp -r ${./plugins} plugins
30-
${lib.getExe soupault} --debug --config ${./soupault.toml}
39+
echo "Running soupault ..."
40+
soupault --debug --config ${./soupault.toml}
41+
42+
# The tailwind CLI doesn't check the NODE_PATH environment variable,
43+
# it expects a node_modules folder
44+
cp -r ${NODE_PATH} build/css/node_modules
3145
46+
echo "Running tailwind ..."
3247
chmod +w build/css/style.css
33-
tailwindcss -c ${./tailwind.config.js} -i build/css/style.css -o build/css/style.css
48+
tailwindcss -i build/css/style.css -o build/css/style.css
3449
chmod -w build/css/style.css
3550
51+
echo "Running syntax highlighter ..."
3652
tmp=$(mktemp)
3753
echo '$highlighting-css$' > "$tmp"
3854
echo '`test`{.c}' | pandoc --highlight-style=zenburn --template="$tmp" > build/css/syntax.css

‎docs/blog/2022-06-03-dont-override-and-wrap-only/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ <h3>
208208
</div>
209209
</main>
210210
<div class="divider"></div>
211-
<footer class="footer footer-center bg-base-100 px-4 md:px-0">
211+
<footer class="footer footer-horizontal footer-center bg-base-100 px-4 md:px-0">
212212
<div>
213213
<span class="footer-title text-2xl">
214214
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" title="Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International" class="text-dark" style="text-decoration: none">

‎docs/blog/2022-08-26-nixos-how-to-modify-systemd-services-you-dont-own/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ <h3>
176176
</div>
177177
</main>
178178
<div class="divider"></div>
179-
<footer class="footer footer-center bg-base-100 px-4 md:px-0">
179+
<footer class="footer footer-horizontal footer-center bg-base-100 px-4 md:px-0">
180180
<div>
181181
<span class="footer-title text-2xl">
182182
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" title="Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International" class="text-dark" style="text-decoration: none">

‎docs/blog/2022-09-26-nixos-how-to-add-a-qemu-image--as-a-flake-output/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ <h1 id="title">
175175
</div>
176176
</main>
177177
<div class="divider"></div>
178-
<footer class="footer footer-center bg-base-100 px-4 md:px-0">
178+
<footer class="footer footer-horizontal footer-center bg-base-100 px-4 md:px-0">
179179
<div>
180180
<span class="footer-title text-2xl">
181181
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" title="Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International" class="text-dark" style="text-decoration: none">

‎docs/blog/2022-10-19-haskell-nix-how-to-reliably-add-runime-deps/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ <h1 id="title">
321321
</div>
322322
</main>
323323
<div class="divider"></div>
324-
<footer class="footer footer-center bg-base-100 px-4 md:px-0">
324+
<footer class="footer footer-horizontal footer-center bg-base-100 px-4 md:px-0">
325325
<div>
326326
<span class="footer-title text-2xl">
327327
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" title="Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International" class="text-dark" style="text-decoration: none">

‎docs/blog/2023-08-09-postgres-nixos-container/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ <h1 id="title">
280280
</div>
281281
</main>
282282
<div class="divider"></div>
283-
<footer class="footer footer-center bg-base-100 px-4 md:px-0">
283+
<footer class="footer footer-horizontal footer-center bg-base-100 px-4 md:px-0">
284284
<div>
285285
<span class="footer-title text-2xl">
286286
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" title="Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International" class="text-dark" style="text-decoration: none">

‎docs/blog/2023-10-31-nixos-oceansprint/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ <h2>
423423
</div>
424424
</main>
425425
<div class="divider"></div>
426-
<footer class="footer footer-center bg-base-100 px-4 md:px-0">
426+
<footer class="footer footer-horizontal footer-center bg-base-100 px-4 md:px-0">
427427
<div>
428428
<span class="footer-title text-2xl">
429429
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" title="Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International" class="text-dark" style="text-decoration: none">

‎docs/blog/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ <h1 class="text-xl">
174174
</div>
175175
</main>
176176
<div class="divider"></div>
177-
<footer class="footer footer-center bg-base-100 px-4 md:px-0">
177+
<footer class="footer footer-horizontal footer-center bg-base-100 px-4 md:px-0">
178178
<div>
179179
<span class="footer-title text-2xl">
180180
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" title="Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International" class="text-dark" style="text-decoration: none">

‎docs/css/node_modules/.bin/cssesc‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/css/node_modules/.package-lock.json‎

Lines changed: 82 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)