From 9b76745cdfdc3c1290f4bc512d191912d8f402fe Mon Sep 17 00:00:00 2001
From: fleshin <aenavarro@gmail.com>
Date: Wed, 19 Jul 2023 14:11:44 -0400
Subject: [PATCH] fixes

---
 setup.sh     | 57 ++++++++++++++++++++++++++++++++--------------------
 sources.list |  3 +++
 2 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 sources.list

diff --git a/setup.sh b/setup.sh
index 90b4bc0..7a4b62b 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
 
 # Sudo
-usermod -a -G sudo $USER
+sudo usermod -a -G sudo $USER
+sudo usermod -a -G kvm $USER
+sudo usermod -a -G libvirt $USER
 
+# Switch to testing
+sudo cp *.list /etc/apt/sources.list.d/
+sudo cp -f sources.list /etc/apt/
+sudo apt update
 
 # Pipewire @ 192k
 sudo mkdir /etc/pipewire
@@ -10,12 +16,13 @@ sudo cp pipewire.conf /etc/pipewire
 
 # Deps for steam
 sudo dpkg --add-architecture i386
-sudo apt install apt install mesa-vulkan-drivers libglx-mesa0:i386 mesa-vulkan-drivers:i386 libgl1-mesa-dri:i386
-sudo apt install mesa-vulkan-drivers libglx-mesa0:i386 mesa-vulkan-drivers:i386 libgl1-mesa-dri:i386
+sudo apt update -y
+sudo apt install -y mesa-vulkan-drivers libglx-mesa0:i386 mesa-vulkan-drivers:i386 libgl1-mesa-dri:i386
 
 
 # Tools
-sudo apt install zsh nala lsd fonts-font-awesome neofetch mc tmux batcat curl geary plocate apt-file
+sudo apt install -y zsh nala lsd fonts-font-awesome neofetch mc tmux batcat curl geary plocate apt-file libvirt-clients sassc libglib2.0-dev-bin curl wget
+sudo apt update
 sudo apt-file update
 
 # Flatpak
@@ -26,32 +33,21 @@ sudo flatpak override --filesystem=~/.icons
 sudo flatpak override --filesystem=xdg-config/gtk-4.0
 flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 flatpak update
-flatpak install flatseal fondo com.usebottles.bottles om.github.wwmm.easyeffects com.ktechpit.whatsie com.ktechpit.whatsie ProtonUp-Qt slack
-flatpak install org.gtk.Gtk3theme.WhiteSur-Light org.gtk.Gtk3theme.WhiteSur-Light-solid
+flatpak install -y flatseal fondo com.usebottles.bottles om.github.wwmm.easyeffects com.ktechpit.whatsie com.ktechpit.whatsie ProtonUp-Qt slack
+flatpak install -y org.gtk.Gtk3theme.WhiteSur-Light org.gtk.Gtk3theme.WhiteSur-Light-solid
 
 # Dev general
-sudo apt install git build-essential golang meson cmake ninja 
+sudo apt install -y git build-essential golang meson cmake ninja 
 
 
 # Fyne deps
-sudo apt install libgl1-mesa-dev xorg-dev
+sudo apt install -y libgl1-mesa-dev xorg-dev
 
 
 # Nerd fonts
 git clone --depth 1 https://github.com/ryanoasis/nerd-fonts.git
 nerd-fonts/install.sh
 
-# Themes
-git clone --depth=1 https://github.com/vinceliuice/WhiteSur-gtk-theme.git 
-WhiteSur-gtk-theme/install.sh -l -c Light -N mojave 
-WhiteSur-gtk-theme/tweaks.sh -g #GDM
-WhiteSur-gtk-theme/tweaks.sh -F #Flatpak
-WhiteSur-gtk-theme/tweaks.sh -f #Firefox
-WhiteSur-gtk-theme/tweaks.sh -d #Dash to dock
-
-git clone --depth=1 https://github.com/vinceliuice/WhiteSur-icon-theme.git 
-WhiteSur-icon-theme/install.sh
-
 #Extensions
 gnome-extensions install openweather-extension@jenslody.de
 gnome-extensions install dash-to-dock@micxgx.gmail.com
@@ -59,6 +55,19 @@ gnome-extensions install trayIconsReloaded@selfmade.pl
 gnome-extensions install blur-my-shell@aunetx
 gnome-extensions install user-theme@gnome-shell-extensions.gcampax.github.com
 
+# Themes
+git clone --depth=1 https://github.com/vinceliuice/WhiteSur-gtk-theme.git 
+WhiteSur-gtk-theme/install.sh -l -c Light -N mojave 
+WhiteSur-gtk-theme/tweaks.sh -g #GDM
+WhiteSur-gtk-theme/tweaks.sh -F #Flatpak
+#WhiteSur-gtk-theme/tweaks.sh -f #Firefox
+WhiteSur-gtk-theme/tweaks.sh -d #Dash to dock
+
+git clone --depth=1 https://github.com/vinceliuice/WhiteSur-icon-theme.git 
+WhiteSur-icon-theme/install.sh
+
+
+
 # Oh My ZSH
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
@@ -66,15 +75,19 @@ git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:
 cp .zshrc $HOME
 
 # Steam
-sudo apt install steam-installer
+sudo apt install -y steam-installer
 
 
 # Settings
 dconf load / < dconf.toml
 
 # Applications
-sudo cp *.list /etc/apt/sources.list.d/
-sudo apt update
+wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
+sudo install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
+
+
+
 sudo apt install google-chrome-stable code
 
 # Clean up
diff --git a/sources.list b/sources.list
new file mode 100644
index 0000000..9c642b9
--- /dev/null
+++ b/sources.list
@@ -0,0 +1,3 @@
+deb http://deb.debian.org/debian/ testing main contrib non-free-firmware non-free
+deb-src http://deb.debian.org/debian/ testing main contrib non-free non-free-firmware
+