Skip to content
This repository was archived by the owner on Feb 13, 2026. It is now read-only.

Commit 32289f8

Browse files
committed
refactor: move rust out of config for packages
1 parent 49d7819 commit 32289f8

File tree

6 files changed

+37
-29
lines changed

6 files changed

+37
-29
lines changed

unix/fedora/config.json

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,6 @@
4141
}
4242
]
4343
},
44-
"rust": {
45-
"tools": [
46-
"cargo-audit",
47-
"cargo-deny",
48-
"cargo-fuzz",
49-
"cargo-wipe",
50-
"cargo-update",
51-
"cargo-cache",
52-
"just",
53-
"rustlings",
54-
"wasm-pack"
55-
]
56-
},
5744
"services": {
5845
"enable": [
5946
"docker.service",

unix/fedora/install/packaging/rust.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,15 @@ source "$COMMON_SCRIPT"
1616
# Setup Rust toolchain
1717
setup_rust
1818

19-
# Get Rust tools from config
20-
mapfile -t tools < <(get_config_array '.rust.tools')
19+
# Read Rust tools from package file
20+
pkg_file="$OMAFORGE_PATH/packages/rust.packages"
21+
22+
if [[ ! -f "$pkg_file" ]]; then
23+
log_info "No Rust tools configured"
24+
return 0
25+
fi
26+
27+
mapfile -t tools < <(grep -v '^#' "$pkg_file" | grep -v '^$')
2128

2229
if [[ ${#tools[@]} -eq 0 ]]; then
2330
log_info "No Rust tools configured"

unix/fedora/packages/rust.packages

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Cargo tools
2+
3+
cargo-audit
4+
cargo-deny
5+
cargo-fuzz
6+
cargo-wipe
7+
cargo-update
8+
cargo-cache
9+
just
10+
rustlings
11+
wasm-pack

unix/macos/config.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,5 @@
2828
"Pictures",
2929
"local"
3030
]
31-
},
32-
"rust": {
33-
"tools": [
34-
"bat",
35-
"eza",
36-
"ripgrep",
37-
"fd-find",
38-
"zoxide",
39-
"starship",
40-
"cargo-update",
41-
"cargo-cache"
42-
]
4331
}
4432
}

unix/macos/install/packaging/rust.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,15 @@ source "$COMMON_SCRIPT"
1616
# Setup Rust toolchain
1717
setup_rust
1818

19-
# Get Rust tools from config
20-
mapfile -t tools < <(get_config_array '.rust.tools')
19+
# Read Rust tools from package file
20+
pkg_file="$MACOS_PATH/packages/rust.packages"
21+
22+
if [[ ! -f "$pkg_file" ]]; then
23+
log_info "No Rust tools configured"
24+
return 0
25+
fi
26+
27+
mapfile -t tools < <(grep -v '^#' "$pkg_file" | grep -v '^$')
2128

2229
if [[ ${#tools[@]} -eq 0 ]]; then
2330
log_info "No Rust tools configured"

unix/macos/packages/rust.packages

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
bat
2+
eza
3+
ripgrep
4+
fd-find
5+
zoxide
6+
starship
7+
cargo-update
8+
cargo-cache

0 commit comments

Comments
 (0)