From 6fd989a641d0175c64335063b01af48278df3805 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Mon, 21 Oct 2024 07:11:33 +0200 Subject: [PATCH] Code cleanup --- update.sh | 86 +++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/update.sh b/update.sh index 8b905e6..e15d633 100755 --- a/update.sh +++ b/update.sh @@ -17,9 +17,9 @@ if [ $OS != "Ubuntu" ]; then fi if [ "$(dpkg -l | awk '/ubuntu-desktop/ {print }'|wc -l)" -ge 1 ]; then - DESKTOP="yes" + DESKTOP="yes" else - DESKTOP="no" + DESKTOP="no" fi if [ "$(systemd-detect-virt)" == "wsl" ]; then @@ -36,7 +36,7 @@ printf -- '\033[33m Installing system packages\n\033[37m' sudo apt update sudo apt upgrade -y sudo apt install -y imagemagick gpg ninja-build gettext cmake unzip curl python3 python3-pip python3-venv \ - build-essential libssl-dev libffi-dev python3-dev file tmux libudev-dev pkg-config locales pipx btop ncdu ranger + build-essential libssl-dev libffi-dev python3-dev file tmux libudev-dev pkg-config locales pipx btop ncdu ranger # Setup locals printf -- '\033[33m Setup locals\n\033[37m' @@ -65,15 +65,15 @@ echo "$USER ALL=(ALL:ALL) NOPASSWD: /usr/sbin/vhclientx86_64" | sudo tee /etc/su # Install teensy udev rules (only for non docker system) if [ ! -f /.dockerenv ]; then - printf -- '\033[33m Installing teensy udev rules\n\033[37m' + printf -- '\033[33m Installing teensy udev rules\n\033[37m' sudo rm -f /tmp/00-teensy.rules /etc/udev/rules.d/00-teensy.rules /lib/udev/rules.d/00-teensy.rules sudo wget -O /tmp/00-teensy.rules https://www.pjrc.com/teensy/00-teensy.rules sudo install -o root -g root -m 0664 /tmp/00-teensy.rules /lib/udev/rules.d/00-teensy.rules sudo service udev restart - sudo udevadm control --reload-rules + sudo udevadm control --reload-rules sudo udevadm trigger fi - + # Install neovim printf -- '\033[33m Installing neovim\n\033[37m' cd ~ @@ -108,17 +108,17 @@ cargo install tree-sitter-cli printf -- '\033[33m Installing ripgrep\n\033[37m' cargo install ripgrep -# Install eza +# Install eza printf -- '\033[33m Installing eza\n\033[37m' cargo install eza -# Install zoxide +# Install zoxide printf -- '\033[33m Installing zoxide\n\033[37m' -cargo install zoxide --locked +cargo install zoxide --locked # Install starship printf -- '\033[33m Installing starship\n\033[37m' -cargo install starship --locked +cargo install starship --locked # Install fd printf -- '\033[33m Installing fd\n\033[37m' @@ -220,11 +220,11 @@ printf -- '\033[33m Installing neovim for node\n\033[37m' npm install -g neovim if [ $DESKTOP == "yes" ]; then - # Install flatpak + # Install flatpak printf -- '\033[33m Installing desktop dep.\n\033[37m' sudo add-apt-repository -y ppa:flatpak/stable sudo apt update - sudo apt install -y flatpak + sudo apt install -y flatpak flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo printf -- '\033[33m Installing Visual Code\n\033[37m' @@ -244,20 +244,20 @@ if [ $DESKTOP == "yes" ]; then # Install gnome-shell-extension-manager printf -- '\033[33m Installing gnome-shell-extension-manager\n\033[37m' - sudo apt install -y gnome-shell-extension-manager - - # Install remmina + sudo apt install -y gnome-shell-extension-manager + + # Install remmina printf -- '\033[33m Installing remmina\n\033[37m' - sudo apt install -y remmina - - # Install gnome tweaks + sudo apt install -y remmina + + # Install gnome tweaks printf -- '\033[33m Installing gnome tweaks\n\033[37m' sudo apt install -y gnome-tweaks - - # Install feh + + # Install feh printf -- '\033[33m Installing feh\n\033[37m' sudo apt install -y feh - + # Install NerdFonts printf -- '\033[33m Installing NerdFonts\n\033[37m' mkdir -p /home/$USER/.local/share/fonts @@ -265,12 +265,12 @@ if [ $DESKTOP == "yes" ]; then wget https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/CodeNewRoman.zip unzip -o CodeNewRoman.zip rm CodeNewRoman.zip - wget https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/NerdFontsSymbolsOnly.zip + wget https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/NerdFontsSymbolsOnly.zip unzip -o NerdFontsSymbolsOnly.zip rm NerdFontsSymbolsOnly.zip fc-cache -fv - # Install Wezterm + # Install Wezterm printf -- '\033[33m Installing wezterm\n\033[37m' curl -fsSL https://apt.fury.io/wez/gpg.key | sudo gpg --yes --dearmor -o /usr/share/keyrings/wezterm-fury.gpg echo 'deb [signed-by=/usr/share/keyrings/wezterm-fury.gpg] https://apt.fury.io/wez/ * *' | sudo tee /etc/apt/sources.list.d/wezterm.list @@ -281,34 +281,34 @@ if [ $DESKTOP == "yes" ]; then printf -- '\033[33m Symlinking wezterm config\n\033[37m' ln -sf ~/code_server/wezterm.lua ~/.wezterm.lua - # Install Virtualbox + # Install Virtualbox # if [ "$(dpkg -l | awk '/virtualbox/ {print }'|wc -l)" -eq 0 ]; then - printf -- '\033[33m Installing Virtualbox\n\033[37m' - curl https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor > oracle_vbox_2016.gpg - curl https://www.virtualbox.org/download/oracle_vbox.asc | gpg --dearmor > oracle_vbox.gpg - sudo install -o root -g root -m 644 oracle_vbox_2016.gpg /etc/apt/trusted.gpg.d/ - sudo install -o root -g root -m 644 oracle_vbox.gpg /etc/apt/trusted.gpg.d/ - echo "deb [arch=amd64] http://download.virtualbox.org/virtualbox/debian $(lsb_release -sc) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list - sudo apt update - sudo apt install -y linux-headers-$(uname -r) dkms - sudo apt install virtualbox-7.1 -y - wget https://download.virtualbox.org/virtualbox/7.1.2/Oracle_VirtualBox_Extension_Pack-7.1.2.vbox-extpack - sudo VBoxManage extpack install --replace Oracle_VirtualBox_Extension_Pack-7.1.2.vbox-extpack --accept-license=eb31505e56e9b4d0fbca139104da41ac6f6b98f8e78968bdf01b1f3da3c4f9ae - sudo usermod -a -G vboxusers $USER + printf -- '\033[33m Installing Virtualbox\n\033[37m' + curl https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor > oracle_vbox_2016.gpg + curl https://www.virtualbox.org/download/oracle_vbox.asc | gpg --dearmor > oracle_vbox.gpg + sudo install -o root -g root -m 644 oracle_vbox_2016.gpg /etc/apt/trusted.gpg.d/ + sudo install -o root -g root -m 644 oracle_vbox.gpg /etc/apt/trusted.gpg.d/ + echo "deb [arch=amd64] http://download.virtualbox.org/virtualbox/debian $(lsb_release -sc) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list + sudo apt update + sudo apt install -y linux-headers-"$(uname -r)" dkms + sudo apt install virtualbox-7.1 -y + wget https://download.virtualbox.org/virtualbox/7.1.4/Oracle_VirtualBox_Extension_Pack-7.1.4.vbox-extpack + sudo VBoxManage extpack install --replace Oracle_VirtualBox_Extension_Pack-7.1.4.vbox-extpack --accept-license=eb31505e56e9b4d0fbca139104da41ac6f6b98f8e78968bdf01b1f3da3c4f9ae + sudo usermod -a -G vboxusers "$USER" # fi - + if [ $VER == "22.04" ]; then - # Install helvum + # Install helvum printf -- '\033[33m Installing pavucontrol\n\033[37m' - sudo apt install -y pavucontrol + sudo apt install -y pavucontrol fi - + if [ $VER == "24.04" ]; then - # Install helvum + # Install helvum printf -- '\033[33m Installing helvum\n\033[37m' - sudo apt install -y helvum + sudo apt install -y helvum fi - + fi # Symlink nvim config