feat(installer): complete advanced installation

.zshrc

@@ -97,3 +97,4 @@ HISTFILE=~/.zsh_history
 
 # Created by `pipx` on 2024-10-24 13:49:13
 export PATH="$PATH:/home/doryan/.local/bin"
+export EDITOR=nvim

Laptop/bspwm/bspwmrc

@@ -27,10 +27,11 @@ bspc config focused_border_color  "#93D4C5"
 
 pgrep -x polybar > /dev/null || polybar &
 pgrep -x sxhkd > /dev/null || sxhkd &
+pgrep -x xidlehook > /dev/null || xidlehook --not-when-fullscreen --not-when-audio --timer 300 'betterlockscreen -l' '' --timer 1200 'sudo zzz' '' &
+pgrep -x xmousepasteblock > /dev/null || xmousepasteblock &
+pgrep -x syndaemon > /dev/null || syndaemon -d -i 0.5 &
 
-xmousepasteblock &
 xsetroot -cursor_name left_ptr
 picom &
 feh --bg-fill ~/.bg/bg_5.png &
 dunst &
-pgrep -x xidlehook > /dev/null/ || xidlehook --not-when-fullscreen --not-when-audio --timer 30 'betterlockscreen -l' '' --timer 360 'sudo zzz' ''

install.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 function install_config() {
-	for config in ${@:2}; do
+	for config in "${@:2}"; do
 		cp -vr "./${config}" "$1"
 	done
 }
@@ -27,7 +27,7 @@ echo -e "${green}
 "
 
 echo "Select your device type (Laptop: L/l, PC: P/p)" 
-read type
+read -r type
 
 case "${type}" in
 	"L" | "l")
@@ -42,24 +42,30 @@ case "${type}" in
 	;;
 esac
 
-install_config ~/.config/ ${general_configs[@]}
-install_config ~/ ${home_dir_configs[@]}
+install_config ~/.config/ "${general_configs[@]}"
+install_config ~/ "${home_dir_configs[@]}"
 
 betterlockscreen -u ~/.bg/bg_5.png --fx blur --blur 1
 
 echo "Do you want install bspwm_session, X11, fonts and acpid (for laptop) configs? (y/N):"
-read advanced_install
+read -r advanced_install
 
 case "${advanced_install}" in
 	"Y" | "y")
-		sudo cp -vfr ./bspwm_session/* /usr/share/xsessions
-		sudo cp -vrf ./root_configs/fonts /etc
-		if [[ $type == "L" | $type == "l" ]] -; then
-			sudo cp -vfr ./root_configs/acpi /etc
-		else
-		fi
+		su --shell /bin/bash -c "
+			cp -vrf ./bspwm_session/* /usr/share/xsessions
+			cp -vrf ./root_configs/fonts /etc
+			mkdir -p /etc/X11/xorg.conf.d
+			cp -vf ./root_configs/xorg.conf.d/00-keyboard.conf /etc/X11/xorg.conf.d/
+			if [[ \"$type\" = \"L\" || \"$type\" = \"l\" ]] ; then
+				cp -vfr ./root_configs/acpi /etc
+				cp -vf ./root_configs/xorg.conf.d/70-synaptics.conf /etc/X11/xorg.conf.d/
+			fi
+		"
 	;;
 	"N" | "n" | "*")
 		echo "Skip"
 	;;
 esac
+
+echo "Installation is complete, have a fun!"

rofi/power/launch.sh

@@ -59,7 +59,7 @@ run_cmd() {
 	selected="$(confirm_exit)"
 	if [[ "$selected" == "$yes" ]]; then
 		if [[ $1 == '--shutdown' ]]; then
-			sudo shutdown -f now
+			sudo shutdown -P now
 		elif [[ $1 == '--reboot' ]]; then
 			sudo reboot
 		elif [[ $1 == '--suspend' ]]; then

root_configs/X11/Xwrapper.config

@@ -1 +0,0 @@
-needs_root_rights = yes

root_configs/X11/xinit/xinitrc

@@ -1,55 +0,0 @@
-#!/bin/sh
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-
-
-
-
-
-
-
-    xrdb -merge $sysresources
-
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f "$userresources" ]; then
-
-
-
-
-
-
-
-    xrdb -merge "$userresources"
-
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-# start some nice programs
-
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-  [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-twm &
-xclock -geometry 50x50-1+1 &
-xterm -geometry 80x50+494+51 &
-xterm -geometry 80x20+494-0 &
-exec xterm -geometry 80x66+0+0 -name login

root_configs/X11/xinit/xserverrc

@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ -z "$XDG_VTNR" ]; then
-  exec /usr/bin/X -nolisten tcp "$@"
-else
-  exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
-fi

root_configs/X11/xorg.conf

@@ -1,6 +0,0 @@
-Section "Files"
-EndSection
-Section "InputDevice"
-	Identifier "Keyboard0"
-	Driver	   "kbd"
-EndSection