diff options
| -rw-r--r-- | public/progs.csv | 2 | ||||
| -rwxr-xr-x | public/thesiah.sh | 34 | ||||
| -rw-r--r-- | static/progs.csv | 2 | ||||
| -rwxr-xr-x | static/thesiah.sh | 34 |
4 files changed, 70 insertions, 2 deletions
diff --git a/public/progs.csv b/public/progs.csv index 7df34a6..4e424fd 100644 --- a/public/progs.csv +++ b/public/progs.csv @@ -36,7 +36,7 @@ A,auto-cpufreq,is a optimizer for automatic CPU speed and power. ,bat-extras,is Bash scripts that integrate bat with various command line tools. ,bbswitch,is a Kernel module allowing to switch dedicated graphics card. ,bc,is a mathematics language used for the dropdown calculator. -,bluez,is a tool for bluetooth control command line. +I,bluez,is a tool for bluetooth control command line. ,bluez-utils,is utils for bluetooth. A,brillo,controls the brightness of backlight and LED devices. ,btrfs-progs,is Btrfs filesystem utilities. diff --git a/public/thesiah.sh b/public/thesiah.sh index 10efc2b..7bf3cbd 100755 --- a/public/thesiah.sh +++ b/public/thesiah.sh @@ -351,6 +351,7 @@ ecryptfssetup() { # Ecrypt the folder [ -d /root/.ecryptfs ] && rm -rf /root/.ecryptfs + sleep 1 printf '\nyes\nyes\n' | mount -t ecryptfs /home/"$name"/.secret /home/"$name"/Private -o ecryptfs_passthrough=n,ecryptfs_enable_filename_crypto=y,passphrase_passwd="$epass1",ecryptfs_cipher=aes,ecryptfs_key_bytes=32 >/dev/null 2>&1 sleep 1 umount /home/"$name"/Private >/dev/null 2>&1 @@ -404,6 +405,7 @@ sambasetup() { whiptail --infobox "Setting up samba..." 7 50 [ -x "$(command -v "samba")" ] || installpkg samba pacman -Qq samba-"$initsys" >/dev/null 2>&1 || installpkg samba-"$initsys" + sleep 1 ufw allow 137/tcp >/dev/null 2>&1 ufw allow 137/udp >/dev/null 2>&1 ufw allow 138/tcp >/dev/null 2>&1 @@ -411,6 +413,7 @@ sambasetup() { ufw allow 139/tcp >/dev/null 2>&1 ufw allow 445/tcp >/dev/null 2>&1 [ -f /etc/samba/smb.conf ] && touch /etc/samba/smb.conf + sleep 1 printf "$pass1" | smbpasswd -a "$name" >/dev/null 2>&1 sleep 1 case "$initsys" in @@ -439,14 +442,40 @@ sambasetup() { bbswitchsetup() { whiptail --infobox "Setting up bbswitch..." 7 50 pacman -Qq bbswitch >/dev/null 2>&1 || installpkg bbswitch + sleep 1 echo "bbswitch" > /etc/modules-load.d/bbswitch.conf >/dev/null 2>&1 echo "options bbswitch load_state=0 unload_state=1" > /etc/modprobe.d/bbswitch.conf >/dev/null 2>&1 } +bluezsetup() { + whiptail --infobox "Setting up bluetooth..." 7 50 + pacman -Qq bluez >/dev/null 2>&1 || installpkg bluez + pacman -Qq bluez-"$initsys" >/dev/null 2>&1 || installpkg bluez-"$initsys" + sleep 1 + case "$initsys" in + "runit") + ln -sf /etc/runit/sv/bluetoothd /run/runit/service/ >/dev/null 2>&1 + sleep 1 + sv start bluetoothd >/dev/null 2>&1 || sv force-reload bluetoothd >/dev/null 2>&1 + ;; + "openrc") + rc-update add bluetoothd default >/dev/null 2>&1 + sleep 1 + rc-service bluetoothd start >/dev/null 2>&1 + ;; + "s6") + ln -sf /etc/s6/sv/bluetoothd /run/s6/services/ >/dev/null 2>&1 + sleep 1 + s6-svc -u /run/s6/services/bluetoothd >/dev/null 2>&1 + ;; + esac +} + cronsetup() { whiptail --infobox "Setting up cronjob..." 7 50 pacman -Qq cronie >/dev/null 2>&1 || installpkg cronie pacman -Qq cronie-"$initsys" >/dev/null 2>&1 || installpkg cronie-"$initsys" + sleep 1 case "$initsys" in "runit") ln -sf /etc/runit/sv/cronie /run/runit/service/ >/dev/null 2>&1 @@ -478,6 +507,7 @@ tlpsetup() { whiptail --infobox "Setting up tlp..." 7 50 [ -x "$(command -v "tlp")" ] || installpkg tlp pacman -Qq tlp-"$initsys" >/dev/null 2>&1 || installpkg tlp-"$initsys" + sleep 1 echo "TLP_DEFAULT_MODE=AC START_CHARGE_THRESH_BAT0=20 STOP_CHARGE_THRESH_BAT0=80 @@ -533,6 +563,7 @@ vpnsetup() { [ -x "$(command -v "openvpn")" ] || installpkg openvpn pacman -Qq openvpn-"$initsys" >/dev/null 2>&1 || installpkg openvpn-"$initsys" pacman -Qq networkmanager-openvpn >/dev/null 2>&1 || installpkg networkmanager-openvpn + sleep 1 nmcli connection import type openvpn file /home/"$name"/.dotfiles/.config/openvpn/thesiah.ovpn >/dev/null 2>&1 } @@ -734,6 +765,9 @@ sambasetup || error "Failed to set up samba." # Set up bbswitch bbswitchsetup || error "Failed to set up bbswitch." +# Set up bluez +bluezsetup || error "Failed to set up bluez." + # Set up cronjob cronsetup || error "Failed to set up cron." diff --git a/static/progs.csv b/static/progs.csv index 7df34a6..4e424fd 100644 --- a/static/progs.csv +++ b/static/progs.csv @@ -36,7 +36,7 @@ A,auto-cpufreq,is a optimizer for automatic CPU speed and power. ,bat-extras,is Bash scripts that integrate bat with various command line tools. ,bbswitch,is a Kernel module allowing to switch dedicated graphics card. ,bc,is a mathematics language used for the dropdown calculator. -,bluez,is a tool for bluetooth control command line. +I,bluez,is a tool for bluetooth control command line. ,bluez-utils,is utils for bluetooth. A,brillo,controls the brightness of backlight and LED devices. ,btrfs-progs,is Btrfs filesystem utilities. diff --git a/static/thesiah.sh b/static/thesiah.sh index 10efc2b..7bf3cbd 100755 --- a/static/thesiah.sh +++ b/static/thesiah.sh @@ -351,6 +351,7 @@ ecryptfssetup() { # Ecrypt the folder [ -d /root/.ecryptfs ] && rm -rf /root/.ecryptfs + sleep 1 printf '\nyes\nyes\n' | mount -t ecryptfs /home/"$name"/.secret /home/"$name"/Private -o ecryptfs_passthrough=n,ecryptfs_enable_filename_crypto=y,passphrase_passwd="$epass1",ecryptfs_cipher=aes,ecryptfs_key_bytes=32 >/dev/null 2>&1 sleep 1 umount /home/"$name"/Private >/dev/null 2>&1 @@ -404,6 +405,7 @@ sambasetup() { whiptail --infobox "Setting up samba..." 7 50 [ -x "$(command -v "samba")" ] || installpkg samba pacman -Qq samba-"$initsys" >/dev/null 2>&1 || installpkg samba-"$initsys" + sleep 1 ufw allow 137/tcp >/dev/null 2>&1 ufw allow 137/udp >/dev/null 2>&1 ufw allow 138/tcp >/dev/null 2>&1 @@ -411,6 +413,7 @@ sambasetup() { ufw allow 139/tcp >/dev/null 2>&1 ufw allow 445/tcp >/dev/null 2>&1 [ -f /etc/samba/smb.conf ] && touch /etc/samba/smb.conf + sleep 1 printf "$pass1" | smbpasswd -a "$name" >/dev/null 2>&1 sleep 1 case "$initsys" in @@ -439,14 +442,40 @@ sambasetup() { bbswitchsetup() { whiptail --infobox "Setting up bbswitch..." 7 50 pacman -Qq bbswitch >/dev/null 2>&1 || installpkg bbswitch + sleep 1 echo "bbswitch" > /etc/modules-load.d/bbswitch.conf >/dev/null 2>&1 echo "options bbswitch load_state=0 unload_state=1" > /etc/modprobe.d/bbswitch.conf >/dev/null 2>&1 } +bluezsetup() { + whiptail --infobox "Setting up bluetooth..." 7 50 + pacman -Qq bluez >/dev/null 2>&1 || installpkg bluez + pacman -Qq bluez-"$initsys" >/dev/null 2>&1 || installpkg bluez-"$initsys" + sleep 1 + case "$initsys" in + "runit") + ln -sf /etc/runit/sv/bluetoothd /run/runit/service/ >/dev/null 2>&1 + sleep 1 + sv start bluetoothd >/dev/null 2>&1 || sv force-reload bluetoothd >/dev/null 2>&1 + ;; + "openrc") + rc-update add bluetoothd default >/dev/null 2>&1 + sleep 1 + rc-service bluetoothd start >/dev/null 2>&1 + ;; + "s6") + ln -sf /etc/s6/sv/bluetoothd /run/s6/services/ >/dev/null 2>&1 + sleep 1 + s6-svc -u /run/s6/services/bluetoothd >/dev/null 2>&1 + ;; + esac +} + cronsetup() { whiptail --infobox "Setting up cronjob..." 7 50 pacman -Qq cronie >/dev/null 2>&1 || installpkg cronie pacman -Qq cronie-"$initsys" >/dev/null 2>&1 || installpkg cronie-"$initsys" + sleep 1 case "$initsys" in "runit") ln -sf /etc/runit/sv/cronie /run/runit/service/ >/dev/null 2>&1 @@ -478,6 +507,7 @@ tlpsetup() { whiptail --infobox "Setting up tlp..." 7 50 [ -x "$(command -v "tlp")" ] || installpkg tlp pacman -Qq tlp-"$initsys" >/dev/null 2>&1 || installpkg tlp-"$initsys" + sleep 1 echo "TLP_DEFAULT_MODE=AC START_CHARGE_THRESH_BAT0=20 STOP_CHARGE_THRESH_BAT0=80 @@ -533,6 +563,7 @@ vpnsetup() { [ -x "$(command -v "openvpn")" ] || installpkg openvpn pacman -Qq openvpn-"$initsys" >/dev/null 2>&1 || installpkg openvpn-"$initsys" pacman -Qq networkmanager-openvpn >/dev/null 2>&1 || installpkg networkmanager-openvpn + sleep 1 nmcli connection import type openvpn file /home/"$name"/.dotfiles/.config/openvpn/thesiah.ovpn >/dev/null 2>&1 } @@ -734,6 +765,9 @@ sambasetup || error "Failed to set up samba." # Set up bbswitch bbswitchsetup || error "Failed to set up bbswitch." +# Set up bluez +bluezsetup || error "Failed to set up bluez." + # Set up cronjob cronsetup || error "Failed to set up cron." |