Change sudo to doas and update setup

.local/bin/setup/setupfirefox

@@ -26,5 +26,5 @@ read -s -k $'?Press enter when you have synced Firefox...\n'
 
 echo "" | xclip -selection clipboard -i
 
-firefox "https://www.enpass.io/downloads/"
+firefox "https://www.enpass.io/downloads/" "about:preferences#search"
 

.local/bin/setup/setupjoplin

@@ -6,25 +6,25 @@ TOWERPW=$(echo "$TOWER" | grep -Po "(?<=pass : ).+(?=\")")
 
 path="https://tower.scarif.space/remote.php/dav/files/chris/Joplin"
 
-joplin config sync.target 5
-joplin config sync.5.path "$path"
-joplin config sync.5.username "$TOWERUN"
-joplin config sync.5.password "$TOWERPW"
-joplin sync
+# joplin config sync.target 5
+# joplin config sync.5.path "$path"
+# joplin config sync.5.username "$TOWERUN"
+# joplin config sync.5.password "$TOWERPW"
+# joplin sync
 
-# echo "$path" | xclip -selection clipboard -i
+echo "$path" | xclip -selection clipboard -i
 
-# joplin-desktop &
+joplin-desktop &
 
-# clipnotify
+clipnotify
 
-# echo "$TOWERUN" | xclip -selection clipboard -i
+echo "$TOWERUN" | xclip -selection clipboard -i
 
-# clipnotify
+clipnotify
 
-# echo "$TOWERPW" | xclip -selection clipboard -i
+echo "$TOWERPW" | xclip -selection clipboard -i
 
-# read -n 1 -r -s -p $'Press enter when you have synced Joplin...\n'
+read -n 1 -r -s -p $'Press enter when you have synced Joplin...\n'
 
-# echo "" | xclip -selection clipboard -i
+echo "" | xclip -selection clipboard -i
 

.local/bin/setup/setupkeyring

@@ -3,5 +3,5 @@
 echo "Setting up keyring to start at login"
 
 # Start gnome keyring at login
-sudo -A sed -i '/auth       include      system-local-login/a auth       optional     pam_gnome_keyring.so' /etc/pam.d/login
-sudo -A sed -i '/session    include      system-local-login/a session    optional     pam_gnome_keyring.so auto_start' /etc/pam.d/login
+doas -A sed -i '/auth       include      system-local-login/a auth       optional     pam_gnome_keyring.so' /etc/pam.d/login
+doas -A sed -i '/session    include      system-local-login/a session    optional     pam_gnome_keyring.so auto_start' /etc/pam.d/login

.local/bin/setup/setupmaptool

@@ -6,5 +6,5 @@ echo "Configuring MapTool"
 if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/.DPI" ]; then
     DPI="$(cat "${XDG_CONFIG_HOME:-$HOME/.config}/x11/.DPI")"
     SCALE="$(((DPI+48)/96))"
-    sudo -A sed -i "/\[JavaOptions\]/a -Dsun.java2d.uiScale=$SCALE" /opt/maptool/lib/app/MapTool.cfg
+    doas -A sed -i "/\[JavaOptions\]/a -Dsun.java2d.uiScale=$SCALE" /opt/maptool/lib/app/MapTool.cfg
 fi

.local/bin/setup/setupvpn

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-sudo systemctl enable --now expressvpn.service
+doas systemctl enable --now expressvpn.service
 
 VPN=$(enpasscli -vault="$HOME/Documents/Enpass/Vaults/primary" -sort show "ExpressVPN Activation Code" 2>&1)
 VPNPW=$(echo "$LABS" | grep -Po "(?<=pass : ).+(?=\")")

.local/bin/setup/setupwacom

@@ -2,7 +2,7 @@
 
 echo "Initialising Wacom settings"
 
-sudo tee /etc/udev/rules.d/99-wacom.rules <<HRD
+doas tee /etc/udev/rules.d/99-wacom.rules <<HRD
 ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="056a", TAG+="systemd". ENV{SYSTEMD_USER_WANTS}+="wacom.service"
 HRD