From d0e2481afd27f4736ee2c98a5508efeb7726d84c Mon Sep 17 00:00:00 2001 From: askiiart Date: Sun, 17 Mar 2024 18:56:48 -0500 Subject: [PATCH] Update fedora config --- daily-use-pcs/setup-git.bash | 64 ++----------------------- dotfiles | 2 +- install-stuff/install-claws-mail.bash | 0 install-stuff/install-librewolf.bash | 1 + install-stuff/install-misc.sh | 12 +++-- install-stuff/install-qemu-libvirt.bash | 1 + install-stuff/install-steam.bash | 1 + install-stuff/install-vesktop.bash | 10 ++-- install-stuff/install-vs-code.bash | 5 +- 9 files changed, 22 insertions(+), 74 deletions(-) mode change 100644 => 100755 install-stuff/install-claws-mail.bash diff --git a/daily-use-pcs/setup-git.bash b/daily-use-pcs/setup-git.bash index 5214047..29232f9 100755 --- a/daily-use-pcs/setup-git.bash +++ b/daily-use-pcs/setup-git.bash @@ -18,69 +18,28 @@ fi command_exists() { type "$1" &>/dev/null; } if command_exists "apt-get"; then - sudo apt-get install pass git -y + sudo apt-get install git -y elif command_exists "yum"; then - sudo yum install pass git -y + sudo yum install git -y elif command_exists "pacman"; then sudo pacman -S git --noconfirm --needed - sudo pacman -S pass --noconfirm --needed elif command_exists "zypp"; then - sudo zypper install pass git -y + sudo zypper install git -y elif command_exists "emerge"; then sudo echo Not yet supported, exiting... elif command_exists "apk"; then - sudo apk add pass sudo apk add git else echo "Unsupported: unknown package manager and distro" fi -# Check if GCM is installed -if [ -d "${HOME}/git-credential-manager" ]; then - echo "Git Credential Manager already installed, skipping..." -else - if command_exists "apt-get"; then - curl $(curl -s https://api.github.com/repos/git-ecosystem/git-credential-manager/releases/latest | grep "browser_download_url.*gcm-linux_amd64.*.deb" | cut -d : -f 2,3 | tr -d \") -LO - chmod 777 ./gcm-linux_amd64.*.deb - sudo apt-get install ./gcm-linux_amd64.*.deb -y - rm -f ./gcm-linux_amd64.*.deb - else - # Install git credential manager - curl -L https://aka.ms/gcm/linux-install-source.sh | sh - rm dotnet-install.sh - fi -fi - ############################################ # Do GPG key stuff for commit verification # ############################################ git config --global user.name "${GIT_NAME}" git config --global user.email "${GIT_EMAIL}" -git-credential-manager configure git config --global commit.gpgsign true -git config --global credential.credentialStore gpg - -echo "GPG key ID: ${KEY_ID}" -echo "Go to https://github.com/drduh/YubiKey-Guide to set up git with GPG" -read -p "Mirrored at https://git.askiiart.net/mirrors/YubiKey-Guide" - git config --global user.signingkey ${KEY_ID} -pass init ${KEY_ID} - -############# -# SSH stuff # -############# - -# Get SSH key -if [ -d "${HOME}/.ssh" ]; then - echo "SSH keys already exist, skipping..." -else - # Generate SSH keys - echo - # -f: file, -N: passphrase, -t: type - ssh-keygen -f ~/.ssh/id_rsa -N "" -t rsa - echo -fi # From https://superuser.com/a/954639 # Archived at https://web.archive.org/web/20230606153856/https://superuser.com/a/954639 @@ -91,20 +50,5 @@ chown -R "$USER:$(id -gn)" ~/.gnupg chmod 700 ~/.gnupg # Set permissions to read, write for only yourself, no others chmod 600 ~/.gnupg/* -# Fixes dirmngr stuff +# Fixes dirmngr stuff (for Arch) sudo chmod 700 $(ls -d $HOME/.gnupg/*/) - -read -p "Done. Now verify your SSH and GPG keys in Git*" /dev/null; } -echo "WARNING: Only Arch and Fedora fully supported" - if command_exists "apt-get"; then sudo apt-get install kitty -y echo "Please install SchildiChat, nvim/neovim" -elif command_exists "yum"; then - sudo yum install kitty neovim -y +elif command_exists "dnf"; then + sudo dnf install kitty neovim gcc gnome-hexgl drawing make vlc freeglut ncdu gcolor3 rust cargo clippy p7zip mosh krita podman podman-docker podman-compose gajim -y curl -LO $(curl -s https://api.github.com/repos/SchildiChat/schildichat-desktop/releases/latest | grep "browser_download_url.*schildichat-desktop-.*.x86_64.rpm" | cut -d : -f 2,3 | tr -d \") sudo dnf install ./schildichat-desktop-*.x86_64.rpm sudo rm ./schildichat-desktop-*.x86_64.rpm + + # Install Prism Launcher + sudo dnf copr enable g3tchoo/prismlauncher + sudo dnf install prismlauncher-qt5 elif command_exists "yay"; then - yay -S kitty schildichat-desktop-bin digikam eog man-db neovim multimc-bin --noconfirm --needed + yay -S kitty schildichat-desktop-bin digikam eog man-db neovim prismlauncher-qt5-bin --noconfirm --needed elif command_exists "zypp"; then # Untested sudo zypper install kitty -y diff --git a/install-stuff/install-qemu-libvirt.bash b/install-stuff/install-qemu-libvirt.bash index 41492ed..6103d36 100755 --- a/install-stuff/install-qemu-libvirt.bash +++ b/install-stuff/install-qemu-libvirt.bash @@ -11,6 +11,7 @@ if command_exists "apt-get"; then sudo apt-get install qemu-system libvirt-daemon-system virt-manager -y elif command_exists "yum"; then sudo yum install @Virtualization virt-manager -y + sudo usermod -aG libvirt $(whoami) elif command_exists "pacman"; then sudo pacman -S qemu-full --noconfirm --needed sudo pacman -S virt-manager --noconfirm --needed diff --git a/install-stuff/install-steam.bash b/install-stuff/install-steam.bash index de7ec9e..60fb62a 100755 --- a/install-stuff/install-steam.bash +++ b/install-stuff/install-steam.bash @@ -16,6 +16,7 @@ elif command_exists "dnf"; then sudo dnf install appimagelauncher qt5-qtbase-gui -y mkdir $HOME/Applications curl -L $(curl -s https://api.github.com/repos/DavidoTek/ProtonUp-Qt/releases/latest | grep "browser_download_url.*ProtonUp-Qt-.*-x86_64.AppImage" | head --lines 1 | cut -d : -f 2,3 | tr -d \") -o $HOME/Applications/ProtonUp-Qt.AppImage + sudo dnf install gperftools-libs-2.9.1-6.fc39.i686 elif command_exists "yay"; then #printf '[multilib]\nInclude = /etc/pacman.d/mirrorlist\n' #read -p "Enable the multilib repo in /etc/pacman.conf - look above" diff --git a/install-stuff/install-vesktop.bash b/install-stuff/install-vesktop.bash index ea284c8..bfbfdee 100755 --- a/install-stuff/install-vesktop.bash +++ b/install-stuff/install-vesktop.bash @@ -8,12 +8,12 @@ fi command_exists() { type "$1" &>/dev/null; } if command_exists "apt-get"; then - curl -LO $(curl -s https://api.github.com/repos/Vencord/Vesktop/releases/latest | grep "VencordDesktop_.*_amd64.deb" | head --lines 1 | cut -d : -f 2,3 | tr -d \") - sudo apt-get install ./VencordDesktop_*.deb -y + curl -LO $(curl -s https://api.github.com/repos/Vencord/Vesktop/releases/latest | grep "vesktop_.*_amd64.deb" | head --lines 1 | cut -d : -f 2,3 | tr -d \") + sudo apt-get install ./vesktop_*.deb -y elif command_exists "yum"; then - curl -LO $(curl -s https://api.github.com/repos/Vencord/Vesktop/releases/latest | grep "browser_download_url.*VencordDesktop-.*.x86_64.rpm" | head --lines 1 | cut -d : -f 2,3 | tr -d \") - sudo dnf install ./VencordDesktop*.rpm -y - rm ./VencordDesktop*.rpm + curl -LO $(curl -s https://api.github.com/repos/Vencord/Vesktop/releases/latest | grep "browser_download_url.*vesktop-.*.x86_64.rpm" | head --lines 1 | cut -d : -f 2,3 | tr -d \") + sudo dnf install ./vesktop-*.rpm -y + rm ./vesktop-*.rpm elif command_exists "pacman"; then yay -S vesktop-bin --noconfirm --needed else diff --git a/install-stuff/install-vs-code.bash b/install-stuff/install-vs-code.bash index b4da50e..1f01a1b 100755 --- a/install-stuff/install-vs-code.bash +++ b/install-stuff/install-vs-code.bash @@ -16,11 +16,10 @@ if command_exists "apt-get"; then sudo apt install apt-transport-https sudo apt update sudo apt install code -elif command_exists "yum"; then +elif command_exists "dnf"; then sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc sudo sh -c 'echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/vscode.repo' - yum check-update - sudo yum install code -y + sudo dnf install code -y elif command_exists "yay"; then yay -S visual-studio-code-bin clang-format-static-bin --noconfirm --needed elif command_exists "zypp"; then