feat: rust/cargo and spacer

hanoii · Dec 23, 2024 · b439bd4 · b439bd4
1 parent 0b68094
commit b439bd4
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 1 deletion.
diff --git a/.ddev/addon-metadata/pimp-my-shell/manifest.yaml b/.ddev/addon-metadata/pimp-my-shell/manifest.yaml
@@ -1,7 +1,7 @@
 name: pimp-my-shell
 repository: .
 version: ""
-install_date: "2024-12-23T13:27:50-03:00"
+install_date: "2024-12-23T14:35:51-03:00"
 project_files:
     - web-build/Dockerfile.pimp-my-shell
     - homeadditions/.bashrc.d/pimp-my-shell.sh

diff --git a/.ddev/homeadditions/.bashrc.d/pimp-my-shell.sh b/.ddev/homeadditions/.bashrc.d/pimp-my-shell.sh
@@ -55,3 +55,6 @@ alias ll='eza -la --icons --octal-permissions --group-directories-first'
 export PATH=$PATH:/usr/local/go/bin:~/go/bin
 unset GOARCH
 unset GOOS
+
+# rust
+. ~/.cargo/env
diff --git a/.ddev/homeadditions/.config/fish/conf.d/pimp-my-shell.fish b/.ddev/homeadditions/.config/fish/conf.d/pimp-my-shell.fish
@@ -56,3 +56,6 @@ end
 function ll --wraps eza --description "eza -la --icons --octal-permissions --group-directories-first"
     eza -la --icons --octal-permissions --group-directories-first $argv
 end
+
+# rust
+source ~/.cargo/env.fish
diff --git a/.ddev/web-build/Dockerfile.pimp-my-shell b/.ddev/web-build/Dockerfile.pimp-my-shell
@@ -108,6 +108,14 @@ RUN set -eux; \
     RECUR_VERSION=1.1.0; \
     /usr/local/go/bin/go install github.com/dbohdan/recur@v${RECUR_VERSION};
 
+RUN set -eux; \
+    RUST_VERSION=1.83.0; \
+    curl -sSf https://sh.rustup.rs/ | sh -s -- --default-toolchain=${RUST_VERSION} -y
+RUN set -eux; \
+    SPACER_VERSION=0.3.0; \
+    ~/.cargo/bin/cargo install spacer@${SPACER_VERSION};
+
+
 # Go back to root
 USER root:root
 

diff --git a/README.md b/README.md
@@ -62,6 +62,8 @@ ddev get https://github.com/hanoii/ddev-pimp-my-shell/tarball/main
 - https://go.dev
 - https://github.com/skx/sysbox
 - https://github.com/dbohdan/recur
+- https://www.rust-lang.org/
+- https://github.com/samwho/spacer
 - Some useful [scripts](pimp-my-shell/scripts)
 
 ## Tweaks

diff --git a/homeadditions/.bashrc.d/pimp-my-shell.sh b/homeadditions/.bashrc.d/pimp-my-shell.sh
@@ -55,3 +55,6 @@ alias ll='eza -la --icons --octal-permissions --group-directories-first'
 export PATH=$PATH:/usr/local/go/bin:~/go/bin
 unset GOARCH
 unset GOOS
+
+# rust
+. ~/.cargo/env
diff --git a/homeadditions/.config/fish/conf.d/pimp-my-shell.fish b/homeadditions/.config/fish/conf.d/pimp-my-shell.fish
@@ -56,3 +56,6 @@ end
 function ll --wraps eza --description "eza -la --icons --octal-permissions --group-directories-first"
     eza -la --icons --octal-permissions --group-directories-first $argv
 end
+
+# rust
+source ~/.cargo/env.fish
diff --git a/web-build/Dockerfile.pimp-my-shell b/web-build/Dockerfile.pimp-my-shell
@@ -108,6 +108,14 @@ RUN set -eux; \
     RECUR_VERSION=1.1.0; \
     /usr/local/go/bin/go install github.com/dbohdan/recur@v${RECUR_VERSION};
 
+RUN set -eux; \
+    RUST_VERSION=1.83.0; \
+    curl -sSf https://sh.rustup.rs/ | sh -s -- --default-toolchain=${RUST_VERSION} -y
+RUN set -eux; \
+    SPACER_VERSION=0.3.0; \
+    ~/.cargo/bin/cargo install spacer@${SPACER_VERSION};
+
+
 # Go back to root
 USER root:root