move to system rust

3 files changed, 23 insertions, 17 deletions

diff --git a/install.sh b/install.sh
index 27489d0..e1524ed 100755
--- a/install.sh
+++ b/install.sh
@@ -23,7 +23,6 @@ read
 echo -e "\e[0m"
 
 ./shell_only.sh
-source ~/.cargo/env
 
 function command_exists {
 	command -v $1 &> /dev/null
@@ -44,6 +43,7 @@ if command_exists pacman; then
 	${SUDO} pacman -Sy --noconfirm --ask 4 --needed \
 		river \
 		seatd-openrc \
+		alacritty \
 		wofi \
 		waybar \
 		waylock \
@@ -79,7 +79,13 @@ if command_exists pacman; then
 		gst-plugins-bad \
 		sl
 
-	paru -S --noconfirm cava neo-matrix wired wlopm-git
+	paru -S --noconfirm \
+		river-bsp-layout \
+		watershot \
+		cava \
+		neo-matrix \
+		wired \
+		wlopm-git
 
 	${SUDO} rc-update add seatd boot
 	${SUDO} rc-service seatd start
@@ -111,9 +117,6 @@ xdg-user-dirs-update --set MUSIC ~/music
 xdg-user-dirs-update --set PICTURES ~/pictures
 xdg-user-dirs-update --set VIDEOS ~/videos
 
-cargo install alacritty
-cargo install river-bsp-layout
-
 mkdir -p ~/.config/alacritty
 ln -sf ${PWD}/alacritty.yml ~/.config/alacritty/alacritty.yml
 
@@ -127,7 +130,6 @@ mkdir -p ~/.config/wired
 ln -sf ${PWD}/wired.ron ~/.config/wired/wired.ron
 
 cargo install --git https://github.com/HimbeerserverDE/musikbox.git
-cargo install --git https://github.com/Kirottu/watershot.git
 
 chsh -s /bin/zsh
 
diff --git a/riverrc b/riverrc
index bbe2100..418aeb7 100755
--- a/riverrc
+++ b/riverrc
@@ -5,7 +5,7 @@
 #
 
 # terminal emulator
-riverctl map normal Super Return spawn "WINIT_X11_SCALE_FACTOR=1.0 ~/.cargo/bin/alacritty"
+riverctl map normal Super Return spawn "WINIT_X11_SCALE_FACTOR=1.0 alacritty"
 
 # program launcher
 riverctl map normal Super A spawn "wofi -S run"
@@ -153,7 +153,7 @@ riverctl keyboard-layout $(cat ~/.kblayout)
 
 riverctl border-width 0
 
-riverctl spawn ~/.cargo/bin/river-bsp-layout
+riverctl spawn river-bsp-layout
 riverctl default-layout bsp-layout
 
 riverctl spawn "swaybg -i ~/.wallpaper"
diff --git a/shell_only.sh b/shell_only.sh
index 629a570..3dc2616 100755
--- a/shell_only.sh
+++ b/shell_only.sh
@@ -43,10 +43,6 @@ if [ ${UID} -ne 0 ]; then
 	fi
 fi
 
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-echo '. "$HOME/.cargo/env"' >> ~/.zshenv
-source ~/.cargo/env
-
 if command_exists pacman; then
 	${SUDO} pacman -Sy --noconfirm --needed \
 		bat \
@@ -71,9 +67,16 @@ if command_exists pacman; then
 		make \
 		automake \
 		autoconf \
-		m4
+		m4 \
+		rustup \
+		gping \
+		bottom
+
+	rustup default stable
 
-	cargo install paru
+	rm -rf /tmp/paru
+	(cd /tmp && git clone https://aur.archlinux.org/paru.git)
+	(cd /tmp/paru && makepkg -si)
 
 	mkdir -p ~/.config/paru/
 	cat <<EOT > ~/.config/paru/paru.conf
@@ -101,14 +104,15 @@ elif command_exists apt; then
 		vim \
 		neofetch \
 		fzf \
-		openssh-client
+		openssh-client \
+		rust-all
+
+	cargo install cargo-update gping bottom
 else
 	echo "Your distro is not supported."
 	exit 1
 fi
 
-cargo install cargo-update gping lcat bottom
-
 rm -rf ~/.oh-my-zsh/
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended