swaydots

commit ff09e1e3262d0b3e974f7cb895d88534399ea2ae
parent 7ea5151e30894ac48fc8b069a972f0d6293189a0
Author: awy <awy@awy.one>
Date:   Tue, 13 May 2025 16:42:03 +0300

doas paru

Diffstat:
A
.config/paru/paru.conf
 | 
2
++
M
rice.sh
 | 
17
+++++++++++------

2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/.config/paru/paru.conf b/.config/paru/paru.conf
@@ -0,0 +1,2 @@
+[bin]
+Sudo = doas
diff --git a/rice.sh b/rice.sh
@@ -13,6 +13,8 @@ id "$PERMUSER" > /dev/null 2>&1 || { echo "User $PERMUSER does not exist. Exitin
 
 if [ -x "$(command -v doas)" ]; then
   evalcommand="doas -u $PERMUSER"
+  cp /etc/doas.conf /etc/doas.bak
+  echo "permit nopass :wheel" > /etc/doas.conf
 else
   evalcommand="sudo -u $PERMUSER"
   echo "%wheel ALL=(ALL) NOPASSWD: ALL
@@ -120,19 +122,19 @@ When = PostTransaction
 Exec = /usr/bin/setcap cap_net_admin=ep /usr/sbin/sing-box
 EOL
 
-run_as_user git clone https://aur.archlinux.org/yay.git
-cd yay
+run_as_user git clone https://aur.archlinux.org/paru.git
+cd paru
 run_as_user makepkg -csi --noconfirm
 cd "$WORKDIRECTORY"
 DEPLIST="`sed -e 's/#.*$//' -e '/^$/d' aurdeps.txt | tr '\n' ' '`"
-run_as_user yay -S $DEPLIST --noconfirm
+run_as_user paru -S $DEPLIST --noconfirm
 run_as_user dbus-launch gsettings set org.gnome.desktop.interface gtk-theme "Nordic"
 run_as_user dbus-launch gsettings set org.gnome.desktop.wm.preferences theme "Nordic"
 run_as_user dbus-launch gsettings set org.gnome.desktop.wm.preferences button-layout 'appmenu'
 run_as_user dbus-launch gsettings set org.gnome.desktop.interface font-name "Sans 11"
 cd ..
 rm -rf swaydots
-rm -rf yay
+rm -rf paru
 rm -rf go
 
 dinitctl enable cronie
@@ -202,10 +204,13 @@ sed -i '/auth[[:space:]]*include[[:space:]]*system-local-login/a auth optional p
 sed -i '/session[[:space:]]*include[[:space:]]*system-local-login/a session optional pam_gnome_keyring.so auto_start' /etc/pam.d/login
 echo "password optional pam_gnome_keyring.so" >> /etc/pam.d/passwd
 
-yes | run_as_user yay -Scc
+yes | run_as_user paru -Scc
 rm -rf /home/"$PERMUSER"/.cargo
 
-if [ -x "$(command -v sudo)" ]; then
+if [ -x "$(command -v doas)" ]; then
+  rm /etc/doas.conf
+  mv /etc/doas.bak /etc/doas.conf
+else
   rm /etc/sudoers.d/temp
 fi