Skip to content

Commit 9974fbd

Browse files
geskergesker
committed
publishing site 20250217-162927
1 parent ec02084 commit 9974fbd

4 files changed

Lines changed: 156 additions & 174 deletions

File tree

‎.github/workflows/mdbook-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
build:
2424
runs-on: ubuntu-24.04
2525
env:
26-
MDBOOK_VERSION: 0.4.40
26+
MDBOOK_VERSION: 0.4.45
2727

2828
steps:
2929
- name: Checkout repository
@@ -32,7 +32,7 @@ jobs:
3232
- name: Upload artifact
3333
uses: actions/upload-pages-artifact@v3
3434
with:
35-
path: ./myGithubPages
35+
path: ./book/html
3636

3737
# Deployment job
3838
deploy:

‎flake-parts/formatter.nix‎

Lines changed: 148 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,45 @@
3535
"LICENSE"
3636
];
3737

38-
formatter = {
39-
toml = {
40-
command = "dprint";
41-
options = [
42-
"fmt"
43-
"--stdin"
44-
];
45-
includes = [
46-
"*.toml"
47-
"Cargo.lock"
48-
];
49-
};
38+
# formatter = {
39+
# toml = {
40+
# command = "dprint";
41+
# options = [
42+
# "fmt"
43+
# "--allow-no-files"
44+
# "--stdin"
45+
# ];
46+
# includes = [
47+
# "*.toml"
48+
# "Cargo.lock"
49+
# ];
50+
# };
5051

51-
html = {
52-
command = "dprint";
53-
options = [
54-
"fmt"
55-
"--stdin"
56-
];
57-
includes = [
58-
"*.html"
59-
"*.hbs"
60-
];
61-
};
62-
};
52+
# html = {
53+
# command = "dprint";
54+
# options = [
55+
# "fmt"
56+
# "--allow-no-files"
57+
# "--stdin"
58+
# ];
59+
# includes = [
60+
# "*.html"
61+
# "*.hbs"
62+
# ];
63+
# };
64+
65+
# md = {
66+
# command = "dprint";
67+
# options = [
68+
# "fmt"
69+
# "--allow-no-files"
70+
# "--stdin"
71+
# ];
72+
# includes = [
73+
# "*.md"
74+
# ];
75+
# };
76+
# };
6377
};
6478

6579
programs = {
@@ -77,160 +91,128 @@
7791
package = pkgs.shellcheck;
7892
};
7993

80-
dprint = {
81-
enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.dprint;
94+
rustfmt = {
95+
enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.rustfmt;
8296
priority = 3;
83-
package = pkgs.dprint;
97+
package = pkgs.rustfmt;
8498
};
8599

86100
prettier = {
87-
enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.prettierd;
88-
priority = 4;
101+
enable = true;
89102
package = pkgs.prettierd;
103+
priority = 4;
104+
includes = [
105+
"*.prettierignore"
106+
"*.atom"
107+
"*.bash"
108+
"*.cjs"
109+
"*.conf"
110+
"*.css"
111+
"*.dtd"
112+
"*.geojson"
113+
"*.gitignore"
114+
"*.go"
115+
"*.hbs"
116+
"*.html"
117+
"*.ignore"
118+
"*.j2"
119+
"*.java"
120+
"*.jinja"
121+
"*.jinja2"
122+
"*.js"
123+
"*.jsn"
124+
"*.json"
125+
"*.json5"
126+
"*.jsonc"
127+
"*.jsx"
128+
"*.kml"
129+
"*.kt"
130+
"*.kts"
131+
"*.lock"
132+
"*.md"
133+
"*.mdx"
134+
"*.mjs"
135+
"*.nginx"
136+
"*.properties"
137+
"*.props"
138+
"*.rs"
139+
"*.rss"
140+
"*.scss"
141+
"*.sh"
142+
"*.svg"
143+
"*.toml"
144+
"*.ts"
145+
"*.tsx"
146+
"*.vue"
147+
"*.xml"
148+
"*.xsd"
149+
"*.xsl"
150+
"*.xslt"
151+
"*.yaml"
152+
"*.yml"
153+
];
90154
settings = {
91-
printWidth = fmtWidth;
155+
arrowParens = "always";
156+
bracketSameLine = true;
157+
bracketSpacing = true;
158+
cursorOffset = -1;
159+
editorconfig = false;
160+
embeddedLanguageFormatting = "auto";
161+
endOfLine = "auto";
162+
filepath = null;
163+
htmlWhitespaceSensitivity = "css";
164+
insertPragma = false;
165+
jsxSingleQuote = true;
166+
overrides = null;
167+
parser = null;
168+
pluginSearchDirs = null;
169+
printWidth = 120;
170+
proseWrap = "always";
171+
quoteProps = "as-needed";
172+
rangeEnd = null;
173+
rangeStart = null;
174+
requirePragma = false;
175+
semi = false;
176+
singleAttributePerLine = true;
177+
singleQuote = true;
178+
tabWidth = 2;
179+
trailingComma = "all";
180+
useTabs = false;
181+
vueIndentScriptAndStyle = false;
182+
plugins = [
183+
"@prettier/plugin-xml"
184+
"prettier-plugin-go-template"
185+
"prettier-plugin-ignore"
186+
"prettier-plugin-java"
187+
"prettier-plugin-jinja-template"
188+
"prettier-plugin-json"
189+
"prettier-plugin-jsonc"
190+
"prettier-plugin-kotlin"
191+
"prettier-plugin-lock"
192+
"prettier-plugin-nginx"
193+
"prettier-plugin-prettierignore"
194+
"prettier-plugin-properties"
195+
"prettier-plugin-rust"
196+
"prettier-plugin-sh"
197+
"prettier-plugin-toml"
198+
];
199+
92200
};
93201
};
94202

95-
rustfmt = {
96-
enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.rustfmt;
203+
dprint = {
204+
enable = false;
205+
package = pkgs.dprint;
97206
priority = 5;
98-
package = pkgs.rustfmt;
207+
settings = {
208+
incremental = true;
209+
indentWidth = 2;
210+
lineWidth = 120;
211+
newLineKind = "auto";
212+
useTabs = false;
213+
};
99214
};
100215

101-
# dprint = {
102-
# enable = true;
103-
# package = pkgs.dprint;
104-
# priority = 1;
105-
# settings = {
106-
# incremental = true;
107-
# indentWidth = 2;
108-
# lineWidth = 120;
109-
# newLineKind = "auto";
110-
# useTabs = false;
111-
# plugins = [
112-
# "https://plugins.dprint.dev/dockerfile-0.3.2.wasm"
113-
# "https://plugins.dprint.dev/exec-0.5.0.json@8d9972eee71fa1590e04873540421f3eda7674d0f1aae3d7c788615e7b7413d0"
114-
# "https://plugins.dprint.dev/g-plane/malva-v0.10.1.wasm"
115-
# "https://plugins.dprint.dev/g-plane/markup_fmt-v0.13.0.wasm"
116-
# "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.0.wasm"
117-
# "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm"
118-
# "https://plugins.dprint.dev/json-0.19.3.wasm"
119-
# "https://plugins.dprint.dev/jupyter-0.1.4.wasm"
120-
# "https://plugins.dprint.dev/markdown-0.17.8.wasm"
121-
# "https://plugins.dprint.dev/prettier-0.46.1.json@e5bd083088a8dfc6e5ce2d3c9bee81489b065bd5345ef55b59f5d96627928b7a"
122-
# "https://plugins.dprint.dev/roslyn-0.18.0.json@9586754a7e586ccda5dba4e694c0f225aabde63720c905dd85e02453b6f5e5de"
123-
# "https://plugins.dprint.dev/ruff-0.3.9.wasm"
124-
# "https://plugins.dprint.dev/toml-0.6.2.wasm"
125-
# "https://plugins.dprint.dev/typescript-0.93.0.wasm"
126-
127-
# ];
128-
# };
129-
# };
130-
131-
# prettier = {
132-
# enable = true;
133-
# package = pkgs.prettierd;
134-
# priority = 2;
135-
# includes = [
136-
# "*.prettierignore"
137-
# "*.atom"
138-
# "*.bash"
139-
# "*.cjs"
140-
# "*.conf"
141-
# "*.css"
142-
# "*.dtd"
143-
# "*.geojson"
144-
# "*.gitignore"
145-
# "*.go"
146-
# "*.html"
147-
# "*.ignore"
148-
# "*.j2"
149-
# "*.java"
150-
# "*.jinja"
151-
# "*.jinja2"
152-
# "*.js"
153-
# "*.jsn"
154-
# "*.json"
155-
# "*.json5"
156-
# "*.jsonc"
157-
# "*.jsx"
158-
# "*.kml"
159-
# "*.kt"
160-
# "*.kts"
161-
# "*.lock"
162-
# "*.md"
163-
# "*.mdx"
164-
# "*.mjs"
165-
# "*.nginx"
166-
# "*.properties"
167-
# "*.props"
168-
# "*.rs"
169-
# "*.rss"
170-
# "*.scss"
171-
# "*.sh"
172-
# "*.svg"
173-
# "*.toml"
174-
# "*.ts"
175-
# "*.tsx"
176-
# "*.vue"
177-
# "*.xml"
178-
# "*.xsd"
179-
# "*.xsl"
180-
# "*.xslt"
181-
# "*.yaml"
182-
# "*.yml"
183-
# ];
184-
# settings = {
185-
# arrowParens = "always";
186-
# bracketSameLine = true;
187-
# bracketSpacing = true;
188-
# cursorOffset = -1;
189-
# editorconfig = false;
190-
# embeddedLanguageFormatting = "auto";
191-
# endOfLine = "auto";
192-
# filepath = null;
193-
# htmlWhitespaceSensitivity = "css";
194-
# insertPragma = false;
195-
# jsxSingleQuote = true;
196-
# overrides = null;
197-
# parser = null;
198-
# pluginSearchDirs = null;
199-
# printWidth = 120;
200-
# proseWrap = "always";
201-
# quoteProps = "as-needed";
202-
# rangeEnd = null;
203-
# rangeStart = null;
204-
# requirePragma = false;
205-
# semi = false;
206-
# singleAttributePerLine = true;
207-
# singleQuote = true;
208-
# tabWidth = 2;
209-
# trailingComma = "all";
210-
# useTabs = false;
211-
# vueIndentScriptAndStyle = false;
212-
# plugins = [
213-
# "@prettier/plugin-xml"
214-
# "prettier-plugin-go-template"
215-
# "prettier-plugin-ignore"
216-
# "prettier-plugin-java"
217-
# "prettier-plugin-jinja-template"
218-
# "prettier-plugin-json"
219-
# "prettier-plugin-jsonc"
220-
# "prettier-plugin-kotlin"
221-
# "prettier-plugin-lock"
222-
# "prettier-plugin-nginx"
223-
# "prettier-plugin-prettierignore"
224-
# "prettier-plugin-properties"
225-
# "prettier-plugin-rust"
226-
# "prettier-plugin-sh"
227-
# "prettier-plugin-toml"
228-
# ];
229-
230-
# };
231-
# };
232-
# };
233-
234216
};
235217

236218
};

‎flake-parts/packages-default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
export CARGO_HOME="./.cargo"
3636
export PATH=$CARGO_HOME/bin:$PATH
3737
just clean
38-
#just scrub
3938
just fetch_tools
4039
'';
4140

4241
# preBuild = '' '';
4342

4443
buildPhase = ''
45-
mdbook build . --dest-dir ./book
44+
#mdbook build . --dest-dir ./book
45+
just build
4646
'';
4747

4848
installPhase = ''

0 commit comments

Comments
 (0)