From aee85effe0392e3993d12e01769336027c1d32b7 Mon Sep 17 00:00:00 2001 From: ITmail-dk <48917593+ITmail-dk@users.noreply.github.com> Date: Mon, 17 Jan 2022 07:31:19 +0100 Subject: [PATCH] small fixes a new setup menu --- config/bspwm/bspwmrc | 7 +-- config/bspwm/bspwmrc-vm | 8 ++-- config/sxhkd/sxhkdrc-vm | 2 +- install-ma-dte-debian.sh | 22 ++++----- install-scripts/apt-install-core-packages.sh | 4 +- install.sh | 47 ++++++++++++++++++++ 6 files changed, 70 insertions(+), 20 deletions(-) create mode 100644 install.sh diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index 8092860..8e1a003 100644 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -57,9 +57,10 @@ bspc rule -a Screenkey manage=off bspc rule -a Google-chrome desktop='^2' follow=on border=off bspc rule -a Firefox desktop='^2' follow=on border=off -bspc rule -a Gimp desktop='^6' follow=on layer=above border=off -bspc rule -a Inkscape desktop='^7' follow=on border=off -bspc rule -a mpv desktop='^5' state=floating +bspc rule -a Gimp desktop='^7' follow=on layer=above border=off +bspc rule -a Inkscape desktop='^8' follow=on border=off +bspc rule -a LibreCAD desktop='^9' follow=on border=off +bspc rule -a mpv desktop='^10' state=floating # Automatically start up programs. diff --git a/config/bspwm/bspwmrc-vm b/config/bspwm/bspwmrc-vm index 96fb602..a0ff179 100644 --- a/config/bspwm/bspwmrc-vm +++ b/config/bspwm/bspwmrc-vm @@ -54,10 +54,10 @@ bspc rule -a Screenkey manage=off bspc rule -a Google-chrome desktop='^2' follow=on border=off bspc rule -a Firefox desktop='^2' follow=on border=off -bspc rule -a Gimp desktop='^6' follow=on layer=above border=off -bspc rule -a Inkscape desktop='^7' follow=on border=off -bspc rule -a mpv desktop='^5' state=floating - +bspc rule -a Gimp desktop='^7' follow=on layer=above border=off +bspc rule -a Inkscape desktop='^8' follow=on border=off +bspc rule -a LibreCAD desktop='^9' follow=on border=off +bspc rule -a mpv desktop='^10' state=floating # Automatically start up programs. picom & diff --git a/config/sxhkd/sxhkdrc-vm b/config/sxhkd/sxhkdrc-vm index 4504dec..7d15bf4 100644 --- a/config/sxhkd/sxhkdrc-vm +++ b/config/sxhkd/sxhkdrc-vm @@ -38,7 +38,7 @@ shift + ctrl + alt + w . ~/.config/rofi/rofi-wifi-menu.sh ####### lock computer ####### -super + l +alt + l xsecurelock # diff --git a/install-ma-dte-debian.sh b/install-ma-dte-debian.sh index 7d69a93..30c46f6 100644 --- a/install-ma-dte-debian.sh +++ b/install-ma-dte-debian.sh @@ -15,18 +15,18 @@ systemctl --user enable pulseaudio . ~/bspwm-install-ma-dte/install-scripts/apt-install-software-last-packages.sh # Last step setup menu installing. -. ~/bspwm-install-ma-dte/last-step-setup-menu.sh +#. ~/bspwm-install-ma-dte/last-step-setup-menu.sh -echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-" -echo " " -echo " " -echo " Enter your user password, to continue if necessary" -echo " " -echo " " -echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-" +#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-" +#echo " " +#echo " " +#echo " Enter your user password, to continue if necessary" +#echo " " +#echo " " +#echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-" -sleep 1 +#sleep 1 -read -p "You are ready to reboot... Press [Enter] key to Reboot System." +#read -p "You are ready to reboot... Press [Enter] key to Reboot System." -systemctl rebootcd .. +#systemctl rebootcd .. diff --git a/install-scripts/apt-install-core-packages.sh b/install-scripts/apt-install-core-packages.sh index 418693b..c278242 100644 --- a/install-scripts/apt-install-core-packages.sh +++ b/install-scripts/apt-install-core-packages.sh @@ -15,5 +15,7 @@ sleep 3 # APT Update & apt upgrade sudo apt update && sudo apt upgrade -y +echo "Enter your user password, to continue if necessary" + # Core packages to be installed -sudo apt install -y xorg x11-xserver-utils arandr autorandr dialog bspwm sxhkd sddm picom polybar xautolock xsecurelock caffeine network-manager git kitty psmisc rofi pcmanfm tlp font-manager gvfs-backends nitrogen dunst cups smbclient lxpolkit xbacklight lxappearance htop mc xarchiver mpv feh sxiv pulseaudio pulsemixer npm curl tmux imagemagick scrot firefox-esr numlockx ranger neovim flameshot moc notify-osd neofetch flatpak cava +sudo apt install -y xorg x11-xserver-utils arandr autorandr dialog bspwm sxhkd sddm picom polybar xautolock xsecurelock caffeine network-manager git kitty psmisc rofi pcmanfm tlp font-manager gvfs-backends nitrogen dunst cups smbclient lxpolkit xbacklight lxappearance htop mc xarchiver pulseaudio pulsemixer moc mpv npm cava curl tmux imagemagick feh sxiv scrot flameshot firefox-esr numlockx ranger neovim notify-osd neofetch flatpak diff --git a/install.sh b/install.sh new file mode 100644 index 0000000..7087375 --- /dev/null +++ b/install.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +# Remember that this menu uses this apt package "dialog" + +HEIGHT=35 +WIDTH=80 +CHOICE_HEIGHT=5 +BACKTITLE="Martin BSPwm DTE - The installation" +TITLE="Martin DTE - BSPwm installation" +MENU="Choose you system from the following options:" + +OPTIONS=(1 "AMD System" + 2 "AMD System + NVIDIA GPU" + 3 "Intel System" + 4 "Intel System + NVIDIA GPU" + 5 "Virtual Machine System - SUPER KEY to ALT KEY" + 6 "Exit, Do nothing and Reboot") + +CHOICE=$(dialog --clear \ + --backtitle "$BACKTITLE" \ + --title "$TITLE" \ + --menu "$MENU" \ + $HEIGHT $WIDTH $CHOICE_HEIGHT \ + "${OPTIONS[@]}" \ + 2>&1 >/dev/tty) + +clear +case $CHOICE in + 1) + . ~/bspwm-install-ma-dte/install-ma-dte-debian.sh && sudo apt install -y amd64-microcode && systemctl reboot + ;; + 2) + . ~/bspwm-install-ma-dte/install-ma-dte-debian.sh && sudo apt install -y amd64-microcode nvidia-detect nvidia-driver && systemctl reboot + ;; + 3) + . ~/bspwm-install-ma-dte/install-ma-dte-debian.sh && sudo apt install -y intel-microcode && systemctl reboot + ;; + 4) + . ~/bspwm-install-ma-dte/install-ma-dte-debian.sh && sudo apt install -y intel-microcode nvidia-detect nvidia-driver && systemctl reboot + ;; + 5) + . ~/bspwm-install-ma-dte/install-ma-dte-debian.sh && . ~/bspwm-install-ma-dte/install-scripts/vm-install-mics.sh && systemctl reboot + ;; + 6) + systemctl reboot + ;; +esac \ No newline at end of file