Skip to content

Commit ad548a7

Browse files
committed
use flake.lock in release.nix, bump inputs
1 parent e094f2c commit ad548a7

File tree

18 files changed

+288
-346
lines changed

18 files changed

+288
-346
lines changed

docs/css/style.css

Lines changed: 98 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! tailwindcss v4.1.4 | MIT License | https://tailwindcss.com */
1+
/*! tailwindcss v4.1.11 | MIT License | https://tailwindcss.com */
22
@layer properties;
33
@layer theme, base, components, utilities;
44
@layer theme {
@@ -501,6 +501,102 @@
501501
}
502502
}
503503
}
504+
.input {
505+
cursor: text;
506+
border: var(--border) solid #0000;
507+
position: relative;
508+
display: inline-flex;
509+
flex-shrink: 1;
510+
appearance: none;
511+
align-items: center;
512+
gap: calc(0.25rem * 2);
513+
background-color: var(--color-base-100);
514+
padding-inline: calc(0.25rem * 3);
515+
vertical-align: middle;
516+
white-space: nowrap;
517+
width: clamp(3rem, 20rem, 100%);
518+
height: var(--size);
519+
font-size: 0.875rem;
520+
border-start-start-radius: var(--join-ss, var(--radius-field));
521+
border-start-end-radius: var(--join-se, var(--radius-field));
522+
border-end-start-radius: var(--join-es, var(--radius-field));
523+
border-end-end-radius: var(--join-ee, var(--radius-field));
524+
border-color: var(--input-color);
525+
box-shadow: 0 1px var(--input-color) inset, 0 -1px oklch(100% 0 0 / calc(var(--depth) * 0.1)) inset;
526+
@supports (color: color-mix(in lab, red, red)) {
527+
box-shadow: 0 1px color-mix(in oklab, var(--input-color) calc(var(--depth) * 10%), #0000) inset, 0 -1px oklch(100% 0 0 / calc(var(--depth) * 0.1)) inset;
528+
}
529+
--size: calc(var(--size-field, 0.25rem) * 10);
530+
--input-color: var(--color-base-content);
531+
@supports (color: color-mix(in lab, red, red)) {
532+
--input-color: color-mix(in oklab, var(--color-base-content) 20%, #0000);
533+
}
534+
&:where(input) {
535+
display: inline-flex;
536+
}
537+
:where(input) {
538+
display: inline-flex;
539+
height: 100%;
540+
width: 100%;
541+
appearance: none;
542+
background-color: transparent;
543+
border: none;
544+
&:focus, &:focus-within {
545+
--tw-outline-style: none;
546+
outline-style: none;
547+
@media (forced-colors: active) {
548+
outline: 2px solid transparent;
549+
outline-offset: 2px;
550+
}
551+
}
552+
}
553+
:where(input[type="date"]) {
554+
display: inline-block;
555+
}
556+
&:focus, &:focus-within {
557+
--input-color: var(--color-base-content);
558+
box-shadow: 0 1px var(--input-color);
559+
@supports (color: color-mix(in lab, red, red)) {
560+
box-shadow: 0 1px color-mix(in oklab, var(--input-color) calc(var(--depth) * 10%), #0000);
561+
}
562+
outline: 2px solid var(--input-color);
563+
outline-offset: 2px;
564+
isolation: isolate;
565+
z-index: 1;
566+
}
567+
&:has(> input[disabled]), &:is(:disabled, [disabled]) {
568+
cursor: not-allowed;
569+
border-color: var(--color-base-200);
570+
background-color: var(--color-base-200);
571+
color: var(--color-base-content);
572+
@supports (color: color-mix(in lab, red, red)) {
573+
color: color-mix(in oklab, var(--color-base-content) 40%, transparent);
574+
}
575+
&::placeholder {
576+
color: var(--color-base-content);
577+
@supports (color: color-mix(in lab, red, red)) {
578+
color: color-mix(in oklab, var(--color-base-content) 20%, transparent);
579+
}
580+
}
581+
box-shadow: none;
582+
}
583+
&:has(> input[disabled]) > input[disabled] {
584+
cursor: not-allowed;
585+
}
586+
&::-webkit-date-and-time-value {
587+
text-align: inherit;
588+
}
589+
&[type="number"] {
590+
&::-webkit-inner-spin-button {
591+
margin-block: calc(0.25rem * -3);
592+
margin-inline-end: calc(0.25rem * -3);
593+
}
594+
}
595+
&::-webkit-calendar-picker-indicator {
596+
position: absolute;
597+
inset-inline-end: 0.75em;
598+
}
599+
}
504600
.table {
505601
font-size: 0.875rem;
506602
position: relative;
@@ -1624,7 +1720,7 @@
16241720
line-height: var(--tw-leading, var(--text-xl--line-height));
16251721
}
16261722
.transition {
1627-
transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter;
1723+
transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter, display, visibility, content-visibility, overlay, pointer-events;
16281724
transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
16291725
transition-duration: var(--tw-duration, var(--default-transition-duration));
16301726
}

docs/css/syntax.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
html { -webkit-text-size-adjust: 100%; }
12
pre > code.sourceCode { white-space: pre; position: relative; }
2-
pre > code.sourceCode > span { line-height: 1.25; }
3+
pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
34
pre > code.sourceCode > span:empty { height: 1.2em; }
45
.sourceCode { overflow: visible; }
56
code.sourceCode > span { color: inherit; text-decoration: inherit; }
@@ -10,7 +11,7 @@ div.sourceCode { overflow: auto; }
1011
}
1112
@media print {
1213
pre > code.sourceCode { white-space: pre-wrap; }
13-
pre > code.sourceCode > span { display: inline-block; text-indent: -5em; padding-left: 5em; }
14+
pre > code.sourceCode > span { text-indent: -5em; padding-left: 5em; }
1415
}
1516
pre.numberSource code
1617
{ counter-reset: source-line 0; }

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ <h3>
145145
</p>
146146
<div class="sourceCode" id="cb1">
147147
<pre class="sourceCode nix"><code class="sourceCode nix"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a>demo = &lt;some package&gt;;</span>
148-
<span id="cb1-2"><a href="#cb1-2" aria-hidden="true" tabindex="-1"></a>demo<span class="op">-</span>wrapped = demo.overrideAttrs <span class="op">(</span><span class="va">oldAttrs</span><span class="op">:</span> <span class="kw">rec</span> <span class="op">{</span></span>
149-
<span id="cb1-3"><a href="#cb1-3" aria-hidden="true" tabindex="-1"></a> <span class="va">buildInputs</span> <span class="op">=</span> oldAttrs.buildInputs <span class="kw">or</span> <span class="op">[]</span> <span class="op">++</span> <span class="op">[</span> pkgs.makeWrapper <span class="op">];</span></span>
150-
<span id="cb1-4"><a href="#cb1-4" aria-hidden="true" tabindex="-1"></a> <span class="va">postInstall</span> <span class="op">=</span> oldAttrs.postInstall <span class="kw">or</span> <span class="st">""</span> <span class="op">+</span> <span class="st">''</span></span>
148+
<span id="cb1-2"><a href="#cb1-2" aria-hidden="true" tabindex="-1"></a>demo<span class="op">-</span>wrapped = demo<span class="op">.</span>overrideAttrs <span class="op">(</span><span class="va">oldAttrs</span><span class="op">:</span> <span class="kw">rec</span> <span class="op">{</span></span>
149+
<span id="cb1-3"><a href="#cb1-3" aria-hidden="true" tabindex="-1"></a> <span class="va">buildInputs</span> <span class="op">=</span> oldAttrs<span class="op">.</span>buildInputs <span class="kw">or</span> <span class="op">[]</span> <span class="op">++</span> <span class="op">[</span> pkgs<span class="op">.</span>makeWrapper <span class="op">];</span></span>
150+
<span id="cb1-4"><a href="#cb1-4" aria-hidden="true" tabindex="-1"></a> <span class="va">postInstall</span> <span class="op">=</span> oldAttrs<span class="op">.</span>postInstall <span class="kw">or</span> <span class="st">""</span> <span class="op">+</span> <span class="st">''</span></span>
151151
<span id="cb1-5"><a href="#cb1-5" aria-hidden="true" tabindex="-1"></a><span class="st"> wrapProgram $out/bin/demo \</span></span>
152-
<span id="cb1-6"><a href="#cb1-6" aria-hidden="true" tabindex="-1"></a><span class="st"> --set PATH </span><span class="sc">${</span>pkgs.lib.makeBinPath <span class="op">[</span> pkgs.hello <span class="op">]</span><span class="sc">}</span></span>
152+
<span id="cb1-6"><a href="#cb1-6" aria-hidden="true" tabindex="-1"></a><span class="st"> --set PATH </span><span class="sc">${</span>pkgs<span class="op">.</span>lib<span class="op">.</span>makeBinPath <span class="op">[</span> pkgs<span class="op">.</span>hello <span class="op">]</span><span class="sc">}</span></span>
153153
<span id="cb1-7"><a href="#cb1-7" aria-hidden="true" tabindex="-1"></a><span class="st"> ''</span><span class="op">;</span></span>
154154
<span id="cb1-8"><a href="#cb1-8" aria-hidden="true" tabindex="-1"></a><span class="op">})</span>;</span></code></pre>
155155
</div>
@@ -190,13 +190,13 @@ <h3>
190190
the following:
191191
</p>
192192
<div class="sourceCode" id="cb2">
193-
<pre class="sourceCode nix"><code class="sourceCode nix"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>demo<span class="op">-</span>wrapped<span class="op">-</span>better = pkgs.runCommand <span class="st">"demo-wrapped-better"</span> <span class="op">{</span></span>
194-
<span id="cb2-2"><a href="#cb2-2" aria-hidden="true" tabindex="-1"></a> <span class="va">buildInputs</span> <span class="op">=</span> <span class="op">[</span> pkgs.makeWrapper <span class="op">];</span></span>
193+
<pre class="sourceCode nix"><code class="sourceCode nix"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>demo<span class="op">-</span>wrapped<span class="op">-</span>better = pkgs<span class="op">.</span>runCommand <span class="st">"demo-wrapped-better"</span> <span class="op">{</span></span>
194+
<span id="cb2-2"><a href="#cb2-2" aria-hidden="true" tabindex="-1"></a> <span class="va">buildInputs</span> <span class="op">=</span> <span class="op">[</span> pkgs<span class="op">.</span>makeWrapper <span class="op">];</span></span>
195195
<span id="cb2-3"><a href="#cb2-3" aria-hidden="true" tabindex="-1"></a> <span class="op">}</span></span>
196196
<span id="cb2-4"><a href="#cb2-4" aria-hidden="true" tabindex="-1"></a> <span class="st">''</span></span>
197197
<span id="cb2-5"><a href="#cb2-5" aria-hidden="true" tabindex="-1"></a><span class="st"> mkdir -p $out/bin</span></span>
198198
<span id="cb2-6"><a href="#cb2-6" aria-hidden="true" tabindex="-1"></a><span class="st"> makeWrapper </span><span class="sc">${</span>demo<span class="sc">}</span><span class="st">/bin/demo $out/bin/demo \</span></span>
199-
<span id="cb2-7"><a href="#cb2-7" aria-hidden="true" tabindex="-1"></a><span class="st"> --set PATH </span><span class="sc">${</span>pkgs.lib.makeBinPath <span class="op">[</span> pkgs.hello <span class="op">]</span><span class="sc">}</span></span>
199+
<span id="cb2-7"><a href="#cb2-7" aria-hidden="true" tabindex="-1"></a><span class="st"> --set PATH </span><span class="sc">${</span>pkgs<span class="op">.</span>lib<span class="op">.</span>makeBinPath <span class="op">[</span> pkgs<span class="op">.</span>hello <span class="op">]</span><span class="sc">}</span></span>
200200
<span id="cb2-8"><a href="#cb2-8" aria-hidden="true" tabindex="-1"></a><span class="st"> ''</span>;</span></code></pre>
201201
</div>
202202
<p>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,17 +158,17 @@ <h3>
158158
service that listens on a socket.
159159
</p>
160160
<div class="sourceCode" id="cb1">
161-
<pre class="sourceCode nix"><code class="sourceCode nix"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a>services.socket<span class="op">-</span>listener = <span class="op">{</span></span>
161+
<pre class="sourceCode nix"><code class="sourceCode nix"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a>services<span class="op">.</span>socket<span class="op">-</span>listener = <span class="op">{</span></span>
162162
<span id="cb1-2"><a href="#cb1-2" aria-hidden="true" tabindex="-1"></a> <span class="va">enable</span> <span class="op">=</span> <span class="cn">true</span><span class="op">;</span></span>
163163
<span id="cb1-3"><a href="#cb1-3" aria-hidden="true" tabindex="-1"></a> <span class="va">socketPath</span> <span class="op">=</span> <span class="st">"/run/socket-listener/socket-listener.socket"</span><span class="op">;</span></span>
164164
<span id="cb1-4"><a href="#cb1-4" aria-hidden="true" tabindex="-1"></a><span class="op">}</span>;</span>
165165
<span id="cb1-5"><a href="#cb1-5" aria-hidden="true" tabindex="-1"></a></span>
166-
<span id="cb1-6"><a href="#cb1-6" aria-hidden="true" tabindex="-1"></a>systemd.services.socket<span class="op">-</span>listener.serviceConfig.ExecStartPost = pkgs.writeShellScript <span class="st">"add-socket-write-permissions"</span> <span class="st">''</span></span>
167-
<span id="cb1-7"><a href="#cb1-7" aria-hidden="true" tabindex="-1"></a><span class="st"> while [ ! -S </span><span class="sc">${</span>config.socket<span class="op">-</span>listener.socketPath<span class="sc">}</span><span class="st"> ];</span></span>
166+
<span id="cb1-6"><a href="#cb1-6" aria-hidden="true" tabindex="-1"></a>systemd<span class="op">.</span>services<span class="op">.</span>socket<span class="op">-</span>listener<span class="op">.</span>serviceConfig<span class="op">.</span>ExecStartPost = pkgs<span class="op">.</span>writeShellScript <span class="st">"add-socket-write-permissions"</span> <span class="st">''</span></span>
167+
<span id="cb1-7"><a href="#cb1-7" aria-hidden="true" tabindex="-1"></a><span class="st"> while [ ! -S </span><span class="sc">${</span>config<span class="op">.</span>socket<span class="op">-</span>listener<span class="op">.</span>socketPath<span class="sc">}</span><span class="st"> ];</span></span>
168168
<span id="cb1-8"><a href="#cb1-8" aria-hidden="true" tabindex="-1"></a><span class="st"> do</span></span>
169169
<span id="cb1-9"><a href="#cb1-9" aria-hidden="true" tabindex="-1"></a><span class="st"> sleep 1</span></span>
170170
<span id="cb1-10"><a href="#cb1-10" aria-hidden="true" tabindex="-1"></a><span class="st"> done</span></span>
171-
<span id="cb1-11"><a href="#cb1-11" aria-hidden="true" tabindex="-1"></a><span class="st"> chmod 0666 </span><span class="sc">${</span>config.socket<span class="op">-</span>listener.socketPath<span class="sc">}</span></span>
171+
<span id="cb1-11"><a href="#cb1-11" aria-hidden="true" tabindex="-1"></a><span class="st"> chmod 0666 </span><span class="sc">${</span>config<span class="op">.</span>socket<span class="op">-</span>listener<span class="op">.</span>socketPath<span class="sc">}</span></span>
172172
<span id="cb1-12"><a href="#cb1-12" aria-hidden="true" tabindex="-1"></a><span class="st"> ''</span>;</span></code></pre>
173173
</div>
174174
</article>

0 commit comments

Comments
 (0)