From 153cd472d216b3c9123e8e26a2a67dc0aace5ce5 Mon Sep 17 00:00:00 2001
From: ITmail-dk <48917593+ITmail-dk@users.noreply.github.com>
Date: Mon, 3 Jan 2022 15:56:35 +0100
Subject: [PATCH] nyw seup menu + apt to sid

---
 apt/sources.list                   |  8 ++++++++
 bspwm-install-martin-dte-debian.sh | 13 ++++++++++++-
 setup-menu.sh                      | 14 ++++++++------
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 apt/sources.list

diff --git a/apt/sources.list b/apt/sources.list
new file mode 100644
index 0000000..508b260
--- /dev/null
+++ b/apt/sources.list
@@ -0,0 +1,8 @@
+deb http://deb.debian.org/debian sid main contrib non-free
+deb-src http://deb.debian.org/debian sid main contrib non-free
+
+deb http://deb.debian.org/debian-security/ sid/updates main contrib non-free
+deb-src http://deb.debian.org/debian-security/ sid/updates main contrib non-free
+
+deb http://deb.debian.org/debian sid-updates main contrib non-free
+deb-src http://deb.debian.org/debian sid-updates main contrib non-free
\ No newline at end of file
diff --git a/bspwm-install-martin-dte-debian.sh b/bspwm-install-martin-dte-debian.sh
index 635d625..4919841 100644
--- a/bspwm-install-martin-dte-debian.sh
+++ b/bspwm-install-martin-dte-debian.sh
@@ -11,6 +11,17 @@ mkdir ~/.config
 mkdir ~/.fonts
 mkdir ~/wallpapers
 
+#Remove files & copy new.
+echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
+echo " "
+echo "     Remove files & copy new."
+echo "     SID apt sources.list"
+echo " "
+echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
+
+rm /etc/apt/sources.list
+cp ~/bspwm-install-ma-dte/apt/sources.list /etc/apt/sources.list
+
 
 #Copy files to...
 echo "-'-'-'-'-'-'-'-'-'-'-'-'-"
@@ -59,7 +70,7 @@ echo "-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-'-"
 
 sleep 5
 
-sudo apt install -y xorg x11-xserver-utils arandr bspwm sxhkd sddm picom polybar network-manager zsh kitty psmisc ranger rofi thunar thunar-archive-plugin thunar-font-manager font-manager gvfs-backends flameshot neovim nitrogen git lxpolkit lxappearance htop mc imagemagick npm feh sxiv pulseaudio pulsemixer mpd ncmpcpp notify-osd npm xscreensaver firefox-esr
+sudo apt install -y xorg x11-xserver-utils arandr bspwm sxhkd sddm picom polybar network-manager dialog zsh kitty psmisc ranger rofi thunar thunar-archive-plugin thunar-font-manager font-manager gvfs-backends flameshot neovim nitrogen git lxpolkit lxappearance htop mc imagemagick npm feh sxiv pulseaudio pulsemixer mpd ncmpcpp notify-osd npm xscreensaver firefox
 
 wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
 sudo apt install -y ~/bspwm-install-ma-dte/google-chrome-stable_current_amd64.deb
diff --git a/setup-menu.sh b/setup-menu.sh
index 8213eea..3695400 100644
--- a/setup-menu.sh
+++ b/setup-menu.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Remember that this menu uses this apt package "dialog"
+
 HEIGHT=15
 WIDTH=40
 CHOICE_HEIGHT=4
@@ -12,7 +14,7 @@ OPTIONS=(1 "Install AMD Driver"
          3 "Install Intel Driver"
          4 "Install Intel + NVIDIA Driver"
          5 "Virtual Machine - Copy New SUPER KEY to ALT KEY"
-         6 "Reboot")
+         6 "Do nothing and Reboot")
 
 CHOICE=$(dialog --clear \
                 --backtitle "$BACKTITLE" \
@@ -25,19 +27,19 @@ CHOICE=$(dialog --clear \
 clear
 case $CHOICE in
         1)
-            sudo apt install -y amd64-microcode
+            sudo apt install -y amd64-microcode && sudo reboot
             ;;
         2)
-            sudo apt install -y amd64-microcode nvidia-detect nvidia-driver
+            sudo apt install -y amd64-microcode nvidia-detect nvidia-driver && sudo reboot
             ;;
         3)
-            sudo apt install -y intel-microcode
+            sudo apt install -y intel-microcode && sudo reboot
             ;;
         4)
-            sudo apt install -y intel-microcode nvidia-detect nvidia-driver
+            sudo apt install -y intel-microcode nvidia-detect nvidia-driver && sudo reboot
             ;;
         5)
-            . ~/bspwm-install-ma-dte/copy-vm-keys.sh
+            . ~/bspwm-install-ma-dte/copy-vm-keys.sh && sudo reboot
             ;;
         6)
             sudo reboot