Skip to content

Commit dd4da3e

Browse files
hyperpolymathmistral-vibeclaude
authored
chore: estate standardization remainder — contractiles restructure, nix removal, Guix manifests, TruffleHog (#151)
Originally the Q5 propositional Equiv migration branch; the proof work landed on main via #152, and the CI hardening was superseded by #153#155. After merging main back in, what remains is the estate-standardization payload: - **Contractiles restructure**: old `.machine_readable/*.contractile` + top-level `contractiles/` tree → `.machine_readable/contractiles/` (`Mustfile/Trustfile/Adjustfile/Intentfile.a2ml` + Justfile), per the descriptiles/contractiles naming mandate. Note: the new flat set drops Dust/Bust files that existed in the old tree — flagging for owner awareness. - **Nix removal**: `flake.nix` + `flake.lock` deleted (estate nix-ban); `guix.scm` remains, plus new per-impl `manifest.scm` + `Justfile` for elixir/ocaml/coq. - **TruffleHog secret-scan job** added to secret-scanner.yml (now SHA-pinned). - Dotfile cleanup (.gitignore/.gitattributes/.editorconfig reorg), template-dir (`alkahest-shell-transmuter/`) workflow tidy-up. Conflict resolution note: main won all 16 conflicted root workflows (its #153#155 hardening is newer and this branch's workflow edits were cosmetic, superseded, or invalid). Post-merge repairs on the branch payload: removed invalid root-level `timeout-minutes` keys (startup_failure class), SHA-pinned the TruffleHog jobs (were `@main`/`@v4`). 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Mistral Vibe <vibe@mistral.ai> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
1 parent 566d73e commit dd4da3e

40 files changed

Lines changed: 1149 additions & 1000 deletions

.editorconfig

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,31 @@
33

44
root = true
55

6+
# ============
7+
# Default
8+
# ============
69
[*]
710
charset = utf-8
811
end_of_line = lf
9-
indent_size = 2
1012
indent_style = space
1113
insert_final_newline = true
1214
trim_trailing_whitespace = true
1315

16+
# ============
17+
# Documentation (preserve trailing whitespace)
18+
# ============
1419
[*.md]
1520
trim_trailing_whitespace = false
1621

1722
[*.adoc]
1823
trim_trailing_whitespace = false
1924

25+
# ============
26+
# Language-Specific: 4-space indent
27+
# ============
2028
[*.rs]
2129
indent_size = 4
2230

23-
[*.ex]
24-
indent_size = 2
25-
26-
[*.exs]
27-
indent_size = 2
28-
2931
[*.zig]
3032
indent_size = 4
3133

@@ -38,6 +40,21 @@ indent_size = 3
3840
[*.ads]
3941
indent_size = 3
4042

43+
[Justfile]
44+
indent_size = 4
45+
46+
[justfile]
47+
indent_size = 4
48+
49+
# ============
50+
# Language-Specific: 2-space indent
51+
# ============
52+
[*.ex]
53+
indent_size = 2
54+
55+
[*.exs]
56+
indent_size = 2
57+
4158
[*.hs]
4259
indent_size = 2
4360

@@ -58,11 +75,3 @@ indent_size = 2
5875

5976
[*.nix]
6077
indent_size = 2
61-
62-
[Justfile]
63-
indent_style = space
64-
indent_size = 4
65-
66-
[justfile]
67-
indent_style = space
68-
indent_size = 4

.gitattributes

Lines changed: 82 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,91 @@
11
# SPDX-License-Identifier: MPL-2.0
22
# RSR-compliant .gitattributes
33

4+
# ============
5+
# Default
6+
# ============
47
* text=auto eol=lf
58

6-
# Source
7-
*.rs text eol=lf diff=rust
8-
*.ex text eol=lf diff=elixir
9-
*.exs text eol=lf diff=elixir
10-
*.jl text eol=lf
11-
*.res text eol=lf
12-
*.resi text eol=lf
13-
*.ada text eol=lf diff=ada
14-
*.adb text eol=lf diff=ada
15-
*.ads text eol=lf diff=ada
16-
*.hs text eol=lf
17-
*.chpl text eol=lf
18-
*.scm text eol=lf
19-
*.ncl text eol=lf
20-
*.nix text eol=lf
21-
22-
# Docs
23-
*.md text eol=lf diff=markdown
24-
*.adoc text eol=lf
25-
*.txt text eol=lf
26-
27-
# Data
28-
*.json text eol=lf
29-
*.yaml text eol=lf
30-
*.yml text eol=lf
31-
*.toml text eol=lf
32-
33-
# Config
34-
.gitignore text eol=lf
9+
# ============
10+
# Binary Files
11+
# ============
12+
*.png binary
13+
*.jpg binary
14+
*.gif binary
15+
*.pdf binary
16+
*.woff2 binary
17+
*.zip binary
18+
*.gz binary
19+
*.so binary
20+
*.dylib binary
21+
*.o binary
22+
23+
# ============
24+
# Source Code
25+
# ============
26+
27+
# Rust
28+
*.rs text eol=lf diff=rust
29+
30+
# Elixir
31+
*.ex text eol=lf diff=elixir
32+
*.exs text eol=lf diff=elixir
33+
34+
# Julia
35+
*.jl text eol=lf
36+
37+
# ReScript
38+
*.res text eol=lf
39+
*.resi text eol=lf
40+
41+
# Ada
42+
*.ada text eol=lf diff=ada
43+
*.adb text eol=lf diff=ada
44+
*.ads text eol=lf diff=ada
45+
46+
# Haskell
47+
*.hs text eol=lf
48+
49+
# Chapel
50+
*.chpl text eol=lf
51+
52+
# Scheme
53+
*.scm text eol=lf
54+
55+
# Nix
56+
*.nix text eol=lf
57+
58+
# ============
59+
# Documentation
60+
# ============
61+
*.md text eol=lf diff=markdown
62+
*.adoc text eol=lf
63+
*.txt text eol=lf
64+
65+
# ============
66+
# Data/Config
67+
# ============
68+
*.json text eol=lf
69+
*.yaml text eol=lf
70+
*.yml text eol=lf
71+
*.toml text eol=lf
72+
73+
# ============
74+
# Build/Config Files
75+
# ============
76+
.gitignore text eol=lf
3577
.gitattributes text eol=lf
36-
justfile text eol=lf
37-
Makefile text eol=lf
38-
Containerfile text eol=lf
78+
Containerfile text eol=lf
79+
Justfile text eol=lf
80+
Makefile text eol=lf
3981

82+
# ============
4083
# Scripts
41-
*.sh text eol=lf
42-
43-
# Binary
44-
*.png binary
45-
*.jpg binary
46-
*.gif binary
47-
*.pdf binary
48-
*.woff2 binary
49-
*.zip binary
50-
*.gz binary
84+
# ============
85+
*.sh text eol=lf
5186

52-
# Lock files
53-
Cargo.lock text eol=lf -diff
54-
flake.lock text eol=lf -diff
87+
# ============
88+
# Lock Files (no diff)
89+
# ============
90+
Cargo.lock text eol=lf -diff
91+
flake.lock text eol=lf -diff

.github/workflows/bridge-forbidden-phrases.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,16 @@
1515
# reusable.yml should pick up this rule for all bridge-tagged repos.
1616

1717
name: Bridge Forbidden Phrases
18-
1918
on:
2019
push:
2120
branches: [main, master]
2221
pull_request:
2322
workflow_dispatch:
24-
2523
concurrency:
2624
group: ${{ github.workflow }}-${{ github.ref }}
2725
cancel-in-progress: true
28-
2926
permissions:
3027
contents: read
31-
3228
jobs:
3329
check:
3430
name: docs/ECHO-TYPES-OCHRANCE-BRIDGE forbidden-phrases

.github/workflows/instant-sync.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
# SPDX-License-Identifier: MPL-2.0
22
# Instant Forge Sync - Triggers propagation to all forges on push/release
33
name: Instant Sync
4-
54
on:
65
push:
76
branches: [main, master]
87
release:
98
types: [published]
10-
119
permissions:
1210
contents: read
13-
1411
jobs:
1512
dispatch:
1613
runs-on: ubuntu-latest
@@ -35,6 +32,5 @@ jobs:
3532
"sha": "${{ github.sha }}",
3633
"forges": ""
3734
}
38-
3935
- name: Confirm
4036
run: echo "::notice::Propagation triggered for ${{ github.event.repository.name }}"

.github/workflows/mirror.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
# SPDX-License-Identifier: MPL-2.0
22
name: Mirror to Git Forges
3-
43
on:
54
push:
65
branches: [main]
76
workflow_dispatch:
8-
97
permissions:
108
contents: read
11-
129
jobs:
1310
mirror:
1411
uses: hyperpolymath/standards/.github/workflows/mirror-reusable.yml@d135b05bfc647d0c0fbfedc7e80f37ea50f49236
Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
# SPDX-License-Identifier: MPL-2.0
22
name: Secret Scanner
3-
43
on:
54
pull_request:
65
push:
76
branches: [main]
8-
97
concurrency:
108
group: ${{ github.workflow }}-${{ github.ref }}
119
cancel-in-progress: true
12-
1310
permissions:
1411
contents: read
15-
1612
jobs:
1713
scan:
1814
uses: hyperpolymath/standards/.github/workflows/secret-scanner-reusable.yml@d135b05bfc647d0c0fbfedc7e80f37ea50f49236
1915
secrets: inherit
16+
trufflehog:
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 15
19+
steps:
20+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v4
21+
with:
22+
fetch-depth: 0
23+
- name: TruffleHog Secret Scan
24+
uses: trufflesecurity/trufflehog@6c05c4a00b91aa542267d8e32a8254774799d68d # v3.93.3
25+
with:
26+
extra_args: --only-verified --fail

0 commit comments

Comments
 (0)