Added deb desktop script

.vscode/settings.json

@@ -16,7 +16,8 @@
         "titleBar.inactiveForeground": "#e7e7e799",
         "sash.hoverBorder": "#ab307e",
         "statusBarItem.remoteBackground": "#832561",
-        "statusBarItem.remoteForeground": "#e7e7e7"
+        "statusBarItem.remoteForeground": "#e7e7e7",
+        "commandCenter.border": "#e7e7e799"
     },
     "peacock.color": "#832561",
     "python.pythonPath": "C:\\Users\\sattler\\AppData\\Local\\Programs\\Python\\Python39\\python.exe"

common/debian/apps/btop.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 install_btop() {
-    sudo apt install coreutils sed git build-essential gcc-11 g++-11
+    sudo apt install coreutils sed git build-essential gcc g++
     git clone https://github.com/aristocratos/btop.git
     cd btop
     sudo make

common/debian/apps/fastfetch.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+install_neofetch() {
+    echo "Installing fastfetch"
+    sudo apt install fastfetch -y
+    echo '
+if [ $USER != "root" ]; then
+    echo ""
+    fastfetch
+fi
+    ' | sudo tee -a /etc/bash.bashrc > /dev/null
+}

common/debian/apps/neofetch.sh

@@ -1,12 +1,16 @@
 #!/bin/bash
 
+source $PWD/common/debian/apps/fastfetch.sh
+
+# neofetch is not longer maintained
 install_neofetch() {
-    echo "Installing neofetch"
-    sudo apt install neofetch -y
-    echo '
-if [ $USER != "root" ]; then
-    echo ""
-    neofetch
-fi
-    ' | sudo tee -a /etc/bash.bashrc > /dev/null
+    install_fastfetch
+#     echo "Installing neofetch"
+#     sudo apt install neofetch -y
+#     echo '
+# if [ $USER != "root" ]; then
+#     echo ""
+#     neofetch
+# fi
+#     ' | sudo tee -a /etc/bash.bashrc > /dev/null
 }

common/redhat/apps/brave.sh

@@ -2,9 +2,8 @@
 
 install_brave() {
     echo "Installing brave-browser"
-    sudo dnf install dnf-transport-https curl
-    sudo curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-dnf-release.s3.brave.com/brave-browser-archive-keyring.gpg
-    echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] https://brave-browser-dnf-release.s3.brave.com/ stable main" | sudo tee /etc/dnf/sources.list.d/brave-browser-release.list
-    sudo dnf update
+    sudo dnf install dnf-plugins-core
+    sudo dnf config-manager --add-repo https://brave-browser-rpm-release.s3.brave.com/x86_64/
+    sudo rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
     sudo dnf install brave-browser
 }

common/redhat/apps/chrome.sh

@@ -2,8 +2,7 @@
 
 install_chrome() {
     echo 'Installing Google Chrome'
-    wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-    sudo dpkg -i ./google-chrome-stable_current_amd64.deb
-    rm google-chrome-stable_current_amd64.deb
-    sudo dnf install chrome-gnome-shell -y
+    sudo dnf install fedora-workstation-repositories
+    sudo dnf config-manager --set-enabled google-chrome
+    sudo dnf install google-chrome-stable -y
 }

common/redhat/apps/discord.sh

@@ -2,6 +2,7 @@
 
 install_discord() {
     echo 'Installing Discord'
-    wget -O discord.deb "https://discordapp.com/api/download?platform=linux&format=deb"
-    sudo dpkg -i discord.deb
+    sudo dnf install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+    sudo dnf update
+    sudo dnf install discord -y
 }

common/redhat/apps/etcher.sh

@@ -2,8 +2,7 @@
 
 install_etcher() {
     echo 'Installing Etcher'
-    echo "deb https://deb.etcher.io stable etcher" | sudo tee /etc/dnf/sources.list.d/balena-etcher.list
-    sudo dnf-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys 379CE192D401AB61
-    sudo dnf update -y
+    curl -1sLf 'https://dl.cloudsmith.io/public/balena/etcher/setup.rpm.sh' | sudo -E bash
+    sudo dnf update
     sudo dnf install balena-etcher-electron -y
 }

common/redhat/apps/lsd.sh

@@ -11,9 +11,7 @@ install_lsd() {
     sudo cp -r hack /usr/share/fonts/
     sudo chmod -R 775 /usr/share/fonts/hack
     rm -r hack
-    wget https://github.com/Peltoche/lsd/releases/download/0.19.0/lsd_0.19.0_amd64.deb
-    sudo dpkg -i lsd_0.19.0_amd64.deb
-    sudo rm lsd_0.19.0_amd64.deb
+    dnf install lsd -y
     # echo "alias ls='lsd'" | sudo tee -a /home/*/.bashrc > /dev/null
     # todos
     # write py script to comment line: alias="ls --color=auto"

common/redhat/apps/sublime_text.sh

@@ -2,10 +2,9 @@
 
 install_sublime_text() {
     echo "Installing sublime-text"
-    wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | sudo dnf-key add -
     sudo dnf install dnf-transport-https -y
-    sudo add-dnf-repository "deb https://download.sublimetext.com/ dnf/stable/"
+    sudo rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg
+    sudo dnf config-manager --add-repo https://download.sublimetext.com/rpm/stable/x86_64/sublime-text.repo
     
-    sudo dnf update
     sudo dnf install sublime-text -y
 }

common/redhat/apps/vscode.sh

@@ -2,8 +2,15 @@
 
 install_vscode() {
     echo "Installing VS Code"
-    curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo dnf-key add -
-    sudo add-dnf-repository "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main"
-    sudo dnf update
+    sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc
+    cat <<EOF | sudo tee /etc/yum.repos.d/vscode.repo
+[code]
+name=Visual Studio Code
+baseurl=https://packages.microsoft.com/yumrepos/vscode
+enabled=1
+gpgcheck=1
+gpgkey=https://packages.microsoft.com/keys/microsoft.asc
+EOF
+    sudo dnf check-update
     sudo dnf install code -y
 }

users/edraft/debian/debian_desktop_installation.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+
+source $PWD/common/debian/scripts/update.sh
+source $PWD/common/debian/scripts/first_install.sh
+
+source $PWD/common/debian/apps/barrier.sh
+source $PWD/common/debian/apps/boxes.sh
+source $PWD/common/debian/apps/brave.sh
+source $PWD/common/debian/apps/btop.sh
+source $PWD/common/debian/apps/chrome.sh
+source $PWD/common/debian/apps/discord.sh
+source $PWD/common/debian/apps/etcher.sh
+source $PWD/common/debian/apps/flameshot.sh
+source $PWD/common/debian/apps/freerdp.sh
+source $PWD/common/debian/apps/geary.sh
+source $PWD/common/debian/apps/git.sh
+source $PWD/common/debian/apps/gnome_shell.sh
+source $PWD/common/debian/apps/gnome_tweaks.sh
+source $PWD/common/debian/apps/gpick.sh
+source $PWD/common/debian/apps/kcolorchooser.sh
+source $PWD/common/debian/apps/keepassxc.sh
+source $PWD/common/debian/apps/lsd.sh
+source $PWD/common/debian/apps/ncdu.sh
+source $PWD/common/debian/apps/neofetch.sh
+source $PWD/common/debian/apps/nextcloud.sh
+source $PWD/common/debian/apps/signal.sh
+source $PWD/common/debian/apps/stacer.sh
+source $PWD/common/debian/apps/sublime_text.sh
+source $PWD/common/debian/apps/timeshift.sh
+source $PWD/common/debian/apps/trash-cli.sh
+source $PWD/common/debian/apps/ulauncher.sh
+source $PWD/common/debian/apps/vscode.sh
+
+update
+first_install
+
+install_barrier
+install_boxes
+install_brave
+install_btop
+install_chrome
+install_discord
+install_etcher
+install_flameshot
+install_freerdp
+install_geary
+install_git
+install_gnome_shell
+install_gnome_tweaks
+install_gpick
+install_kcolorchooser
+install_keepassxc
+install_lsd
+install_ncdu
+install_neofetch
+install_nextcloud
+install_signal
+install_stacer
+install_sublime_text
+install_timeshift
+install_trash_cli
+install_ulauncher
+
+# IDEs
+
+install_vscode

users/edraft/debian/ubuntu_desktop_installation.sh

@@ -4,14 +4,16 @@ source $PWD/common/debian/scripts/update.sh
 source $PWD/common/debian/scripts/first_install.sh
 
 source $PWD/common/debian/apps/snap/pycharm.sh
-source $PWD/common/debian/apps/snap/simplenote.sh
 
 source $PWD/common/debian/apps/barrier.sh
 source $PWD/common/debian/apps/boxes.sh
+source $PWD/common/debian/apps/brave.sh
+source $PWD/common/debian/apps/btop.sh
 source $PWD/common/debian/apps/chrome.sh
 source $PWD/common/debian/apps/discord.sh
 source $PWD/common/debian/apps/etcher.sh
 source $PWD/common/debian/apps/flameshot.sh
+source $PWD/common/debian/apps/freerdp.sh
 source $PWD/common/debian/apps/geary.sh
 source $PWD/common/debian/apps/git.sh
 source $PWD/common/debian/apps/gnome_shell.sh
@@ -32,16 +34,17 @@ source $PWD/common/debian/apps/ulauncher.sh
 source $PWD/common/debian/apps/vscode.sh
 
 update
-default_install
-
-install_simplenote
+first_install
 
 install_barrier
 install_boxes
+install_brave
+install_btop
 install_chrome
 install_discord
 install_etcher
 install_flameshot
+install_freerdp
 install_geary
 install_git
 install_gnome_shell

users/edraft/redhat/fedora_desktop_installation.sh

@@ -1,33 +1,33 @@
 #!/bin/bash
 
-source $PWD/common/fedroa/scripts/update.sh
-source $PWD/common/fedroa/scripts/first_install.sh
+source $PWD/common/redhat/scripts/update.sh
+source $PWD/common/redhat/scripts/first_install.sh
 
-source $PWD/common/fedroa/apps/barrier.sh
-source $PWD/common/fedroa/apps/boxes.sh
-source $PWD/common/fedroa/apps/brave.sh
-source $PWD/common/fedroa/apps/btop.sh
-source $PWD/common/fedroa/apps/discord.sh
-source $PWD/common/fedroa/apps/etcher.sh
-source $PWD/common/fedroa/apps/flameshot.sh
-source $PWD/common/fedroa/apps/geary.sh
-source $PWD/common/fedroa/apps/git.sh
-source $PWD/common/fedroa/apps/gnome_shell.sh
-source $PWD/common/fedroa/apps/gnome_tweaks.sh
-source $PWD/common/fedroa/apps/gpick.sh
-source $PWD/common/fedroa/apps/kcolorchooser.sh
-source $PWD/common/fedroa/apps/keepassxc.sh
-source $PWD/common/fedroa/apps/lsd.sh
-source $PWD/common/fedroa/apps/ncdu.sh
-source $PWD/common/fedroa/apps/neofetch.sh
-source $PWD/common/fedroa/apps/nextcloud.sh
-source $PWD/common/fedroa/apps/signal.sh
-source $PWD/common/fedroa/apps/stacer.sh
-source $PWD/common/fedroa/apps/sublime_text.sh
-source $PWD/common/fedroa/apps/timeshift.sh
-source $PWD/common/fedroa/apps/trash-cli.sh
-source $PWD/common/fedroa/apps/ulauncher.sh
-source $PWD/common/fedroa/apps/vscode.sh
+source $PWD/common/redhat/apps/barrier.sh
+source $PWD/common/redhat/apps/boxes.sh
+source $PWD/common/redhat/apps/brave.sh
+source $PWD/common/redhat/apps/btop.sh
+source $PWD/common/redhat/apps/discord.sh
+source $PWD/common/redhat/apps/etcher.sh
+source $PWD/common/redhat/apps/flameshot.sh
+source $PWD/common/redhat/apps/geary.sh
+source $PWD/common/redhat/apps/git.sh
+source $PWD/common/redhat/apps/gnome_shell.sh
+source $PWD/common/redhat/apps/gnome_tweaks.sh
+source $PWD/common/redhat/apps/gpick.sh
+source $PWD/common/redhat/apps/kcolorchooser.sh
+source $PWD/common/redhat/apps/keepassxc.sh
+source $PWD/common/redhat/apps/lsd.sh
+source $PWD/common/redhat/apps/ncdu.sh
+source $PWD/common/redhat/apps/neofetch.sh
+source $PWD/common/redhat/apps/nextcloud.sh
+source $PWD/common/redhat/apps/signal.sh
+source $PWD/common/redhat/apps/stacer.sh
+source $PWD/common/redhat/apps/sublime_text.sh
+source $PWD/common/redhat/apps/timeshift.sh
+source $PWD/common/redhat/apps/trash-cli.sh
+source $PWD/common/redhat/apps/ulauncher.sh
+source $PWD/common/redhat/apps/vscode.sh
 
 update
 first_install

users/edraft/redhat/theme_installation.sh

@@ -11,6 +11,6 @@ source $PWD/common/themes/grub_theme.sh
 update
 
 install_orchis orange
-install_candy_icons
+install_candy_iconsbash update
 install_vimix_cursors
 install_grub_theme vimix 1080p

users/vsrv/scripts/server_installation.sh

@@ -7,7 +7,7 @@ source $PWD/common/debian/scripts/first_install.sh
 # source $PWD/common/debian/apps/git.sh
 source $PWD/common/debian/apps/lsd.sh
 source $PWD/common/debian/apps/ncdu.sh
-source $PWD/common/debian/apps/neofetch.sh
+source $PWD/common/debian/apps/fastfetch.sh
 source $PWD/common/debian/apps/trash-cli.sh
 
 update
@@ -18,7 +18,7 @@ first_install
 install_lsd
 install_ncdu
 sudo python3 $PWD/users/vsrv/scripts/write_bashrc.py /home/ /root/
-install_neofetch
+install_fastfetch
 install_trash_cli
 
 # clean motd