Skip to content

Commit a154964

Browse files
committed
update remove flakes, adjust theme state, format
1 parent 01f7d7e commit a154964

File tree

16 files changed

+180
-227
lines changed

16 files changed

+180
-227
lines changed

default.nix

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
{
2-
runCommand,
3-
soupault,
4-
tailwindcss_4,
5-
pandoc,
6-
nodejs,
7-
npmlock2nix,
8-
lib,
1+
{ runCommand
2+
, soupault
3+
, tailwindcss_4
4+
, pandoc
5+
, nodejs
6+
, npmlock2nix
7+
, lib
8+
,
99
}:
1010
let
1111
NODE_PATH = "${
@@ -22,15 +22,15 @@ let
2222
}/node_modules";
2323
in
2424
runCommand "dist"
25-
{
26-
LANG = "en_US.UTF-8";
27-
nativeBuildInputs = [
28-
soupault
29-
tailwindcss_4
30-
pandoc
31-
];
32-
inherit NODE_PATH;
33-
}
25+
{
26+
LANG = "en_US.UTF-8";
27+
nativeBuildInputs = [
28+
soupault
29+
tailwindcss_4
30+
pandoc
31+
];
32+
inherit NODE_PATH;
33+
}
3434
''
3535
set -euo pipefail
3636
cp -r ${./site} site

docs/css/style.css

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,31 +1504,31 @@
15041504
fill: currentColor;
15051505
}
15061506
@layer base {
1507-
:where(:root),:root:has(input.theme-controller[value=dim]:checked),[data-theme=dim] {
1508-
color-scheme: dark;
1509-
--color-base-100: oklch(30.857% 0.023 264.149);
1510-
--color-base-200: oklch(28.036% 0.019 264.182);
1511-
--color-base-300: oklch(26.346% 0.018 262.177);
1512-
--color-base-content: oklch(82.901% 0.031 222.959);
1513-
--color-primary: oklch(86.133% 0.141 139.549);
1514-
--color-primary-content: oklch(17.226% 0.028 139.549);
1515-
--color-secondary: oklch(73.375% 0.165 35.353);
1516-
--color-secondary-content: oklch(14.675% 0.033 35.353);
1517-
--color-accent: oklch(74.229% 0.133 311.379);
1518-
--color-accent-content: oklch(14.845% 0.026 311.379);
1519-
--color-neutral: oklch(24.731% 0.02 264.094);
1520-
--color-neutral-content: oklch(82.901% 0.031 222.959);
1521-
--color-info: oklch(86.078% 0.142 206.182);
1522-
--color-info-content: oklch(17.215% 0.028 206.182);
1523-
--color-success: oklch(86.171% 0.142 166.534);
1524-
--color-success-content: oklch(17.234% 0.028 166.534);
1525-
--color-warning: oklch(86.163% 0.142 94.818);
1526-
--color-warning-content: oklch(17.232% 0.028 94.818);
1527-
--color-error: oklch(82.418% 0.099 33.756);
1528-
--color-error-content: oklch(16.483% 0.019 33.756);
1507+
:where(:root),:root:has(input.theme-controller[value=nord]:checked),[data-theme=nord] {
1508+
color-scheme: light;
1509+
--color-base-100: oklch(95.127% 0.007 260.731);
1510+
--color-base-200: oklch(93.299% 0.01 261.788);
1511+
--color-base-300: oklch(89.925% 0.016 262.749);
1512+
--color-base-content: oklch(32.437% 0.022 264.182);
1513+
--color-primary: oklch(59.435% 0.077 254.027);
1514+
--color-primary-content: oklch(11.887% 0.015 254.027);
1515+
--color-secondary: oklch(69.651% 0.059 248.687);
1516+
--color-secondary-content: oklch(13.93% 0.011 248.687);
1517+
--color-accent: oklch(77.464% 0.062 217.469);
1518+
--color-accent-content: oklch(15.492% 0.012 217.469);
1519+
--color-neutral: oklch(45.229% 0.035 264.131);
1520+
--color-neutral-content: oklch(89.925% 0.016 262.749);
1521+
--color-info: oklch(69.207% 0.062 332.664);
1522+
--color-info-content: oklch(13.841% 0.012 332.664);
1523+
--color-success: oklch(76.827% 0.074 131.063);
1524+
--color-success-content: oklch(15.365% 0.014 131.063);
1525+
--color-warning: oklch(85.486% 0.089 84.093);
1526+
--color-warning-content: oklch(17.097% 0.017 84.093);
1527+
--color-error: oklch(60.61% 0.12 15.341);
1528+
--color-error-content: oklch(12.122% 0.024 15.341);
15291529
--radius-selector: 1rem;
1530-
--radius-field: 0.5rem;
1531-
--radius-box: 1rem;
1530+
--radius-field: 0.25rem;
1531+
--radius-box: 0.5rem;
15321532
--size-selector: 0.25rem;
15331533
--size-field: 0.25rem;
15341534
--border: 1px;
@@ -1539,30 +1539,30 @@
15391539
@layer base {
15401540
@media (prefers-color-scheme: dark) {
15411541
:root {
1542-
color-scheme: light;
1543-
--color-base-100: oklch(95.127% 0.007 260.731);
1544-
--color-base-200: oklch(93.299% 0.01 261.788);
1545-
--color-base-300: oklch(89.925% 0.016 262.749);
1546-
--color-base-content: oklch(32.437% 0.022 264.182);
1547-
--color-primary: oklch(59.435% 0.077 254.027);
1548-
--color-primary-content: oklch(11.887% 0.015 254.027);
1549-
--color-secondary: oklch(69.651% 0.059 248.687);
1550-
--color-secondary-content: oklch(13.93% 0.011 248.687);
1551-
--color-accent: oklch(77.464% 0.062 217.469);
1552-
--color-accent-content: oklch(15.492% 0.012 217.469);
1553-
--color-neutral: oklch(45.229% 0.035 264.131);
1554-
--color-neutral-content: oklch(89.925% 0.016 262.749);
1555-
--color-info: oklch(69.207% 0.062 332.664);
1556-
--color-info-content: oklch(13.841% 0.012 332.664);
1557-
--color-success: oklch(76.827% 0.074 131.063);
1558-
--color-success-content: oklch(15.365% 0.014 131.063);
1559-
--color-warning: oklch(85.486% 0.089 84.093);
1560-
--color-warning-content: oklch(17.097% 0.017 84.093);
1561-
--color-error: oklch(60.61% 0.12 15.341);
1562-
--color-error-content: oklch(12.122% 0.024 15.341);
1542+
color-scheme: dark;
1543+
--color-base-100: oklch(30.857% 0.023 264.149);
1544+
--color-base-200: oklch(28.036% 0.019 264.182);
1545+
--color-base-300: oklch(26.346% 0.018 262.177);
1546+
--color-base-content: oklch(82.901% 0.031 222.959);
1547+
--color-primary: oklch(86.133% 0.141 139.549);
1548+
--color-primary-content: oklch(17.226% 0.028 139.549);
1549+
--color-secondary: oklch(73.375% 0.165 35.353);
1550+
--color-secondary-content: oklch(14.675% 0.033 35.353);
1551+
--color-accent: oklch(74.229% 0.133 311.379);
1552+
--color-accent-content: oklch(14.845% 0.026 311.379);
1553+
--color-neutral: oklch(24.731% 0.02 264.094);
1554+
--color-neutral-content: oklch(82.901% 0.031 222.959);
1555+
--color-info: oklch(86.078% 0.142 206.182);
1556+
--color-info-content: oklch(17.215% 0.028 206.182);
1557+
--color-success: oklch(86.171% 0.142 166.534);
1558+
--color-success-content: oklch(17.234% 0.028 166.534);
1559+
--color-warning: oklch(86.163% 0.142 94.818);
1560+
--color-warning-content: oklch(17.232% 0.028 94.818);
1561+
--color-error: oklch(82.418% 0.099 33.756);
1562+
--color-error-content: oklch(16.483% 0.019 33.756);
15631563
--radius-selector: 1rem;
1564-
--radius-field: 0.25rem;
1565-
--radius-box: 0.5rem;
1564+
--radius-field: 0.5rem;
1565+
--radius-box: 1rem;
15661566
--size-selector: 0.25rem;
15671567
--size-field: 0.25rem;
15681568
--border: 1px;
@@ -1571,39 +1571,6 @@
15711571
}
15721572
}
15731573
}
1574-
@layer base {
1575-
:root:has(input.theme-controller[value=dim]:checked),[data-theme=dim] {
1576-
color-scheme: dark;
1577-
--color-base-100: oklch(30.857% 0.023 264.149);
1578-
--color-base-200: oklch(28.036% 0.019 264.182);
1579-
--color-base-300: oklch(26.346% 0.018 262.177);
1580-
--color-base-content: oklch(82.901% 0.031 222.959);
1581-
--color-primary: oklch(86.133% 0.141 139.549);
1582-
--color-primary-content: oklch(17.226% 0.028 139.549);
1583-
--color-secondary: oklch(73.375% 0.165 35.353);
1584-
--color-secondary-content: oklch(14.675% 0.033 35.353);
1585-
--color-accent: oklch(74.229% 0.133 311.379);
1586-
--color-accent-content: oklch(14.845% 0.026 311.379);
1587-
--color-neutral: oklch(24.731% 0.02 264.094);
1588-
--color-neutral-content: oklch(82.901% 0.031 222.959);
1589-
--color-info: oklch(86.078% 0.142 206.182);
1590-
--color-info-content: oklch(17.215% 0.028 206.182);
1591-
--color-success: oklch(86.171% 0.142 166.534);
1592-
--color-success-content: oklch(17.234% 0.028 166.534);
1593-
--color-warning: oklch(86.163% 0.142 94.818);
1594-
--color-warning-content: oklch(17.232% 0.028 94.818);
1595-
--color-error: oklch(82.418% 0.099 33.756);
1596-
--color-error-content: oklch(16.483% 0.019 33.756);
1597-
--radius-selector: 1rem;
1598-
--radius-field: 0.5rem;
1599-
--radius-box: 1rem;
1600-
--size-selector: 0.25rem;
1601-
--size-field: 0.25rem;
1602-
--border: 1px;
1603-
--depth: 0;
1604-
--noise: 0;
1605-
}
1606-
}
16071574
@layer base {
16081575
:root:has(input.theme-controller[value=nord]:checked),[data-theme=nord] {
16091576
color-scheme: light;
@@ -1637,6 +1604,39 @@
16371604
--noise: 0;
16381605
}
16391606
}
1607+
@layer base {
1608+
:root:has(input.theme-controller[value=dim]:checked),[data-theme=dim] {
1609+
color-scheme: dark;
1610+
--color-base-100: oklch(30.857% 0.023 264.149);
1611+
--color-base-200: oklch(28.036% 0.019 264.182);
1612+
--color-base-300: oklch(26.346% 0.018 262.177);
1613+
--color-base-content: oklch(82.901% 0.031 222.959);
1614+
--color-primary: oklch(86.133% 0.141 139.549);
1615+
--color-primary-content: oklch(17.226% 0.028 139.549);
1616+
--color-secondary: oklch(73.375% 0.165 35.353);
1617+
--color-secondary-content: oklch(14.675% 0.033 35.353);
1618+
--color-accent: oklch(74.229% 0.133 311.379);
1619+
--color-accent-content: oklch(14.845% 0.026 311.379);
1620+
--color-neutral: oklch(24.731% 0.02 264.094);
1621+
--color-neutral-content: oklch(82.901% 0.031 222.959);
1622+
--color-info: oklch(86.078% 0.142 206.182);
1623+
--color-info-content: oklch(17.215% 0.028 206.182);
1624+
--color-success: oklch(86.171% 0.142 166.534);
1625+
--color-success-content: oklch(17.234% 0.028 166.534);
1626+
--color-warning: oklch(86.163% 0.142 94.818);
1627+
--color-warning-content: oklch(17.232% 0.028 94.818);
1628+
--color-error: oklch(82.418% 0.099 33.756);
1629+
--color-error-content: oklch(16.483% 0.019 33.756);
1630+
--radius-selector: 1rem;
1631+
--radius-field: 0.5rem;
1632+
--radius-box: 1rem;
1633+
--size-selector: 0.25rem;
1634+
--size-field: 0.25rem;
1635+
--border: 1px;
1636+
--depth: 0;
1637+
--noise: 0;
1638+
}
1639+
}
16401640
@layer base {
16411641
:root:has( .modal-open, .modal[open], .modal:target, .modal-toggle:checked, .drawer:not([class*="drawer-open"]) > .drawer-toggle:checked ) {
16421642
overflow: hidden;

docs/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="preload" href="/images/icons.svg" as="image" type="image/svg+xml">
1010
<link rel="icon" type="image/x-icon" href="/images/favicon.ico">
1111
<link rel="stylesheet" type="text/css" href="/css/syntax.css">
12-
<script src="https://marijan.pro/js/analytics.js"></script>
12+
<script src="/js/analytics.js"></script>
1313
<script src="https://analytics.marijan.pro/matomo.js" async="" defer=""></script>
1414
<script src="/js/theme-state.js"></script>
1515
<meta http-equiv="X-Content-Type-Options" content="nosniff">
@@ -68,7 +68,7 @@
6868
<li>
6969
<label class="swap swap-rotate">
7070

71-
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="dim">
71+
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="nord">
7272

7373
<svg class="swap-on icon" viewbox="0 0 24 24">
7474

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="preload" href="/images/icons.svg" as="image" type="image/svg+xml">
1010
<link rel="icon" type="image/x-icon" href="/images/favicon.ico">
1111
<link rel="stylesheet" type="text/css" href="/css/syntax.css">
12-
<script src="https://marijan.pro/js/analytics.js"></script>
12+
<script src="/js/analytics.js"></script>
1313
<script src="https://analytics.marijan.pro/matomo.js" async="" defer=""></script>
1414
<script src="/js/theme-state.js"></script>
1515
<meta http-equiv="X-Content-Type-Options" content="nosniff">
@@ -69,7 +69,7 @@
6969
<li>
7070
<label class="swap swap-rotate">
7171

72-
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="dim">
72+
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="nord">
7373

7474
<svg class="swap-on icon" viewbox="0 0 24 24">
7575

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="preload" href="/images/icons.svg" as="image" type="image/svg+xml">
1010
<link rel="icon" type="image/x-icon" href="/images/favicon.ico">
1111
<link rel="stylesheet" type="text/css" href="/css/syntax.css">
12-
<script src="https://marijan.pro/js/analytics.js"></script>
12+
<script src="/js/analytics.js"></script>
1313
<script src="https://analytics.marijan.pro/matomo.js" async="" defer=""></script>
1414
<script src="/js/theme-state.js"></script>
1515
<meta http-equiv="X-Content-Type-Options" content="nosniff">
@@ -69,7 +69,7 @@
6969
<li>
7070
<label class="swap swap-rotate">
7171

72-
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="dim">
72+
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="nord">
7373

7474
<svg class="swap-on icon" viewbox="0 0 24 24">
7575

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="preload" href="/images/icons.svg" as="image" type="image/svg+xml">
1010
<link rel="icon" type="image/x-icon" href="/images/favicon.ico">
1111
<link rel="stylesheet" type="text/css" href="/css/syntax.css">
12-
<script src="https://marijan.pro/js/analytics.js"></script>
12+
<script src="/js/analytics.js"></script>
1313
<script src="https://analytics.marijan.pro/matomo.js" async="" defer=""></script>
1414
<script src="/js/theme-state.js"></script>
1515
<meta http-equiv="X-Content-Type-Options" content="nosniff">
@@ -69,7 +69,7 @@
6969
<li>
7070
<label class="swap swap-rotate">
7171

72-
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="dim">
72+
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="nord">
7373

7474
<svg class="swap-on icon" viewbox="0 0 24 24">
7575

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="preload" href="/images/icons.svg" as="image" type="image/svg+xml">
1010
<link rel="icon" type="image/x-icon" href="/images/favicon.ico">
1111
<link rel="stylesheet" type="text/css" href="/css/syntax.css">
12-
<script src="https://marijan.pro/js/analytics.js"></script>
12+
<script src="/js/analytics.js"></script>
1313
<script src="https://analytics.marijan.pro/matomo.js" async="" defer=""></script>
1414
<script src="/js/theme-state.js"></script>
1515
<meta http-equiv="X-Content-Type-Options" content="nosniff">
@@ -69,7 +69,7 @@
6969
<li>
7070
<label class="swap swap-rotate">
7171

72-
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="dim">
72+
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="nord">
7373

7474
<svg class="swap-on icon" viewbox="0 0 24 24">
7575

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="preload" href="/images/icons.svg" as="image" type="image/svg+xml">
1010
<link rel="icon" type="image/x-icon" href="/images/favicon.ico">
1111
<link rel="stylesheet" type="text/css" href="/css/syntax.css">
12-
<script src="https://marijan.pro/js/analytics.js"></script>
12+
<script src="/js/analytics.js"></script>
1313
<script src="https://analytics.marijan.pro/matomo.js" async="" defer=""></script>
1414
<script src="/js/theme-state.js"></script>
1515
<meta http-equiv="X-Content-Type-Options" content="nosniff">
@@ -69,7 +69,7 @@
6969
<li>
7070
<label class="swap swap-rotate">
7171

72-
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="dim">
72+
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="nord">
7373

7474
<svg class="swap-on icon" viewbox="0 0 24 24">
7575

docs/posts/2023-10-31-nixos-oceansprint/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="preload" href="/images/icons.svg" as="image" type="image/svg+xml">
1010
<link rel="icon" type="image/x-icon" href="/images/favicon.ico">
1111
<link rel="stylesheet" type="text/css" href="/css/syntax.css">
12-
<script src="https://marijan.pro/js/analytics.js"></script>
12+
<script src="/js/analytics.js"></script>
1313
<script src="https://analytics.marijan.pro/matomo.js" async="" defer=""></script>
1414
<script src="/js/theme-state.js"></script>
1515
<meta http-equiv="X-Content-Type-Options" content="nosniff">
@@ -69,7 +69,7 @@
6969
<li>
7070
<label class="swap swap-rotate">
7171

72-
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="dim">
72+
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="nord">
7373

7474
<svg class="swap-on icon" viewbox="0 0 24 24">
7575

docs/posts/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="preload" href="/images/icons.svg" as="image" type="image/svg+xml">
1010
<link rel="icon" type="image/x-icon" href="/images/favicon.ico">
1111
<link rel="stylesheet" type="text/css" href="/css/syntax.css">
12-
<script src="https://marijan.pro/js/analytics.js"></script>
12+
<script src="/js/analytics.js"></script>
1313
<script src="https://analytics.marijan.pro/matomo.js" async="" defer=""></script>
1414
<script src="/js/theme-state.js"></script>
1515
<meta http-equiv="X-Content-Type-Options" content="nosniff">
@@ -68,7 +68,7 @@
6868
<li>
6969
<label class="swap swap-rotate">
7070

71-
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="dim">
71+
<input id="themeController" onclick="saveThemeState()" type="checkbox" class="theme-controller" value="nord">
7272

7373
<svg class="swap-on icon" viewbox="0 0 24 24">
7474

0 commit comments

Comments
 (0)